From b5f0049f9841dfe877c070e4aba41516ed7df710 Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Mon, 15 Feb 2016 13:50:18 +0000 Subject: [PATCH] Fix typo in filling ACTION_MANAGED_PROFILE_UNLOCKED extras. Change-Id: Ic949a0d7f72d46d7cc36018b4b0fc54024c3b180 --- core/res/AndroidManifest.xml | 1 + services/core/java/com/android/server/am/UserController.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 99daab47bb416..6f2002415656b 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -426,6 +426,7 @@ + diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 90ebe1878a6a4..4e6dc3aecefd8 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -302,8 +302,8 @@ final class UserController { if (parent != null) { final Intent profileUnlockedIntent = new Intent( Intent.ACTION_MANAGED_PROFILE_UNLOCKED); - unlockedIntent.putExtra(Intent.EXTRA_USER, UserHandle.of(userId)); - unlockedIntent.addFlags( + profileUnlockedIntent.putExtra(Intent.EXTRA_USER, UserHandle.of(userId)); + profileUnlockedIntent.addFlags( Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND); mService.broadcastIntentLocked(null, null, profileUnlockedIntent,