Implement shell command handler

Bug: 265948913

Test: manual
Change-Id: Ic6d69a90ea23bb9d8f119667b21341b674c9cff7

2 files changed, 32 insertions, 40 deletions

diff --git a/service/java/com/android/server/deviceconfig/DeviceConfigServiceImpl.java b/service/java/com/android/server/deviceconfig/DeviceConfigServiceImpl.java
index 0fec796..243fd01 100644
--- a/service/java/com/android/server/deviceconfig/DeviceConfigServiceImpl.java
+++ b/service/java/com/android/server/deviceconfig/DeviceConfigServiceImpl.java
@@ -16,7 +16,9 @@
 
 package com.android.server.deviceconfig;
 
+import android.annotation.NonNull;
 import android.content.Context;
+import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
 import android.provider.aidl.IDeviceConfigManager;
 import android.provider.DeviceConfigInitializer;
@@ -24,8 +26,11 @@ import android.provider.DeviceConfigInitializer;
 import com.android.server.deviceconfig.db.DeviceConfigDbAdapter;
 import com.android.server.deviceconfig.db.DeviceConfigDbHelper;
 
+import java.io.PrintWriter;
 import java.util.Map;
 
+import com.android.modules.utils.BasicShellCommandHandler;
+
 /**
  * DeviceConfig Service implementation (updatable via Mainline) that uses a SQLite database as a storage mechanism
  * for the configuration values.
@@ -58,4 +63,31 @@ public class DeviceConfigServiceImpl extends IDeviceConfigManager.Stub {
     public boolean setProperty(String namespace, String key, String value, boolean makeDefault) {
         return mDbAdapter.setValue(namespace, key, value, makeDefault);
     }
+
+    @Override
+    public int handleShellCommand(@NonNull ParcelFileDescriptor in,
+            @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err,
+            @NonNull String[] args) {
+        return (new MyShellCommand()).exec(
+                this, in.getFileDescriptor(), out.getFileDescriptor(), err.getFileDescriptor(),
+                args);
+    }
+
+    static final class MyShellCommand extends BasicShellCommandHandler {
+
+        @Override
+        public int onCommand(String cmd) {
+            if (cmd == null || "help".equals(cmd) || "-h".equals(cmd)) {
+                onHelp();
+                return -1;
+            }
+            return -1;
+        }
+
+        @Override
+        public void onHelp() {
+            PrintWriter pw = getOutPrintWriter();
+            pw.println("Device Config implemented in mainline");
+        }
+    }
 }
diff --git a/service/java/com/android/server/deviceconfig/DeviceConfigShellService.java b/service/java/com/android/server/deviceconfig/DeviceConfigShellService.java
deleted file mode 100644
index 14ced76..0000000
--- a/service/java/com/android/server/deviceconfig/DeviceConfigShellService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.android.server.deviceconfig;
-
-import java.io.PrintWriter;
-
-import android.annotation.NonNull;
-import android.os.Binder;
-import android.os.ParcelFileDescriptor;
-
-import com.android.modules.utils.BasicShellCommandHandler;
-
-/** @hide */
-public class DeviceConfigShellService extends Binder {
-
-    @Override
-    public int handleShellCommand(@NonNull ParcelFileDescriptor in,
-            @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err,
-            @NonNull String[] args) {
-        return (new MyShellCommand()).exec(
-                this, in.getFileDescriptor(), out.getFileDescriptor(), err.getFileDescriptor(),
-                args);
-    }
-
-    static final class MyShellCommand extends BasicShellCommandHandler {
-
-        @Override
-        public int onCommand(String cmd) {
-            if (cmd == null || "help".equals(cmd) || "-h".equals(cmd)) {
-                onHelp();
-                return -1;
-            }
-            return -1;
-        }
-
-        @Override
-        public void onHelp() {
-            PrintWriter pw = getOutPrintWriter();
-            pw.println("Device Config implemented in mainline");
-        }
-    }
-}