commit dcf40a9cc562d95f826123d8d670262c8d15e7bd
author Stuart Scott <stuartscott@google.com> Tue Dec 09 10:45:01 2014 -0800
committer Stuart Scott <stuartscott@google.com> Wed Dec 10 11:22:51 2014 -0800
tree 612d4ca0fd8b3e97656a932c0d143039256a9ba8
parent f253e0f7dcbb97e6954b1f420018c7893d206e1d

Set radio power of all phones and multi phone changes.

bug:18415518
Change-Id: I33845aec1e7f162430b76ce0dee4d10664722bdd

src/com/android/phone/OutgoingCallBroadcaster.java

diff --git a/src/com/android/phone/OutgoingCallBroadcaster.java b/src/com/android/phone/OutgoingCallBroadcaster.java
index be95103..96e9e7b 100644
--- a/src/com/android/phone/OutgoingCallBroadcaster.java
+++ b/src/com/android/phone/OutgoingCallBroadcaster.java
@@ -41,6 +41,7 @@
 import android.view.View;
 import android.widget.ProgressBar;
 
+import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.TelephonyCapabilities;
 
@@ -189,13 +190,14 @@
             if (VDBG) Log.v(TAG, "- got number from resultData: '" + number + "'");
 
             final PhoneGlobals app = PhoneGlobals.getInstance();
+            final Phone phone = PhoneGlobals.getPhone();
 
             // OTASP-specific checks.
             // TODO: This should probably all happen in
             // OutgoingCallBroadcaster.onCreate(), since there's no reason to
             // even bother with the NEW_OUTGOING_CALL broadcast if we're going
             // to disallow the outgoing call anyway...
-            if (TelephonyCapabilities.supportsOtasp(app.phone)) {
+            if (TelephonyCapabilities.supportsOtasp(phone)) {
                 boolean activateState = (app.cdmaOtaScreenState.otaScreenState
                         == OtaUtils.CdmaOtaScreenState.OtaScreenState.OTA_STATUS_ACTIVATION);
                 boolean dialogState = (app.cdmaOtaScreenState.otaScreenState
@@ -234,9 +236,9 @@
             if (number == null) {
                 if (DBG) Log.v(TAG, "CALL cancelled (null number), returning...");
                 return false;
-            } else if (TelephonyCapabilities.supportsOtasp(app.phone)
-                    && (app.phone.getState() != PhoneConstants.State.IDLE)
-                    && (app.phone.isOtaSpNumber(number))) {
+            } else if (TelephonyCapabilities.supportsOtasp(phone)
+                    && (phone.getState() != PhoneConstants.State.IDLE)
+                    && (phone.isOtaSpNumber(number))) {
                 if (DBG) Log.v(TAG, "Call is active, a 2nd OTA call cancelled -- returning.");
                 return false;
             } else if (PhoneNumberUtils.isPotentialLocalEmergencyNumber(context, number)) {