From 3d88b4651adffb545e4d2815dd7f990648a0fbab Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 18 Dec 2015 11:23:29 -0700 Subject: [PATCH 1/2] Sometimes to move forward you need to move backwards. Part A. Bug: 26118802 Change-Id: I7159d757caa92c590c79cacf62128d1324978c46 --- services/core/java/com/android/server/am/UserController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 5426b72c2efb6..44975e6309c18 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -246,7 +246,6 @@ final class UserController { mHandler.sendMessage(mHandler.obtainMessage(SYSTEM_USER_UNLOCK_MSG, userId, 0)); final Intent unlockedIntent = new Intent(Intent.ACTION_USER_UNLOCKED); - unlockedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId); unlockedIntent.addFlags( Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND); mService.broadcastIntentLocked(null, null, unlockedIntent, null, null, 0, null, From 665e0b5bbe1343ab597a658f2654e44443c4c6b2 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 18 Dec 2015 11:24:20 -0700 Subject: [PATCH 2/2] Sometimes to move forward you need to move backwards. Part B. Bug: 26118802 Change-Id: Ieabfedfd0ebff5b1f3dc32d1de43aef9974f15d2 --- services/core/java/com/android/server/am/UserController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 44975e6309c18..5426b72c2efb6 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -246,6 +246,7 @@ final class UserController { mHandler.sendMessage(mHandler.obtainMessage(SYSTEM_USER_UNLOCK_MSG, userId, 0)); final Intent unlockedIntent = new Intent(Intent.ACTION_USER_UNLOCKED); + unlockedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId); unlockedIntent.addFlags( Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND); mService.broadcastIntentLocked(null, null, unlockedIntent, null, null, 0, null,