diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDebuggingManager.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDebuggingManager.java b/services/usb/java/com/android/server/usb/UsbDebuggingManager.java index e489279..1cf00d2 100644 --- a/services/usb/java/com/android/server/usb/UsbDebuggingManager.java +++ b/services/usb/java/com/android/server/usb/UsbDebuggingManager.java @@ -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); |