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

Commit 83f36747 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Do not display ADB confirm dialog during boot"""

parents 968aca1d b43d3cff

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

+9 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 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;
@@ -206,6 +208,12 @@ 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)) {
@@ -279,7 +287,7 @@ public class UsbDebuggingManager implements Runnable { 
        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

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

            try {

                mContext.startActivity(intent);

                mContext.startActivityAsUser(intent, UserHandle.OWNER);

                return true;

            } catch (ActivityNotFoundException e) {

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