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

Commit 8b0a22db authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge changes from topic "usb-adb-separation" 

* changes:
  Update USB tests for ADB split
  Move AdbDebuggingManager to AdbService
  AdbService: move source of truth for enabled
  Add empty AdbHandler
  Add systemReady call for AdbService
  Add function to query ADB state
  Register USB as an ADB transport type
  Add ADB transport skeleton
  Add empty AdbManagerInternal for system server
  Add empty AdbService to SystemServer
  Move ADB debugging manager to core
  Rename to AdbDebuggingManager
  Move UsbDebuggingManager to new package
parents 838df250 c2a54e8b

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ java_defaults { 
        "core/java/android/content/pm/dex/ISnapshotRuntimeProfileCallback.aidl",

        "core/java/android/content/pm/permission/IRuntimePermissionPresenter.aidl",

        "core/java/android/database/IContentObserver.aidl",

        "core/java/android/debug/IAdbManager.aidl",

        "core/java/android/debug/IAdbTransport.aidl",

        ":libcamera_client_aidl",

        ":libcamera_client_framework_aidl",

        "core/java/android/hardware/IConsumerIrService.aidl",

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ package android { 
    field public static final java.lang.String MANAGE_AUTO_FILL = "android.permission.MANAGE_AUTO_FILL";

    field public static final java.lang.String MANAGE_CARRIER_OEM_UNLOCK_STATE = "android.permission.MANAGE_CARRIER_OEM_UNLOCK_STATE";

    field public static final java.lang.String MANAGE_CA_CERTIFICATES = "android.permission.MANAGE_CA_CERTIFICATES";

    field public static final java.lang.String MANAGE_DEBUGGING = "android.permission.MANAGE_DEBUGGING";

    field public static final java.lang.String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";

    field public static final java.lang.String MANAGE_IPSEC_TUNNELS = "android.permission.MANAGE_IPSEC_TUNNELS";

    field public static final java.lang.String MANAGE_ROLE_HOLDERS = "android.permission.MANAGE_ROLE_HOLDERS";

core/java/android/app/SystemServiceRegistry.java

+11 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ import android.content.pm.LauncherApps; 
import android.content.pm.PackageManager;

import android.content.pm.ShortcutManager;

import android.content.res.Resources;

import android.debug.AdbManager;

import android.debug.IAdbManager;

import android.hardware.ConsumerIrManager;

import android.hardware.ISerialManager;

import android.hardware.SensorManager;
@@ -583,6 +585,15 @@ final class SystemServiceRegistry { 
                return new UsbManager(ctx, IUsbManager.Stub.asInterface(b));

            }});



        registerService(Context.ADB_SERVICE, AdbManager.class,

                new CachedServiceFetcher<AdbManager>() {

                    @Override

                    public AdbManager createService(ContextImpl ctx)

                                throws ServiceNotFoundException {

                        IBinder b = ServiceManager.getServiceOrThrow(Context.ADB_SERVICE);

                        return new AdbManager(ctx, IAdbManager.Stub.asInterface(b));

                    }});



        registerService(Context.SERIAL_SERVICE, SerialManager.class,

                new CachedServiceFetcher<SerialManager>() {

            @Override

core/java/android/content/Context.java

+12 −0
Original line number Diff line number Diff line
@@ -3965,6 +3965,18 @@ public abstract class Context { 
     */

    public static final String USB_SERVICE = "usb";



    /**

     * Use with {@link #getSystemService(String)} to retrieve a {@link

     * Use with {@link #getSystemService} to retrieve a {@link

     * android.debug.AdbManager} for access to ADB debug functions.

     *

     * @see #getSystemService(String)

     * @see android.debug.AdbManager

     *

     * @hide

     */

    public static final String ADB_SERVICE = "adb";



    /**

     * Use with {@link #getSystemService(String)} to retrieve a {@link

     * android.hardware.SerialManager} for access to serial ports.

core/java/android/debug/AdbManager.java

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.debug;



import android.annotation.SystemService;

import android.content.Context;



/**

 * This class allows the control of ADB-related functions. Currently only ADB over USB is

 * supported, and none of the API is public.

 *

 * @hide

 */

@SystemService(Context.ADB_SERVICE)

public class AdbManager {

    private static final String TAG = "AdbManager";



    private final Context mContext;

    private final IAdbManager mService;



    /**

     * {@hide}

     */

    public AdbManager(Context context, IAdbManager service) {

        mContext = context;

        mService = service;

    }

}