platform_packages_services_Telephony, branch pie-release-2 Unnamed repository; edit this file 'description' to name the repository. Merge cherrypicks of [4562103, 4560827, 4563998, 4563999, 4564000, 4564001, 4564351, 4564352, 4564333, 4564033, 4560455, 4564034, 4560674, 4560675, 4563620, 4561607, 4561062, 4561063] into pi-release 2018-07-17T23:29:13+00:00 android-build-team Robot android-build-team-robot@google.com 2018-07-17T23:29:13+00:00 f992b3f3e801e5fca5b040bef34879aa0366954e Change-Id: I942819b1703ed98153db9310bb4eeb9d81ddf3ee 
Change-Id: I942819b1703ed98153db9310bb4eeb9d81ddf3ee
Inform user to turn off APM for IMS_SIP_ALTERNATE_EMERGENCY_CALL cause. 2018-07-17T23:28:41+00:00 Tyler Gunn tgunn@google.com 2018-07-11T18:49:19+00:00 5ee70fe0c3b1cb997b0f5e134982f4565ac7772a When IMS_SIP_ALTERNATE_EMERGENCY_CALL disconnect cause is received, inform the user to turn off airplane mode in order to make a call. Test: make -j 64; no manual testing possible. Bug: 69024173 Change-Id: I76afa4796f1b7ad2b9595bc8680559fa9e83d462 (cherry picked from commit d36c5e4a9b90446fb2ef6f7b7712176c4b732b32) 
When IMS_SIP_ALTERNATE_EMERGENCY_CALL disconnect cause is received,
inform the user to turn off airplane mode in order to make a call.

Test: make -j 64; no manual testing possible.
Bug: 69024173
Change-Id: I76afa4796f1b7ad2b9595bc8680559fa9e83d462
(cherry picked from commit d36c5e4a9b90446fb2ef6f7b7712176c4b732b32)
Snap for 4826885 from 068670def068be918b64f6a6ea7df797c3959208 to pi-release 2018-06-07T07:25:04+00:00 android-build-team Robot android-build-team-robot@google.com 2018-06-07T07:25:04+00:00 1dd4005a10daedf10bc97c05fd9e31e7c44ef013 Change-Id: I7ebaafdcc6cde4a33b3ef5b7dc9766573513bfb8 
Change-Id: I7ebaafdcc6cde4a33b3ef5b7dc9766573513bfb8
Merge "Revert "Use resource instead of carrier config"" into pi-dev 2018-06-06T22:51:13+00:00 Jordan Liu jminjie@google.com 2018-06-06T22:51:13+00:00 068670def068be918b64f6a6ea7df797c3959208 






Merge "Add null check for slot to avoid phone process crashes." into pi-dev
2018-06-06T22:06:05+00:00

Jiuyu Sun
jiuyu@google.com

2018-06-06T22:06:05+00:00

802dcd4898b7a840151e04ba6cc7e2de4e0594eb












Revert "Use resource instead of carrier config"
2018-06-06T21:44:36+00:00

Jordan Liu
jminjie@google.com

2018-06-06T20:26:26+00:00

195bb80c1d1baeacd9433869c06434771f7ea780

This reverts commit cadd9cd61eede63bc93ab1cc03010240a8953946.

Test: manually verified locally that the Preferred Network Type menu
shows only three options
Fixes: 109773307
Bug: 80541766
Bug: 70309465
Bug: 80088968
Change-Id: Ia4238133f2f34998ef44f5f2cfd616ea3f7a50c1





This reverts commit cadd9cd61eede63bc93ab1cc03010240a8953946.

Test: manually verified locally that the Preferred Network Type menu
shows only three options
Fixes: 109773307
Bug: 80541766
Bug: 70309465
Bug: 80088968
Change-Id: Ia4238133f2f34998ef44f5f2cfd616ea3f7a50c1







Snap for 4824048 from 7920402a2b44a71d927b3ff316d877b16e4169de to pi-release
2018-06-06T07:27:52+00:00

android-build-team Robot
android-build-team-robot@google.com

2018-06-06T07:27:52+00:00

7ba8c1037cc73a9f8f4a23cbed487ca8d3c5f81b

Change-Id: I0d521eea9c53e1212880ac7ce8b4b57c6262bd78





Change-Id: I0d521eea9c53e1212880ac7ce8b4b57c6262bd78







[automerger skipped] Merge "DO NOT MERGE Revise security requirements for TelephonyManager#endCall." into oc-dev am: d3579f0c71 am: 77ce4e9cb5
2018-06-06T00:30:56+00:00

Tyler Gunn
tgunn@google.com

2018-06-06T00:30:56+00:00

7920402a2b44a71d927b3ff316d877b16e4169de

am: bc96cc1934  -s ours

Change-Id: Ia8ff0b287624a034ba426887bccd2adf2c306d35





am: bc96cc1934  -s ours

Change-Id: Ia8ff0b287624a034ba426887bccd2adf2c306d35







Merge "DO NOT MERGE Revise security requirements for TelephonyManager#endCall." into oc-dev am: d3579f0c71
2018-06-05T22:39:58+00:00

Tyler Gunn
tgunn@google.com

2018-06-05T22:39:58+00:00

bc96cc193459703f83b599f24a9465cede44b2c5

am: 77ce4e9cb5

Change-Id: Iec9bbf93fbfef5b4a3466485ba232a9ec38ec0bd





am: 77ce4e9cb5

Change-Id: Iec9bbf93fbfef5b4a3466485ba232a9ec38ec0bd







Merge "DO NOT MERGE Revise security requirements for TelephonyManager#endCall." into oc-dev
2018-06-05T21:38:30+00:00

Tyler Gunn
tgunn@google.com

2018-06-05T21:38:30+00:00

77ce4e9cb542ba5aa8c64edd69c57e86d0c7e661

am: d3579f0c71

Change-Id: Ie32fd970f6e1b011fca9e1b095d9ed0173864ecb





am: d3579f0c71

Change-Id: Ie32fd970f6e1b011fca9e1b095d9ed0173864ecb