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

Commit 5f2993d2 authored by Daniel Bright's avatar Daniel Bright
Browse files

Rewriting phone constants for mainline 

* Exposing Emergency extra constants through TelephonyManager
* Always reading or writing PhoneConstants.SubscriptionKey
with SubscriptionManager.EXTRA_SUBSCRIPTION_KEY

Bug: 147465477
Test: TeleServiceTests
Change-Id: Ia996798cc3e0d1fee82f32365d53876dee572579
parent 8a331dda

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

+2 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.os.Message; 
import android.os.PersistableBundle;

import android.os.UserHandle;

import android.telephony.CarrierConfigManager;

import com.android.telephony.Rlog;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;
@@ -42,6 +41,7 @@ import android.util.Log; 


import com.android.internal.telephony.util.ArrayUtils;

import com.android.internal.util.IndentingPrintWriter;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -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

+3 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.telephony.CarrierConfigManager; 
import android.telephony.CellLocation;

import android.telephony.DisconnectCause;

import android.telephony.PhoneNumberUtils;

import com.android.telephony.Rlog;

import android.telephony.ServiceState.RilRadioTechnology;

import android.telephony.TelephonyManager;

import android.telephony.cdma.CdmaCellLocation;
@@ -45,6 +44,7 @@ import android.util.EventLog; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ import android.telephony.ImsiEncryptionInfo; 
import android.telephony.NetworkScanRequest;

import android.telephony.PhoneNumberUtils;

import android.telephony.PreciseDataConnectionState;

import com.android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.ServiceState.RilRadioTechnology;

import android.telephony.SignalThresholdInfo;
@@ -104,6 +103,7 @@ import com.android.internal.telephony.uicc.UiccController; 
import com.android.internal.telephony.uicc.UiccProfile;

import com.android.internal.telephony.uicc.UiccSlot;

import com.android.internal.telephony.util.ArrayUtils;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -774,7 +774,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());

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

        logi("sendEmergencyCallbackModeChange");
@@ -789,7 +789,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());

            mContext.sendStickyBroadcastAsUser(intent, UserHandle.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
@@ -1155,8 +1155,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

+4 −7
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.telecom.PhoneAccountHandle; 
import android.telecom.TelecomManager;

import android.telephony.CarrierConfigManager;

import android.telephony.RadioAccessFamily;

import com.android.telephony.Rlog;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.SimDisplayNameSource;
@@ -65,6 +64,7 @@ import com.android.internal.telephony.uicc.UiccCard; 
import com.android.internal.telephony.uicc.UiccController;

import com.android.internal.telephony.util.ArrayUtils;

import com.android.internal.telephony.util.TelephonyUtils;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -2217,8 +2217,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);

    }
@@ -2279,8 +2278,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);

    }
@@ -2380,8 +2378,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);

    }