diff options
| author | 2019-06-27 15:33:46 -0700 | |
|---|---|---|
| committer | 2019-06-27 15:33:46 -0700 | |
| commit | f5ee9c61be6dfc1a70d394906777654c231e39e3 (patch) | |
| tree | 389efc097c6d89d991660d62dbc8cf1c34f25ec5 | |
| parent | ffb8583a653215ba5996a9fea5016e8b1dcd54fa (diff) | |
| parent | 4d4e2474eabd3273c58719d1deea208036984613 (diff) | |
Merge "Revert "Use TM SubId in getDataState and getDataActivity""
am: 4d4e2474ea
Change-Id: I3acaf90104e009981849ef9107cafd6924ed5e9f
| -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 a88434d79691..03a5c74be766 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4777,8 +4777,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; @@ -4826,8 +4825,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 4de19173965b..1aba95bf5e5a 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. |