diff options
| author | 2019-06-27 15:46:06 -0700 | |
|---|---|---|
| committer | 2019-06-27 15:46:06 -0700 | |
| commit | 22d0ed63cc6b545a24fcbe5be89dd4cb85ae1066 (patch) | |
| tree | a45abf4b1765838417818897c1eadb3415630a16 | |
| parent | d87bdf9834aa5b7755e68619ac122ae267a5f574 (diff) | |
| parent | f5ee9c61be6dfc1a70d394906777654c231e39e3 (diff) | |
Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea
am: f5ee9c61be
Change-Id: I3a1ffa493f8b11cdd7c8bfff4fa4f8d78d54a169
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 6 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 30 |
2 files changed, 8 insertions, 28 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 1317ecc167d5..b38d35a0a792 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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; diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index e23cd6843162..5a27a0fb42e4 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -308,36 +308,18 @@ interface ITelephony { */ List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg); - @UnsupportedAppUsage - int getCallState(); + @UnsupportedAppUsage + int getCallState(); /** * Returns the call state for a slot. */ 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. |