From 44173ee7b069e11ec422d156914010d1d070cf27 Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Wed, 26 Jun 2019 00:41:00 +0000
Subject: [PATCH] Revert "Use TM SubId in getDataState and getDataActivity"

This reverts commit b2ab846cf4529142382f7de6ec9b1e77998db22c.

Reason for revert: Decision has been made to keep the unsupported AIDL API.

Change-Id: I31219606974019ac46da789ec31ca9cb3a86eb13
---
 .../android/telephony/TelephonyManager.java   |  6 ++--
 .../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 c955efbe66320..3ae9b33cb1453 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -4733,8 +4733,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;
@@ -4782,8 +4781,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 4de19173965be..1aba95bf5e5ad 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.