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

Commit 0aaa6bee authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Android (Google) Code Review
Browse files

Merge "Make the following telephony intents as system API"

parents 70d860e3 041e769c

api/system-current.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -10140,10 +10140,13 @@ package android.telephony { 
    method public void updateServiceLocation();

    method public void updateServiceLocation();

    method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateTestOtaEmergencyNumberDbFilePath(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateTestOtaEmergencyNumberDbFilePath(@NonNull String);

    field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_ANOMALY_REPORTED = "android.telephony.action.ANOMALY_REPORTED";

    field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_ANOMALY_REPORTED = "android.telephony.action.ANOMALY_REPORTED";

    field public static final String ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED";

    field public static final String ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED";

    field public static final String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE";

    field public static final String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE";

    field public static final String ACTION_EMERGENCY_CALLBACK_MODE_CHANGED = "android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED";

    field public static final String ACTION_EMERGENCY_CALLBACK_MODE_CHANGED = "android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED";

    field public static final String ACTION_EMERGENCY_CALL_STATE_CHANGED = "android.intent.action.EMERGENCY_CALL_STATE_CHANGED";

    field public static final String ACTION_EMERGENCY_CALL_STATE_CHANGED = "android.intent.action.EMERGENCY_CALL_STATE_CHANGED";

    field public static final String ACTION_NETWORK_SET_TIME = "android.telephony.action.NETWORK_SET_TIME";

    field public static final String ACTION_NETWORK_SET_TIME = "android.telephony.action.NETWORK_SET_TIME";

    field public static final String ACTION_REQUEST_OMADM_CONFIGURATION_UPDATE = "com.android.omadm.service.CONFIGURATION_UPDATE";

    field public static final String ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS = "android.telephony.action.SHOW_NOTICE_ECM_BLOCK_OTHERS";

    field public static final String ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS = "android.telephony.action.SHOW_NOTICE_ECM_BLOCK_OTHERS";

    field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";

    field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";

    field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";

    field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -1072,7 +1072,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                mHandler.sendMessage(mHandler.obtainMessage(MSG_PHONE_STATE_CHANGED, state));

                mHandler.sendMessage(mHandler.obtainMessage(MSG_PHONE_STATE_CHANGED, state));

            } else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {

            } else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {

                mHandler.sendEmptyMessage(MSG_AIRPLANE_MODE_CHANGED);

                mHandler.sendEmptyMessage(MSG_AIRPLANE_MODE_CHANGED);

            } else if (TelephonyIntents.ACTION_SERVICE_STATE_CHANGED.equals(action)) {

            } else if (Intent.ACTION_SERVICE_STATE.equals(action)) {

                ServiceState serviceState = ServiceState.newFromBundle(intent.getExtras());

                ServiceState serviceState = ServiceState.newFromBundle(intent.getExtras());

                int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,

                int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,

                        SubscriptionManager.INVALID_SUBSCRIPTION_ID);

                        SubscriptionManager.INVALID_SUBSCRIPTION_ID);
@@ -1633,8 +1633,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);

        filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);

        filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);

        filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);

        filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);

        filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);

        filter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);

        filter.addAction(Intent.ACTION_SERVICE_STATE);

        filter.addAction(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);

        filter.addAction(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);

        filter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);

        filter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);

        filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);

        filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);

        filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);

        filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -398,7 +398,7 @@ public class MobileSignalController extends SignalController< 
                    intent.getBooleanExtra(TelephonyIntents.EXTRA_SHOW_PLMN, false),

                    intent.getBooleanExtra(TelephonyIntents.EXTRA_SHOW_PLMN, false),

                    intent.getStringExtra(TelephonyIntents.EXTRA_PLMN));

                    intent.getStringExtra(TelephonyIntents.EXTRA_PLMN));

            notifyListenersIfNecessary();

            notifyListenersIfNecessary();

        } else if (action.equals(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED)) {

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

            updateDataSim();

            updateDataSim();

            notifyListenersIfNecessary();

            notifyListenersIfNecessary();

        }

        }

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -318,9 +318,9 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);

        filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);

        filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);

        filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);

        filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);

        filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);

        filter.addAction(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);

        filter.addAction(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);

        filter.addAction(TelephonyIntents.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED);

        filter.addAction(TelephonyManager.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED);

        filter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);

        filter.addAction(Intent.ACTION_SERVICE_STATE);

        filter.addAction(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION);

        filter.addAction(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION);

        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);

        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);

        filter.addAction(ConnectivityManager.INET_CONDITION_ACTION);

        filter.addAction(ConnectivityManager.INET_CONDITION_ACTION);
