diff options
| author | wangqi <wangqi@google.com> | 2017-07-07 17:56:33 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-07-10 10:48:05 -0700 |
| commit | b6d4181adaf62af8b5f8d2187d3b02209f90884b (patch) | |
| tree | b5056c5f978cbc13d23352f8edfe8860204ff452 /java/com/android/dialershared | |
| parent | 7700db2520f995519996ab515658c87353b98804 (diff) | |
Reset restricted count on merge.
This will prevent merged conference having participant with name as following:
1. Restrict and non-restriced
"<phone number or name>"
"Restricted 2"
2. Two restricted number
"Restricted 3"
"Restricted 4"
After the change it will become:
case 1:
"<phone number or name>"
"Restricted"
case 2:
"Restricted 1"
"Restricted 2"
Note: Unfortunately there isn't a way to relate the pre-merge restricted calls to the post-merge restricted calls. So "Restricted 2" is not necessary the one pre-merge. This also means reset is safe here for merge.
Bug: 63315372
Test: manual
PiperOrigin-RevId: 161267675
Change-Id: I2df16b6f9802932c06f0bdd62618c49f4e6e87a8
Diffstat (limited to 'java/com/android/dialershared')
0 files changed, 0 insertions, 0 deletions