platform_packages_services_Telephony, branch android12-dev Unnamed repository; edit this file 'description' to name the repository. [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e770bccf8e -s ours 2021-08-11T19:34:00+00:00 Bill Yi byi@google.com 2021-08-11T19:34:00+00:00 4075211d476e73bd67f6029a2c33b2ceb50e865e am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/15518575 Change-Id: I94f4127ba677df9ce405af4e7380fbe49412ee2f 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/15518575

Change-Id: I94f4127ba677df9ce405af4e7380fbe49412ee2f
Merge "Retry sending hangup command on new connection after redial completes" into sc-dev 2021-08-11T17:59:50+00:00 Brad Ebinger breadley@google.com 2021-08-11T17:59:50+00:00 2ad2250609ad2c021f1a3ba2e6da1c474069f855 






Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-11T01:17:51+00:00

TreeHugger Robot
treehugger-gerrit@google.com

2021-08-11T01:17:51+00:00

b4a26c9c5c124658295bbd060f4b788622c5b9e2












[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dbb6f6d8f -s ours
2021-08-10T21:15:25+00:00

Bill Yi
byi@google.com

2021-08-10T21:15:25+00:00

65f08d72da010742f31d0557529a2d583c2ad953

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/15518573

Change-Id: Ib480da29b3780f51823c58bb5ddb29e103f05ac7





am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/15518573

Change-Id: Ib480da29b3780f51823c58bb5ddb29e103f05ac7







Retry sending hangup command on new connection after redial completes
2021-08-10T20:07:23+00:00

Brad Ebinger
breadley@google.com

2021-08-10T19:34:28+00:00

b2aeeff94788b3e77fbeb05d9b5b0bef363deed7

When redial is in progress, we can not execute the hangup command.
In the event that the user tries to hangup while the redial is still
in progress, wait until the new connection is set up and then execute
the hangup on the new connection.

Bug: 195793731
Test: manual, atest TeleServiceTests
Change-Id: I97443c42029b297802971cf5404b571d54553628





When redial is in progress, we can not execute the hangup command.
In the event that the user tries to hangup while the redial is still
in progress, wait until the new connection is set up and then execute
the hangup on the new connection.

Bug: 195793731
Test: manual, atest TeleServiceTests
Change-Id: I97443c42029b297802971cf5404b571d54553628







Import translations. DO NOT MERGE ANYWHERE
2021-08-10T18:53:37+00:00

Bill Yi
byi@google.com

2021-08-10T18:53:37+00:00

25fce9a3568628d9d1a8a4dd884f24a9c6ff596b

Auto-generated-cl: translation import
Change-Id: I15cf63a3b843b2f0294b216356df08acb9cd1bb3





Auto-generated-cl: translation import
Change-Id: I15cf63a3b843b2f0294b216356df08acb9cd1bb3







Import translations. DO NOT MERGE ANYWHERE
2021-08-10T18:39:47+00:00

Bill Yi
byi@google.com

2021-08-10T18:39:47+00:00

e770bccf8ecc8a039affc175761996457e93b174

Auto-generated-cl: translation import
Change-Id: Ic42bdb2bbab24dd1aaa0b3ca3abf8a4070049fb1





Auto-generated-cl: translation import
Change-Id: Ic42bdb2bbab24dd1aaa0b3ca3abf8a4070049fb1







Import translations. DO NOT MERGE ANYWHERE
2021-08-10T18:26:34+00:00

Bill Yi
byi@google.com

2021-08-10T18:26:34+00:00

8dbb6f6d8f9ff1b60a663a42fe99da9479d9991d

Auto-generated-cl: translation import
Change-Id: Ibe148087687efc3f0e01deedc8cceb02b97e97ec





Auto-generated-cl: translation import
Change-Id: Ibe148087687efc3f0e01deedc8cceb02b97e97ec







[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff72910610 -s ours
2021-08-06T23:56:45+00:00

Bill Yi
byi@google.com

2021-08-06T23:56:45+00:00

e6b9fae0c00fee0effe95cfc49a9559dd60db755

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/15482982

Change-Id: I4f0c3e4e440c388f5b1bfd565db2d356e0c785fe





am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/15482982

Change-Id: I4f0c3e4e440c388f5b1bfd565db2d356e0c785fe







Import translations. DO NOT MERGE ANYWHERE
2021-08-06T20:35:24+00:00

Bill Yi
byi@google.com

2021-08-06T20:35:24+00:00

3edf0b8bcf55bb3b45df129358b5be318dd3ed6c

Auto-generated-cl: translation import
Change-Id: I9115bb9c7366e469dbaba8758a793d49c086236c





Auto-generated-cl: translation import
Change-Id: I9115bb9c7366e469dbaba8758a793d49c086236c