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

Commit 4bcbfce5 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: FrameworksCoreTests, FrameworksServicesTest, CarrierTests
Change-Id: I84d6687ca6cab86c8c68dc2dd2679cfee0919c1e
parent e2bb4995

api/system-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -10583,6 +10583,8 @@ package android.telephony { 
    field public static final String EXTRA_ERROR_CODE = "errorCode";

    field public static final String EXTRA_ERROR_CODE = "errorCode";

    field public static final String EXTRA_PCO_ID = "pcoId";

    field public static final String EXTRA_PCO_ID = "pcoId";

    field public static final String EXTRA_PCO_VALUE = "pcoValue";

    field public static final String EXTRA_PCO_VALUE = "pcoValue";

    field public static final String EXTRA_PHONE_IN_ECM_STATE = "android.telephony.extra.PHONE_IN_ECM_STATE";

    field public static final String EXTRA_PHONE_IN_EMERGENCY_CALL = "android.telephony.extra.PHONE_IN_EMERGENCY_CALL";

    field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl";

    field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl";

    field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE";

    field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE";

    field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";

    field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CarrierActionUtils.java

+7 −9
Original line number Original line Diff line number Diff line
@@ -30,8 +30,6 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Log;

import android.util.Log;





import com.android.internal.telephony.PhoneConstants;



/**

/**

 * This util class provides common logic for carrier actions

 * This util class provides common logic for carrier actions

 */

 */
@@ -103,7 +101,7 @@ public class CarrierActionUtils { 
    }

    }





    private static void onDisableAllMeteredApns(Intent intent, Context context) {

    private static void onDisableAllMeteredApns(Intent intent, Context context) {

        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,

        int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,

                SubscriptionManager.getDefaultVoiceSubscriptionId());

                SubscriptionManager.getDefaultVoiceSubscriptionId());

        logd("onDisableAllMeteredApns subId: " + subId);

        logd("onDisableAllMeteredApns subId: " + subId);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);
@@ -111,7 +109,7 @@ public class CarrierActionUtils { 
    }

    }





    private static void onEnableAllMeteredApns(Intent intent, Context context) {

    private static void onEnableAllMeteredApns(Intent intent, Context context) {

        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,

        int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,

                SubscriptionManager.getDefaultVoiceSubscriptionId());

                SubscriptionManager.getDefaultVoiceSubscriptionId());

        logd("onEnableAllMeteredApns subId: " + subId);

        logd("onEnableAllMeteredApns subId: " + subId);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);
@@ -135,7 +133,7 @@ public class CarrierActionUtils { 
    }

    }





    private static void onRegisterDefaultNetworkAvail(Intent intent, Context context) {

    private static void onRegisterDefaultNetworkAvail(Intent intent, Context context) {

        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,

        int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,

                SubscriptionManager.getDefaultVoiceSubscriptionId());

                SubscriptionManager.getDefaultVoiceSubscriptionId());

        logd("onRegisterDefaultNetworkAvail subId: " + subId);

        logd("onRegisterDefaultNetworkAvail subId: " + subId);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);
@@ -143,7 +141,7 @@ public class CarrierActionUtils { 
    }

    }





    private static void onDeregisterDefaultNetworkAvail(Intent intent, Context context) {

    private static void onDeregisterDefaultNetworkAvail(Intent intent, Context context) {

        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,

        int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,

                SubscriptionManager.getDefaultVoiceSubscriptionId());

                SubscriptionManager.getDefaultVoiceSubscriptionId());

        logd("onDeregisterDefaultNetworkAvail subId: " + subId);

        logd("onDeregisterDefaultNetworkAvail subId: " + subId);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);
@@ -151,7 +149,7 @@ public class CarrierActionUtils { 
    }

    }





    private static void onDisableRadio(Intent intent, Context context) {

    private static void onDisableRadio(Intent intent, Context context) {

        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,

        int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,

                SubscriptionManager.getDefaultVoiceSubscriptionId());

                SubscriptionManager.getDefaultVoiceSubscriptionId());

        logd("onDisableRadio subId: " + subId);

        logd("onDisableRadio subId: " + subId);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);
@@ -159,7 +157,7 @@ public class CarrierActionUtils { 
    }

    }





    private static void onEnableRadio(Intent intent, Context context) {

    private static void onEnableRadio(Intent intent, Context context) {

        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,

        int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,

                SubscriptionManager.getDefaultVoiceSubscriptionId());

                SubscriptionManager.getDefaultVoiceSubscriptionId());

        logd("onEnableRadio subId: " + subId);

        logd("onEnableRadio subId: " + subId);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);