@@ -512,11 +512,11 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                refreshLocale();

                refreshLocale();

                updateAirplaneMode(false);

                updateAirplaneMode(false);

                break;

                break;

            case TelephonyIntents.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED:

            case TelephonyManager.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED:

                // We are using different subs now, we might be able to make calls.

                // We are using different subs now, we might be able to make calls.

                recalculateEmergency();

                recalculateEmergency();

                break;

                break;

            case TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED:

            case TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED:

                // Notify every MobileSignalController so they can know whether they are the

                // Notify every MobileSignalController so they can know whether they are the

                // data sim or not.

                // data sim or not.

                for (int i = 0; i < mMobileSignalControllers.size(); i++) {

                for (int i = 0; i < mMobileSignalControllers.size(); i++) {
@@ -534,7 +534,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                // Might have different subscriptions now.

                // Might have different subscriptions now.

                updateMobileControllers();

                updateMobileControllers();

                break;

                break;

            case TelephonyIntents.ACTION_SERVICE_STATE_CHANGED:

            case Intent.ACTION_SERVICE_STATE:

                mLastServiceState = ServiceState.newFromBundle(intent.getExtras());

                mLastServiceState = ServiceState.newFromBundle(intent.getExtras());

                if (mMobileSignalControllers.size() == 0) {

                if (mMobileSignalControllers.size() == 0) {

                    // If none of the subscriptions are active, we might need to recalculate

                    // If none of the subscriptions are active, we might need to recalculate

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+7 −7
Original line number Original line Diff line number Diff line
@@ -204,7 +204,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
    @Test

    @Test

    public void testTelephonyCapable_SimInvalid_ServiceState_InService() {

    public void testTelephonyCapable_SimInvalid_ServiceState_InService() {

        // SERVICE_STATE - IN_SERVICE, but SIM_STATE is invalid TelephonyCapable should be False

        // SERVICE_STATE - IN_SERVICE, but SIM_STATE is invalid TelephonyCapable should be False

        Intent intent = new Intent(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);

        Intent intent = new Intent(Intent.ACTION_SERVICE_STATE);

        Bundle data = new Bundle();

        Bundle data = new Bundle();

        ServiceState state = new ServiceState();

        ServiceState state = new ServiceState();

        state.setState(ServiceState.STATE_IN_SERVICE);

        state.setState(ServiceState.STATE_IN_SERVICE);
@@ -219,7 +219,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
    public void testTelephonyCapable_SimValid_ServiceState_PowerOff() {

    public void testTelephonyCapable_SimValid_ServiceState_PowerOff() {

        // Simulate AirplaneMode case, SERVICE_STATE - POWER_OFF, check TelephonyCapable False

        // Simulate AirplaneMode case, SERVICE_STATE - POWER_OFF, check TelephonyCapable False

        // Only receive ServiceState callback IN_SERVICE -> OUT_OF_SERVICE -> POWER_OFF

        // Only receive ServiceState callback IN_SERVICE -> OUT_OF_SERVICE -> POWER_OFF

        Intent intent = new Intent(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);

        Intent intent = new Intent(Intent.ACTION_SERVICE_STATE);

        intent.putExtra(Intent.EXTRA_SIM_STATE

        intent.putExtra(Intent.EXTRA_SIM_STATE

                , Intent.SIM_STATE_LOADED);

                , Intent.SIM_STATE_LOADED);

        Bundle data = new Bundle();

        Bundle data = new Bundle();
@@ -241,7 +241,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
     */

     */

    @Test

    @Test

    public void testTelephonyCapable_BootInitState_ServiceState_OutOfService() {

    public void testTelephonyCapable_BootInitState_ServiceState_OutOfService() {

        Intent intent = new Intent(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);

        Intent intent = new Intent(Intent.ACTION_SERVICE_STATE);

        Bundle data = new Bundle();

        Bundle data = new Bundle();

        ServiceState state = new ServiceState();

        ServiceState state = new ServiceState();

        state.setState(ServiceState.STATE_OUT_OF_SERVICE);

        state.setState(ServiceState.STATE_OUT_OF_SERVICE);
@@ -285,7 +285,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 




    @Test

    @Test

    public void testTelephonyCapable_BootInitState_ServiceState_PowerOff() {

    public void testTelephonyCapable_BootInitState_ServiceState_PowerOff() {

        Intent intent = new Intent(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);

        Intent intent = new Intent(Intent.ACTION_SERVICE_STATE);

        Bundle data = new Bundle();

        Bundle data = new Bundle();

        ServiceState state = new ServiceState();

        ServiceState state = new ServiceState();

        state.setState(ServiceState.STATE_POWER_OFF);

        state.setState(ServiceState.STATE_POWER_OFF);
@@ -298,7 +298,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 




    @Test

    @Test

    public void testTelephonyCapable_SimValid_ServiceState_InService() {

    public void testTelephonyCapable_SimValid_ServiceState_InService() {

        Intent intent = new Intent(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);

        Intent intent = new Intent(Intent.ACTION_SERVICE_STATE);

        Bundle data = new Bundle();

        Bundle data = new Bundle();

        ServiceState state = new ServiceState();

        ServiceState state = new ServiceState();

        state.setState(ServiceState.STATE_IN_SERVICE);

        state.setState(ServiceState.STATE_IN_SERVICE);
@@ -321,10 +321,10 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive(getContext()

        mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive(getContext()

                , putPhoneInfo(intentSimState, data, true));

                , putPhoneInfo(intentSimState, data, true));

        mTestableLooper.processAllMessages();

        mTestableLooper.processAllMessages();

        // Even SimState Loaded, still need ACTION_SERVICE_STATE_CHANGED turn on mTelephonyCapable

        // Even SimState Loaded, still need ACTION_SERVICE_STATE turn on mTelephonyCapable

        assertThat(mKeyguardUpdateMonitor.mTelephonyCapable).isFalse();

        assertThat(mKeyguardUpdateMonitor.mTelephonyCapable).isFalse();





        Intent intentServiceState =  new Intent(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);

        Intent intentServiceState =  new Intent(Intent.ACTION_SERVICE_STATE);

        intentSimState.putExtra(Intent.EXTRA_SIM_STATE

        intentSimState.putExtra(Intent.EXTRA_SIM_STATE

                , Intent.SIM_STATE_LOADED);

                , Intent.SIM_STATE_LOADED);

        mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive(getContext()

        mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive(getContext()