commit 2de4c0e40ed66c2bf94ea2f47ac7427c7824de95
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 06 02:12:21 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 06 02:12:21 2019 +0000
tree c8042c4318e0a6a7f1e5b4391e6e4808430fc7e8
parent 812ae785fe251b09bba3f1dd60634a6e995fdd1e
parent 1ca2ee496c6ce6f8d1338d5ea87a5765dce5e97d

Merge "Disable RTT when roaming"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index de1f0f3..dbb9671 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -91,7 +91,7 @@
     <protected-broadcast android:name= "android.telephony.action.NETWORK_COUNTRY_CHANGED" />
 
     <!-- For Vendor Debugging in Telephony -->
-    <protected-broadcast android:name="android.telephony.debug.action.DEBUG_EVENT" />
+    <protected-broadcast android:name="android.telephony.action.DEBUG_EVENT" />
 
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.CALL_PHONE" />

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1f01822..8bc8ce0 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1100,6 +1100,7 @@
                     request = (MainThreadRequest) msg.obj;
                     boolean enable = (boolean) request.argument;
                     onCompleted = obtainMessage(EVENT_ENABLE_MODEM_DONE, request);
+                    onCompleted.arg1 = enable ? 1 : 0;
                     PhoneConfigurationManager.getInstance()
                             .enablePhone(request.phone, enable, onCompleted);
                     break;
@@ -1107,6 +1108,9 @@
                     ar = (AsyncResult) msg.obj;
                     request = (MainThreadRequest) ar.userObj;
                     request.result = (ar.exception == null);
+                    //update the cache as modem status has changed
+                    mPhoneConfigurationManager.addToPhoneStatusCache(
+                            request.phone.getPhoneId(), msg.arg1 == 1);
                     updateModemStateMetrics();
                     notifyRequester(request);
                     break;