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

Commit 0ba6f5a0 authored by Fabien Sanglard's avatar Fabien Sanglard Committed by Android (Google) Code Review
Browse files

Merge "Clarify ownership in AdbDebuggingManager" into main

parents 413c17ce 3def1683

services/core/java/com/android/server/adb/AdbDebuggingManager.java

+7 −4
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ public class AdbDebuggingManager { 
    private final Context mContext;

    private final ContentResolver mContentResolver;

    @VisibleForTesting final AdbDebuggingHandler mHandler;

    @Nullable private AdbDebuggingThread mThread;

    private boolean mAdbUsbEnabled = false;

    private boolean mAdbWifiEnabled = false;

    private String mFingerprints;
@@ -195,9 +194,8 @@ public class AdbDebuggingManager { 
        mConfirmComponent = confirmComponent;

        mUserKeyFile = testUserKeyFile;

        mTempKeysFile = tempKeysFile;

        mThread = adbDebuggingThread;

        mTicker = ticker;

        mHandler = new AdbDebuggingHandler(FgThread.get().getLooper(), mThread);

        mHandler = new AdbDebuggingHandler(FgThread.get().getLooper(), adbDebuggingThread);

    }



    static void sendBroadcastWithDebugPermission(@NonNull Context context, @NonNull Intent intent,
@@ -687,6 +685,8 @@ public class AdbDebuggingManager { 
        // connection unless all transport types are disconnected.

        private int mAdbEnabledRefCount = 0;



        @Nullable private AdbDebuggingThread mThread;



        private ContentObserver mAuthTimeObserver = new ContentObserver(this) {

            @Override

            public void onChange(boolean selfChange, Uri uri) {
@@ -1676,7 +1676,10 @@ public class AdbDebuggingManager { 
    public void dump(DualDumpOutputStream dump, String idName, long id) {

        long token = dump.start(idName, id);



        dump.write("connected_to_adb", AdbDebuggingManagerProto.CONNECTED_TO_ADB, mThread != null);

        dump.write(

                "connected_to_adb",

                AdbDebuggingManagerProto.CONNECTED_TO_ADB,

                mHandler.mThread != null);

        writeStringIfNotNull(dump, "last_key_received", AdbDebuggingManagerProto.LAST_KEY_RECEVIED,

                mFingerprints);