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

Commit 62d2ff8b authored by Meng Wang's avatar Meng Wang
Browse files

Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager 

Because the constants are only used by TelephonyRegistryManager and
TelephonyRegistry.

Bug: 140908357
Test: make
Change-Id: I6933d1aa5b8dc35f136c8c4aed8572221ddfb755
parent 4d1971e8

core/java/android/telephony/TelephonyRegistryManager.java

+15 −2
Original line number Diff line number Diff line
@@ -462,6 +462,19 @@ public class TelephonyRegistryManager { 
        }

    }



    /**

     * Sim activation type: voice

     * @see #notifyVoiceActivationStateChanged

     * @hide

     */

    public static final int SIM_ACTIVATION_TYPE_VOICE = 0;

    /**

     * Sim activation type: data

     * @see #notifyDataActivationStateChanged

     * @hide

     */

    public static final int SIM_ACTIVATION_TYPE_DATA = 1;



    /**

     * Notify data activation state changed on certain subscription.

     * @see TelephonyManager#getDataActivationState()
@@ -477,7 +490,7 @@ public class TelephonyRegistryManager { 
        @SimActivationState int activationState) {

        try {

            sRegistry.notifySimActivationStateChangedForPhoneId(slotIndex, subId,

                TelephonyManager.SIM_ACTIVATION_TYPE_DATA, activationState);

                    SIM_ACTIVATION_TYPE_DATA, activationState);

        } catch (RemoteException ex) {

            // system process is dead

        }
@@ -498,7 +511,7 @@ public class TelephonyRegistryManager { 
        @SimActivationState int activationState) {

        try {

            sRegistry.notifySimActivationStateChangedForPhoneId(slotIndex, subId,

                TelephonyManager.SIM_ACTIVATION_TYPE_VOICE, activationState);

                    SIM_ACTIVATION_TYPE_VOICE, activationState);

        } catch (RemoteException ex) {

            // system process is dead

        }

services/core/java/com/android/server/TelephonyRegistry.java

+12 −10
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package com.android.server;



import static android.telephony.TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED;

import static android.telephony.TelephonyRegistryManager.SIM_ACTIVATION_TYPE_DATA;

import static android.telephony.TelephonyRegistryManager.SIM_ACTIVATION_TYPE_VOICE;



import static java.util.Arrays.copyOf;
@@ -1202,10 +1204,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

                switch (activationType) {

                    case TelephonyManager.SIM_ACTIVATION_TYPE_VOICE:

                    case SIM_ACTIVATION_TYPE_VOICE:

                        mVoiceActivationState[phoneId] = activationState;

                        break;

                    case TelephonyManager.SIM_ACTIVATION_TYPE_DATA:

                    case SIM_ACTIVATION_TYPE_DATA:

                        mDataActivationState[phoneId] = activationState;

                        break;

                    default:
@@ -1218,10 +1220,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                                + " state=" + activationState);

                    }

                    try {

                        if ((activationType == TelephonyManager.SIM_ACTIVATION_TYPE_VOICE) &&

                                r.matchPhoneStateListenerEvent(

                                        PhoneStateListener.LISTEN_VOICE_ACTIVATION_STATE) &&

                                idMatch(r.subId, subId, phoneId)) {

                        if ((activationType == SIM_ACTIVATION_TYPE_VOICE)

                                && r.matchPhoneStateListenerEvent(

                                        PhoneStateListener.LISTEN_VOICE_ACTIVATION_STATE)

                                && idMatch(r.subId, subId, phoneId)) {

                            if (DBG) {

                                log("notifyVoiceActivationStateForPhoneId: callback.onVASC r=" + r

                                        + " subId=" + subId + " phoneId=" + phoneId
@@ -1229,10 +1231,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                            }

                            r.callback.onVoiceActivationStateChanged(activationState);

                        }

                        if ((activationType == TelephonyManager.SIM_ACTIVATION_TYPE_DATA) &&

                                r.matchPhoneStateListenerEvent(

                                        PhoneStateListener.LISTEN_DATA_ACTIVATION_STATE) &&

                                idMatch(r.subId, subId, phoneId)) {

                        if ((activationType == SIM_ACTIVATION_TYPE_DATA)

                                && r.matchPhoneStateListenerEvent(

                                        PhoneStateListener.LISTEN_DATA_ACTIVATION_STATE)

                                && idMatch(r.subId, subId, phoneId)) {

                            if (DBG) {

                                log("notifyDataActivationStateForPhoneId: callback.onDASC r=" + r

                                        + " subId=" + subId + " phoneId=" + phoneId

telephony/java/android/telephony/TelephonyManager.java

+0 −11
Original line number Diff line number Diff line
@@ -4583,17 +4583,6 @@ public class TelephonyManager { 
        }

    }



    /**

     * Sim activation type: voice

     * @hide

     */

    public static final int SIM_ACTIVATION_TYPE_VOICE = 0;

    /**

     * Sim activation type: data

     * @hide

     */

    public static final int SIM_ACTIVATION_TYPE_DATA = 1;



    /**

     * Initial SIM activation state, unknown. Not set by any carrier apps.

     * @hide