@@ -202,7 +200,7 @@ public class CarrierActionUtils { 
    }

    }





    private static void onResetAllCarrierActions(Intent intent, Context context) {

    private static void onResetAllCarrierActions(Intent intent, Context context) {

        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,

        int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,

                SubscriptionManager.getDefaultVoiceSubscriptionId());

                SubscriptionManager.getDefaultVoiceSubscriptionId());

        logd("onResetAllCarrierActions subId: " + subId);

        logd("onResetAllCarrierActions subId: " + subId);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);

        final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);

packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/CarrierDefaultReceiverTest.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

 */

package com.android.carrierdefaultapp;

package com.android.carrierdefaultapp;





import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Matchers.eq;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.times;
@@ -26,11 +27,10 @@ import android.app.PendingIntent; 
import android.content.Intent;

import android.content.Intent;

import android.os.PersistableBundle;

import android.os.PersistableBundle;

import android.telephony.CarrierConfigManager;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.test.InstrumentationTestCase;

import android.test.InstrumentationTestCase;





import com.android.internal.telephony.PhoneConstants;



import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Test;

import org.junit.Test;
@@ -69,6 +69,7 @@ public class CarrierDefaultReceiverTest extends InstrumentationTestCase { 
        mContext.injectSystemService(NotificationManager.class, mNotificationMgr);

        mContext.injectSystemService(NotificationManager.class, mNotificationMgr);

        mContext.injectSystemService(TelephonyManager.class, mTelephonyMgr);

        mContext.injectSystemService(TelephonyManager.class, mTelephonyMgr);

        mContext.injectSystemService(CarrierConfigManager.class, mCarrierConfigMgr);

        mContext.injectSystemService(CarrierConfigManager.class, mCarrierConfigMgr);

        doReturn(mTelephonyMgr).when(mTelephonyMgr).createForSubscriptionId(anyInt());





        mReceiver = new CarrierDefaultBroadcastReceiver();

        mReceiver = new CarrierDefaultBroadcastReceiver();

    }

    }
@@ -88,7 +89,7 @@ public class CarrierDefaultReceiverTest extends InstrumentationTestCase { 
        doReturn(b).when(mCarrierConfigMgr).getConfig();

        doReturn(b).when(mCarrierConfigMgr).getConfig();





        Intent intent = new Intent(TelephonyManager.ACTION_CARRIER_SIGNAL_REDIRECTED);

        Intent intent = new Intent(TelephonyManager.ACTION_CARRIER_SIGNAL_REDIRECTED);

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);

        mReceiver.onReceive(mContext, intent);

        mReceiver.onReceive(mContext, intent);





        mContext.waitForMs(100);

        mContext.waitForMs(100);

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -59,7 +59,6 @@ import android.telecom.TelecomManager; 
import android.telephony.PhoneStateListener;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.FeatureFlagUtils;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.util.Log;
@@ -1415,8 +1414,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
            } else if (TelephonyManager.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED.equals(action)) {

            } else if (TelephonyManager.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED.equals(action)) {

                // Airplane mode can be changed after ECM exits if airplane toggle button

                // Airplane mode can be changed after ECM exits if airplane toggle button

                // is pressed during ECM mode

                // is pressed during ECM mode

                if (!(intent.getBooleanExtra("PHONE_IN_ECM_STATE", false)) &&

                if (!(intent.getBooleanExtra(TelephonyManager.EXTRA_PHONE_IN_ECM_STATE, false))

                        mIsWaitingForEcmExit) {

                        && mIsWaitingForEcmExit) {

                    mIsWaitingForEcmExit = false;

                    mIsWaitingForEcmExit = false;

                    changeAirplaneModeSystemSetting(true);

                    changeAirplaneModeSystemSetting(true);

                }

                }

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -30,12 +30,12 @@ import android.telephony.CellSignalStrength; 
import android.telephony.ServiceState;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.SignalStrength;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper.RunWithLooper;

import android.testing.TestableLooper.RunWithLooper;





import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.TelephonyIntents;

import com.android.settingslib.graph.SignalDrawable;

import com.android.settingslib.graph.SignalDrawable;

import com.android.settingslib.net.DataUsageController;

import com.android.settingslib.net.DataUsageController;
@@ -418,7 +418,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 




        intent.putExtra(TelephonyIntents.EXTRA_SHOW_PLMN, showPlmn);

        intent.putExtra(TelephonyIntents.EXTRA_SHOW_PLMN, showPlmn);

        intent.putExtra(TelephonyIntents.EXTRA_PLMN, plmn);

        intent.putExtra(TelephonyIntents.EXTRA_PLMN, plmn);

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, mSubId);

        SubscriptionManager.putSubscriptionIdExtra(intent, mSubId);





        return intent;

        return intent;

    }

    }