commit 3b820c259b185ec168b0d4dc9bbfc3d968a02987
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 18 19:41:49 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 18 19:41:49 2019 +0000
tree ed25fa4c15223e95186108ecbe59024fa68bbfa2
parent b354034fc91e322ef9aac3e36d20c06e6e457ed9
parent d95148a761b0159ec1e766ea6f5420ad0bca9ed1

Merge "Revert "Add Data command in Telephony""

src/com/android/phone/TelephonyShellCommand.java

diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index 0806fd1..672a27f 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -55,9 +55,6 @@
     private static final String NUMBER_VERIFICATION_SUBCOMMAND = "numverify";
     private static final String EMERGENCY_NUMBER_TEST_MODE = "emergency-number-test-mode";
     private static final String CARRIER_CONFIG_SUBCOMMAND = "cc";
-    private static final String DATA_TEST_MODE = "data";
-    private static final String DATA_ENABLE = "enable";
-    private static final String DATA_DISABLE = "disable";
 
     private static final String IMS_SET_CARRIER_SERVICE = "set-ims-service";
     private static final String IMS_GET_CARRIER_SERVICE = "get-ims-service";
@@ -149,8 +146,6 @@
             case CARRIER_CONFIG_SUBCOMMAND: {
                 return handleCcCommand();
             }
-            case DATA_TEST_MODE:
-                return handleDataTestModeCommand();
             default: {
                 return handleDefaultCommands(cmd);
             }
@@ -167,13 +162,10 @@
         pw.println("    IMS Commands.");
         pw.println("  emergency-number-test-mode");
         pw.println("    Emergency Number Test Mode Commands.");
-        pw.println("  data");
-        pw.println("    Data Test Mode Commands.");
         pw.println("  cc");
         pw.println("    Carrier Config Commands.");
         onHelpIms();
         onHelpEmergencyNumber();
-        onHelpDataTestMode();
         onHelpCc();
     }
 
@@ -215,13 +207,6 @@
         pw.println("    1 if the call would have been intercepted, 0 otherwise.");
     }
 
-    private void onHelpDataTestMode() {
-        PrintWriter pw = getOutPrintWriter();
-        pw.println("Mobile Data Test Mode Commands:");
-        pw.println("  data enable: enable mobile data connectivity");
-        pw.println("  data disable: disable mobile data connectivity");
-    }
-
     private void onHelpEmergencyNumber() {
         PrintWriter pw = getOutPrintWriter();
         pw.println("Emergency Number Test Mode Commands:");
@@ -292,41 +277,6 @@
         return -1;
     }
 
-    private int handleDataTestModeCommand() {
-        PrintWriter errPw = getErrPrintWriter();
-        String arg = getNextArgRequired();
-        if (arg == null) {
-            onHelpDataTestMode();
-            return 0;
-        }
-        switch (arg) {
-            case DATA_ENABLE: {
-                try {
-                    mInterface.enableDataConnectivity();
-                } catch (RemoteException ex) {
-                    Log.w(LOG_TAG, "data enable, error " + ex.getMessage());
-                    errPw.println("Exception: " + ex.getMessage());
-                    return -1;
-                }
-                break;
-            }
-            case DATA_DISABLE: {
-                try {
-                    mInterface.disableDataConnectivity();
-                } catch (RemoteException ex) {
-                    Log.w(LOG_TAG, "data disable, error " + ex.getMessage());
-                    errPw.println("Exception: " + ex.getMessage());
-                    return -1;
-                }
-                break;
-            }
-            default:
-                onHelpDataTestMode();
-                break;
-        }
-        return 0;
-    }
-
     private int handleEmergencyNumberTestModeCommand() {
         PrintWriter errPw = getErrPrintWriter();
         String opt = getNextOption();