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

Commit e37099ff authored by Craig Mautner's avatar Craig Mautner
Browse files

Revert "Do not display ADB confirm dialog during boot" 

This reverts commit 34e90b22.

Change-Id: Ib385793aa2b7472933bdb0c707b10e2bac1a4cb3
parent 34e90b22

services/usb/java/com/android/server/usb/UsbDebuggingManager.java

+1 −9
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ import android.os.FileUtils; 
import android.os.Looper;

import android.os.Message;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.util.Slog;

import android.util.Base64;

import com.android.server.FgThread;
@@ -208,12 +206,6 @@ public class UsbDebuggingManager implements Runnable { 
                    break;



                case MESSAGE_ADB_CONFIRM: {

                    if ("trigger_restart_min_framework".equals(

                            SystemProperties.get("vold.decrypt"))) {

                        Slog.d(TAG, "Deferring adb confirmation until after vold decrypt");

                        sendResponse("NO");

                        break;

                    }

                    String key = (String)msg.obj;

                    String fingerprints = getFingerprints(key);

                    if ("".equals(fingerprints)) {
@@ -287,7 +279,7 @@ public class UsbDebuggingManager implements Runnable { 
        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        if (packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null) {

            try {

                mContext.startActivityAsUser(intent, UserHandle.OWNER);

                mContext.startActivity(intent);

                return true;

            } catch (ActivityNotFoundException e) {

                Slog.e(TAG, "unable to start adb whitelist activity: " + componentName, e);