Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea (22d0ed63) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+2 −4

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

+6 −24

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

		/**
		* 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 getDataActivity(int subId);

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

		/**
		* Returns the current active phone type as integer.