Merge "Use TM SubId in getDataState and getDataActivity" (6ef6ff9c) · Commits · e / os / android_frameworks_base

config/hiddenapi-greylist-max-p.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,8 @@ Lcom/android/internal/R$styleable;->MenuView:[I
		Lcom/android/internal/R$styleable;->Searchable:[I
		Lcom/android/internal/R$styleable;->SearchableActionKey:[I
		Lcom/android/internal/telephony/IPhoneSubInfo$Stub;-><init>()V
		Lcom/android/internal/telephony/ITelephony;->getDataActivity()I
		Lcom/android/internal/telephony/ITelephony;->getDataState()I
		Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallForwardingChanged(Z)V
		Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCellLocation(Landroid/os/Bundle;)V
		Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataActivity(I)V

+4 −2

Original line number	Diff line number	Diff line
		@@ -4901,7 +4901,8 @@ public class TelephonyManager {
		ITelephony telephony = getITelephony();
		if (telephony == null)
		return DATA_ACTIVITY_NONE;
		return telephony.getDataActivity();
		return telephony.getDataActivityForSubId(
		getSubId(SubscriptionManager.getActiveDataSubscriptionId()));
		} catch (RemoteException ex) {
		// the phone process is restarting.
		return DATA_ACTIVITY_NONE;
		@@ -4949,7 +4950,8 @@ public class TelephonyManager {
		ITelephony telephony = getITelephony();
		if (telephony == null)
		return DATA_DISCONNECTED;
		return telephony.getDataState();
		return telephony.getDataStateForSubId(
		getSubId(SubscriptionManager.getActiveDataSubscriptionId()));
		} catch (RemoteException ex) {
		// the phone process is restarting.
		return DATA_DISCONNECTED;

+35 −7

Original line number	Diff line number	Diff line
		@@ -316,11 +316,39 @@ interface ITelephony {
		*/
		int getCallStateForSlot(int slotIndex);

		@UnsupportedAppUsage
		/**
		* Replaced by getDataActivityForSubId.
		*/
		int getDataActivity();
		@UnsupportedAppUsage

		/**
		* Returns a constant indicating the type of activity on a data connection
		* (cellular).
		*
		* @see #DATA_ACTIVITY_NONE
		* @see #DATA_ACTIVITY_IN
		* @see #DATA_ACTIVITY_OUT
		* @see #DATA_ACTIVITY_INOUT
		* @see #DATA_ACTIVITY_DORMANT
		*/
		int getDataActivityForSubId(int subId);

		/**
		* Replaced by getDataStateForSubId.
		*/
		int getDataState();

		/**
		* Returns a constant indicating the current data connection state
		* (cellular).
		*
		* @see #DATA_DISCONNECTED
		* @see #DATA_CONNECTING
		* @see #DATA_CONNECTED
		* @see #DATA_SUSPENDED
		*/
		int getDataStateForSubId(int subId);

		/**
		* Returns the current active phone type as integer.
		* Returns TelephonyManager.PHONE_TYPE_CDMA if RILConstants.CDMA_PHONE