commit 38f3f1c4078266e3018487c976abd0a0fd660a46
author Dan Shi <dshi@google.com> Thu Nov 12 18:27:01 2020 +0000
committer Dan Shi <dshi@google.com> Thu Nov 12 22:41:44 2020 +0000
tree 73eda2eebeb02f3d2b9487cc79a6e619e276d675
parent 9d34a6be99380061edc1bab6b66ac88c10591935

Revert "Update path for BasicShellCommandHandler"

Revert "Update rule for BasicShellCommandHandler"

Revert submission 12975279-move_BSCH

Reason for revert: b/173120275
Reverted Changes:
Ib750f4774:Move BasicShellCommandHandler
I43c0dc327:Update import path of BasicShellCommandHandler
I73d58c07c:Update path for BasicShellCommandHandler
I21f103949:Update path for BasicShellCommandHandler
I8a2873df6:Move BasicShellCommandHandler to frameworks/lib/mo...
I91df774a3:Update rule for BasicShellCommandHandler

Exempt-From-Owner-Approval: to fix b/173120275

Change-Id: I2893fb0323297c6261410cb2a6bc091a2743af07

Android.bp

diff --git a/Android.bp b/Android.bp
index e7ca068..1887a8a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,7 +35,6 @@
         "com.android.phone.common-lib",
         "guava",
         "PlatformProperties",
-        "modules-utils-os",
     ],
 
     srcs: [

src/com/android/phone/TelephonyShellCommand.java

diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index c6a2f52..c3f2974 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -17,6 +17,7 @@
 package com.android.phone;
 
 import android.content.Context;
+import android.os.BasicShellCommandHandler;
 import android.os.Binder;
 import android.os.PersistableBundle;
 import android.os.Process;
@@ -33,7 +34,6 @@
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.emergency.EmergencyNumberTracker;
 import com.android.internal.telephony.util.TelephonyUtils;
-import com.android.modules.utils.BasicShellCommandHandler;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;