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

Commit d3e4d83e authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Move BasicShellCommandHandler to frameworks/lib/modules-utils am: d5726c19

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483965

Change-Id: Ib2a99f1aeb31b89e69a5b313ca3774ba145dde33
parents e8966fb5 d5726c19
Loading
Loading
Loading
Loading
+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",
@@ -1157,7 +1158,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",
@@ -1238,7 +1238,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",
+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 {
+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
+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}.
+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 {
Loading