Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d04d53c authored by Daniel Bright's avatar Daniel Bright Committed by Gerrit Code Review
Browse files

Merge "Rewriting phone constants for mainline"

parents 4250653e 036287c2

src/java/com/android/internal/telephony/CarrierSignalAgent.java

+1 −2
Original line number Diff line number Diff line
@@ -316,8 +316,7 @@ public class CarrierSignalAgent extends Handler { 
                continue;

            }



            signal.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, mPhone.getSubId());

            signal.putExtra(PhoneConstants.SUBSCRIPTION_KEY, mPhone.getSubId());

            SubscriptionManager.putSubscriptionIdExtra(signal, mPhone.getSubId());

            signal.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

            if (!wakeup) signal.setFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);

src/java/com/android/internal/telephony/GsmCdmaCallTracker.java

+2 −1
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ public class GsmCdmaCallTracker extends CallTracker { 
            if (intent.getAction().equals(

                    TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED)) {



                boolean isInEcm = intent.getBooleanExtra(PhoneConstants.PHONE_IN_ECM_STATE, false);

                boolean isInEcm = intent.getBooleanExtra(

                        TelephonyManager.EXTRA_PHONE_IN_ECM_STATE, false);

                log("Received ACTION_EMERGENCY_CALLBACK_MODE_CHANGED isInEcm = " + isInEcm);



                // If we exit ECM mode, notify all connections.

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+2 −2
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ public class GsmCdmaPhone extends Phone { 
    private void sendEmergencyCallbackModeChange(){

        //Send an Intent

        Intent intent = new Intent(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED);

        intent.putExtra(PhoneConstants.PHONE_IN_ECM_STATE, isInEcm());

        intent.putExtra(TelephonyManager.EXTRA_PHONE_IN_ECM_STATE, isInEcm());

        SubscriptionManager.putPhoneIdAndSubIdExtra(intent, getPhoneId());

        ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);

        logi("sendEmergencyCallbackModeChange");
@@ -794,7 +794,7 @@ public class GsmCdmaPhone extends Phone { 
        }

        if (mBroadcastEmergencyCallStateChanges) {

            Intent intent = new Intent(TelephonyIntents.ACTION_EMERGENCY_CALL_STATE_CHANGED);

            intent.putExtra(PhoneConstants.PHONE_IN_EMERGENCY_CALL, callActive);

            intent.putExtra(TelephonyManager.EXTRA_PHONE_IN_EMERGENCY_CALL, callActive);

            SubscriptionManager.putPhoneIdAndSubIdExtra(intent, getPhoneId());

            ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);

            if (DBG) Rlog.d(LOG_TAG, "sendEmergencyCallStateChange: callActive " + callActive);

src/java/com/android/internal/telephony/InboundSmsHandler.java

+1 −2
Original line number Diff line number Diff line
@@ -1148,8 +1148,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
        // override the subId value in the intent with the values from tracker as they can be

        // different, specifically if the message is coming from SmsBroadcastUndelivered

        if (SubscriptionManager.isValidSubscriptionId(subId)) {

            intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

            intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);

            SubscriptionManager.putSubscriptionIdExtra(intent, subId);

        }



        if (user.equals(UserHandle.ALL)) {

src/java/com/android/internal/telephony/SubscriptionController.java

+3 −6
Original line number Diff line number Diff line
@@ -2210,8 +2210,7 @@ public class SubscriptionController extends ISub.Stub { 
        Intent intent = new Intent(SubscriptionManager.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);

        SubscriptionManager.putSubscriptionIdExtra(intent, subId);

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }
@@ -2272,8 +2271,7 @@ public class SubscriptionController extends ISub.Stub { 
        Intent intent = new Intent(TelephonyIntents.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);

        SubscriptionManager.putSubscriptionIdExtra(intent, subId);

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }
@@ -2373,8 +2371,7 @@ public class SubscriptionController extends ISub.Stub { 
        Intent intent = new Intent(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);

        SubscriptionManager.putSubscriptionIdExtra(intent, subId);

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }