Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5726c19 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Move BasicShellCommandHandler to frameworks/lib/modules-utils 

BasicShellCommandHandler is used by mainline modules and the
framwork. There is a new repo that was created for putting
this kind of utility class. Move BasicShellCommandHandler for
the incoming ConnectivityService mainline and updating the
related usage.

Bug: 170598012
Test: m ; verify with adb shell cmd
Change-Id: I8a2873df6e7d8342b7a8b466bda155f74c807ee3
Merged-In: Ida30c877116090616d4bf3f87fdad835446dac84
parent be52dafa

Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -573,6 +573,7 @@ java_library { 
        // If MimeMap ever becomes its own APEX, then this dependency would need to be removed

        // in favor of an API stubs dependency in java_library "framework" below.

        "mimemap",

        "modules-utils-os",

    ],

    // For backwards compatibility.

    stem: "framework",
@@ -1156,7 +1157,6 @@ aidl_mapping { 
filegroup {

    name: "framework-telephony-common-shared-srcs",

    srcs: [

        "core/java/android/os/BasicShellCommandHandler.java",

        "core/java/android/os/RegistrantList.java",

        "core/java/android/os/Registrant.java",

        "core/java/android/util/LocalLog.java",
@@ -1237,7 +1237,6 @@ filegroup { 
    name: "framework-wifi-service-shared-srcs",

    srcs: [

        "core/java/android/net/InterfaceConfiguration.java",

        "core/java/android/os/BasicShellCommandHandler.java",

        "core/java/android/util/BackupUtils.java",

        "core/java/android/util/Rational.java",

        "core/java/com/android/internal/util/FastXmlSerializer.java",

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerShellCommand.java

+2 −1
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ import android.app.ActivityManager; 
import android.app.AppGlobals;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.os.BasicShellCommandHandler;

import android.os.Binder;

import android.os.UserHandle;



import com.android.modules.utils.BasicShellCommandHandler;



import java.io.PrintWriter;



public final class JobSchedulerShellCommand extends BasicShellCommandHandler {

config/preloaded-classes

+1 −1
Original line number Diff line number Diff line
@@ -4539,7 +4539,6 @@ android.os.AsyncTask 
android.os.BadParcelableException

android.os.BaseBundle$NoImagePreloadHolder

android.os.BaseBundle

android.os.BasicShellCommandHandler

android.os.BatteryManager

android.os.BatteryManagerInternal

android.os.BatteryProperty$1
@@ -9565,6 +9564,7 @@ com.android.internal.widget.VerifyCredentialResponse$1 
com.android.internal.widget.VerifyCredentialResponse

com.android.internal.widget.ViewClippingUtil$ClippingParameters

com.android.internal.widget.ViewClippingUtil

com.android.modules.utils.BasicShellCommandHandler

com.android.okhttp.Address

com.android.okhttp.AndroidShimResponseCache

com.android.okhttp.Authenticator

core/java/android/os/ShellCommand.java

+1 −7
Original line number Diff line number Diff line
@@ -19,15 +19,9 @@ package android.os; 
import android.compat.annotation.UnsupportedAppUsage;

import android.util.Slog;



import com.android.internal.util.FastPrintWriter;

import com.android.modules.utils.BasicShellCommandHandler;



import java.io.BufferedInputStream;

import java.io.FileDescriptor;

import java.io.FileInputStream;

import java.io.FileOutputStream;

import java.io.InputStream;

import java.io.OutputStream;

import java.io.PrintWriter;



/**

 * Helper for implementing {@link Binder#onShellCommand Binder.onShellCommand}.

core/java/com/android/internal/os/BaseCommand.java

+2 −1
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ 
package com.android.internal.os;



import android.compat.annotation.UnsupportedAppUsage;

import android.os.BasicShellCommandHandler;

import android.os.Build;



import com.android.modules.utils.BasicShellCommandHandler;



import java.io.PrintStream;



public abstract class BaseCommand {