Merge "[Telephony] Store correct value for multi-sim case - DataEnabled" into sc-dev (da74086b) · Commits · e / os / android_frameworks_base

core/java/android/telephony/TelephonyRegistryManager.java

+31 −30

Original line number	Diff line number	Diff line
		@@ -270,13 +270,13 @@ public class TelephonyRegistryManager {
		/**
		* Notify call state changed on certain subscription.
		*
		* @param subId for which call state changed.
		* @param slotIndex for which call state changed. Can be derived from subId except when subId is
		* invalid.
		* @param subId for which call state changed.
		* @param state latest call state. e.g, offhook, ringing
		* @param incomingNumber incoming phone number.
		*/
		public void notifyCallStateChanged(int subId, int slotIndex, @CallState int state,
		public void notifyCallStateChanged(int slotIndex, int subId, @CallState int state,
		@Nullable String incomingNumber) {
		try {
		sRegistry.notifyCallState(slotIndex, subId, state, incomingNumber);
		@@ -329,12 +329,12 @@ public class TelephonyRegistryManager {
		/**
		* Notify {@link ServiceState} update on certain subscription.
		*
		* @param subId for which the service state changed.
		* @param slotIndex for which the service state changed. Can be derived from subId except
		* subId is invalid.
		* @param subId for which the service state changed.
		* @param state service state e.g, in service, out of service or roaming status.
		*/
		public void notifyServiceStateChanged(int subId, int slotIndex, @NonNull ServiceState state) {
		public void notifyServiceStateChanged(int slotIndex, int subId, @NonNull ServiceState state) {
		try {
		sRegistry.notifyServiceStateForPhoneId(slotIndex, subId, state);
		} catch (RemoteException ex) {
		@@ -345,12 +345,12 @@ public class TelephonyRegistryManager {
		/**
		* Notify {@link SignalStrength} update on certain subscription.
		*
		* @param subId for which the signalstrength changed.
		* @param slotIndex for which the signalstrength changed. Can be derived from subId except when
		* subId is invalid.
		* @param subId for which the signalstrength changed.
		* @param signalStrength e.g, signalstrength level {@see SignalStrength#getLevel()}
		*/
		public void notifySignalStrengthChanged(int subId, int slotIndex,
		public void notifySignalStrengthChanged(int slotIndex, int subId,
		@NonNull SignalStrength signalStrength) {
		try {
		sRegistry.notifySignalStrengthForPhoneId(slotIndex, subId, signalStrength);
		@@ -363,13 +363,13 @@ public class TelephonyRegistryManager {
		* Notify changes to the message-waiting indicator on certain subscription. e.g, The status bar
		* uses message waiting indicator to determine when to display the voicemail icon.
		*
		* @param subId for which message waiting indicator changed.
		* @param slotIndex for which message waiting indicator changed. Can be derived from subId
		* except when subId is invalid.
		* @param subId for which message waiting indicator changed.
		* @param msgWaitingInd {@code true} indicates there is message-waiting indicator, {@code false}
		* otherwise.
		*/
		public void notifyMessageWaitingChanged(int subId, int slotIndex, boolean msgWaitingInd) {
		public void notifyMessageWaitingChanged(int slotIndex, int subId, boolean msgWaitingInd) {
		try {
		sRegistry.notifyMessageWaitingChangedForPhoneId(slotIndex, subId, msgWaitingInd);
		} catch (RemoteException ex) {
		@@ -410,9 +410,9 @@ public class TelephonyRegistryManager {
		/**
		* Notify changes to default (Internet) data connection state on certain subscription.
		*
		* @param subId for which data connection state changed.
		* @param slotIndex for which data connections state changed. Can be derived from subId except
		* when subId is invalid.
		* @param subId for which data connection state changed.
		* @param preciseState the PreciseDataConnectionState
		*
		* @see PreciseDataConnectionState
		@@ -431,13 +431,13 @@ public class TelephonyRegistryManager {
		/**
		* Notify {@link CallQuality} change on certain subscription.
		*
		* @param subId for which call quality state changed.
		* @param slotIndex for which call quality state changed. Can be derived from subId except when
		* subId is invalid.
		* @param subId for which call quality state changed.
		* @param callQuality Information about call quality e.g, call quality level
		* @param networkType associated with this data connection. e.g, LTE
		*/
		public void notifyCallQualityChanged(int subId, int slotIndex, @NonNull CallQuality callQuality,
		public void notifyCallQualityChanged(int slotIndex, int subId, @NonNull CallQuality callQuality,
		@NetworkType int networkType) {
		try {
		sRegistry.notifyCallQualityChanged(callQuality, slotIndex, subId, networkType);
		@@ -449,11 +449,11 @@ public class TelephonyRegistryManager {
		/**
		* Notify emergency number list changed on certain subscription.
		*
		* @param subId for which emergency number list changed.
		* @param slotIndex for which emergency number list changed. Can be derived from subId except
		* when subId is invalid.
		* @param subId for which emergency number list changed.
		*/
		public void notifyEmergencyNumberList(int subId, int slotIndex) {
		public void notifyEmergencyNumberList( int slotIndex, int subId) {
		try {
		sRegistry.notifyEmergencyNumberList(slotIndex, subId);
		} catch (RemoteException ex) {
		@@ -494,12 +494,12 @@ public class TelephonyRegistryManager {
		/**
		* Notify radio power state changed on certain subscription.
		*
		* @param subId for which radio power state changed.
		* @param slotIndex for which radio power state changed. Can be derived from subId except when
		* subId is invalid.
		* @param subId for which radio power state changed.
		* @param radioPowerState the current modem radio state.
		*/
		public void notifyRadioPowerStateChanged(int subId, int slotIndex,
		public void notifyRadioPowerStateChanged(int slotIndex, int subId,
		@RadioPowerState int radioPowerState) {
		try {
		sRegistry.notifyRadioPowerStateChanged(slotIndex, subId, radioPowerState);
		@@ -538,12 +538,12 @@ public class TelephonyRegistryManager {
		* Notify data activation state changed on certain subscription.
		* @see TelephonyManager#getDataActivationState()
		*
		* @param subId for which data activation state changed.
		* @param slotIndex for which data activation state changed. Can be derived from subId except
		* when subId is invalid.
		* @param subId for which data activation state changed.
		* @param activationState sim activation state e.g, activated.
		*/
		public void notifyDataActivationStateChanged(int subId, int slotIndex,
		public void notifyDataActivationStateChanged(int slotIndex, int subId,
		@SimActivationState int activationState) {
		try {
		sRegistry.notifySimActivationStateChangedForPhoneId(slotIndex, subId,
		@@ -557,12 +557,12 @@ public class TelephonyRegistryManager {
		* Notify voice activation state changed on certain subscription.
		* @see TelephonyManager#getVoiceActivationState()
		*
		* @param subId for which voice activation state changed.
		* @param slotIndex for which voice activation state changed. Can be derived from subId except
		* subId is invalid.
		* @param subId for which voice activation state changed.
		* @param activationState sim activation state e.g, activated.
		*/
		public void notifyVoiceActivationStateChanged(int subId, int slotIndex,
		public void notifyVoiceActivationStateChanged(int slotIndex, int subId,
		@SimActivationState int activationState) {
		try {
		sRegistry.notifySimActivationStateChangedForPhoneId(slotIndex, subId,
		@@ -576,9 +576,9 @@ public class TelephonyRegistryManager {
		* Notify User mobile data state changed on certain subscription. e.g, mobile data is enabled
		* or disabled.
		*
		* @param subId for which mobile data state has changed.
		* @param slotIndex for which mobile data state has changed. Can be derived from subId except
		* when subId is invalid.
		* @param subId for which mobile data state has changed.
		* @param state {@code true} indicates mobile data is enabled/on. {@code false} otherwise.
		*/
		public void notifyUserMobileDataStateChanged(int slotIndex, int subId, boolean state) {
		@@ -640,14 +640,14 @@ public class TelephonyRegistryManager {
		* Notify precise call state changed on certain subscription, including foreground, background
		* and ringcall states.
		*
		* @param subId for which precise call state changed.
		* @param slotIndex for which precise call state changed. Can be derived from subId except when
		* subId is invalid.
		* @param subId for which precise call state changed.
		* @param ringCallPreciseState ringCall state.
		* @param foregroundCallPreciseState foreground call state.
		* @param backgroundCallPreciseState background call state.
		*/
		public void notifyPreciseCallState(int subId, int slotIndex,
		public void notifyPreciseCallState(int slotIndex, int subId,
		@PreciseCallStates int ringCallPreciseState,
		@PreciseCallStates int foregroundCallPreciseState,
		@PreciseCallStates int backgroundCallPreciseState) {
		@@ -790,9 +790,10 @@ public class TelephonyRegistryManager {
		* @param reason Reason for data enabled/disabled. See {@code REASON_*} in
		* {@link TelephonyManager}.
		*/
		public void notifyDataEnabled(boolean enabled, @TelephonyManager.DataEnabledReason int reason) {
		public void notifyDataEnabled(int slotIndex, int subId, boolean enabled,
		@TelephonyManager.DataEnabledReason int reason) {
		try {
		sRegistry.notifyDataEnabled(enabled, reason);
		sRegistry.notifyDataEnabled(slotIndex, subId, enabled, reason);
		} catch (RemoteException ex) {
		// system server crash
		}
		@@ -801,11 +802,11 @@ public class TelephonyRegistryManager {
		/**
		* Notify emergency number list changed on certain subscription.
		*
		* @param subId for which emergency number list changed.
		* @param slotIndex for which emergency number list changed. Can be derived from subId except
		* when subId is invalid.
		* @param subId for which emergency number list changed.
		*/
		public void notifyAllowedNetworkTypesChanged(int subId, int slotIndex,
		public void notifyAllowedNetworkTypesChanged(int slotIndex, int subId,
		Map<Integer, Long> allowedNetworkTypeList) {
		try {
		sRegistry.notifyAllowedNetworkTypesChanged(slotIndex, subId, allowedNetworkTypeList);

core/java/com/android/internal/telephony/ITelephonyRegistry.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,6 +94,6 @@ interface ITelephonyRegistry {
		void notifyBarringInfoChanged(int slotIndex, int subId, in BarringInfo barringInfo);
		void notifyPhysicalChannelConfigForSubscriber(in int subId,
		in List<PhysicalChannelConfig> configs);
		void notifyDataEnabled(boolean enabled, int reason);
		void notifyDataEnabled(in int phoneId, int subId, boolean enabled, int reason);
		void notifyAllowedNetworkTypesChanged(in int phoneId, in int subId, in Map allowedNetworkTypeList);
		}

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

+31 −16

Original line number	Diff line number	Diff line
		@@ -313,9 +313,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {

		private List<PhysicalChannelConfig> mPhysicalChannelConfigs;

		private boolean mIsDataEnabled = false;
		private boolean[] mIsDataEnabled;

		private int mDataEnabledReason;
		private int[] mDataEnabledReason;

		private Map<Integer, Long> mAllowedNetworkTypesList;

		@@ -524,6 +524,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		mOutgoingCallEmergencyNumber = copyOf(mOutgoingCallEmergencyNumber, mNumPhones);
		mOutgoingSmsEmergencyNumber = copyOf(mOutgoingSmsEmergencyNumber, mNumPhones);
		mTelephonyDisplayInfos = copyOf(mTelephonyDisplayInfos, mNumPhones);
		mIsDataEnabled= copyOf(mIsDataEnabled, mNumPhones);
		mDataEnabledReason = copyOf(mDataEnabledReason, mNumPhones);

		// ds -> ss switch.
		if (mNumPhones < oldNumPhones) {
		@@ -565,6 +567,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		mPreciseDataConnectionStates.add(new ArrayMap<>());
		mBarringInfo.add(i, new BarringInfo());
		mTelephonyDisplayInfos[i] = null;
		mIsDataEnabled[i] = false;
		mDataEnabledReason[i] = TelephonyManager.DATA_ENABLED_REASON_USER;
		mPhysicalChannelConfigs.add(i, new PhysicalChannelConfig.Builder().build());
		}
		}
		@@ -626,6 +630,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		mTelephonyDisplayInfos = new TelephonyDisplayInfo[numPhones];
		mPhysicalChannelConfigs = new ArrayList<>();
		mAllowedNetworkTypesList = new HashMap<>();
		mIsDataEnabled = new boolean[numPhones];
		mDataEnabledReason = new int[numPhones];
		for (int i = 0; i < numPhones; i++) {
		mCallState[i] = TelephonyManager.CALL_STATE_IDLE;
		mDataActivity[i] = TelephonyManager.DATA_ACTIVITY_NONE;
		@@ -655,6 +661,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		mPreciseDataConnectionStates.add(new ArrayMap<>());
		mBarringInfo.add(i, new BarringInfo());
		mTelephonyDisplayInfos[i] = null;
		mIsDataEnabled[i] = false;
		mDataEnabledReason[i] = TelephonyManager.DATA_ENABLED_REASON_USER;
		mPhysicalChannelConfigs.add(i, new PhysicalChannelConfig.Builder().build());
		}

		@@ -1150,7 +1158,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		if (events.contains(
		PhoneStateListener.EVENT_DATA_ENABLED_CHANGED)) {
		try {
		r.callback.onDataEnabledChanged(mIsDataEnabled, mDataEnabledReason);
		r.callback.onDataEnabledChanged(
		mIsDataEnabled[phoneId], mDataEnabledReason[phoneId]);
		} catch (RemoteException ex) {
		remove(r.binder);
		}
		@@ -2370,26 +2379,31 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		/**
		* Notify that the data enabled has changed.
		*
		* @param phoneId the phone id.
		* @param subId the subId.
		* @param enabled True if data is enabled, otherwise disabled.
		* @param reason Reason for data enabled/disabled. See {@code DATA_*} in
		* {@link TelephonyManager}.
		*/
		public void notifyDataEnabled(boolean enabled,
		public void notifyDataEnabled(int phoneId, int subId, boolean enabled,
		@TelephonyManager.DataEnabledReason int reason) {
		if (!checkNotifyPermission("notifyDataEnabled()")) {
		return;
		}

		if (VDBG) {
		log("notifyDataEnabled: enabled=" + enabled + " reason=" + reason);
		log("notifyDataEnabled: PhoneId=" + phoneId + " subId=" + subId +
		" enabled=" + enabled + " reason=" + reason);
		}

		mIsDataEnabled = enabled;
		mDataEnabledReason = reason;
		synchronized (mRecords) {
		if (validatePhoneId(phoneId)) {
		mIsDataEnabled[phoneId] = enabled;
		mDataEnabledReason[phoneId] = reason;
		for (Record r : mRecords) {
		if (r.matchPhoneStateListenerEvent(
		PhoneStateListener.EVENT_DATA_ENABLED_CHANGED)) {
		PhoneStateListener.EVENT_DATA_ENABLED_CHANGED)
		&& idMatch(r.subId, subId, phoneId)) {
		try {
		r.callback.onDataEnabledChanged(enabled, reason);
		} catch (RemoteException ex) {
		@@ -2397,6 +2411,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		}
		}
		}
		}
		handleRemoveListLocked();
		}
		}
		@@ -2481,6 +2496,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		pw.println("mOutgoingSmsEmergencyNumber=" + mOutgoingSmsEmergencyNumber[i]);
		pw.println("mBarringInfo=" + mBarringInfo.get(i));
		pw.println("mTelephonyDisplayInfo=" + mTelephonyDisplayInfos[i]);
		pw.println("mIsDataEnabled=" + mIsDataEnabled);
		pw.println("mDataEnabledReason=" + mDataEnabledReason);
		pw.decreaseIndent();
		}
		pw.println("mCarrierNetworkChangeState=" + mCarrierNetworkChangeState);
		@@ -2491,8 +2508,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		pw.println("mDefaultPhoneId=" + mDefaultPhoneId);
		pw.println("mDefaultSubId=" + mDefaultSubId);
		pw.println("mPhysicalChannelConfigs=" + mPhysicalChannelConfigs);
		pw.println("mIsDataEnabled=" + mIsDataEnabled);
		pw.println("mDataEnabledReason=" + mDataEnabledReason);

		pw.decreaseIndent();