Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix typo in filling ACTION_MANAGED_PROFILE_UNLOCKED extras." into nyc-dev

Browse Source
This commit is contained in:
Rubin Xu
2016-02-15 14:29:59 +00:00
committed by Android (Google) Code Review
parent 99a6c3e6d9 b5f0049f98
commit 6bdd7cab5a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/res/AndroidManifest.xml
View File

@@ -426,6 +426,7 @@
<protected-broadcast android:name="android.intent.action.DYNAMIC_SENSOR_CHANGED" />
<protected-broadcast android:name="android.intent.action.ACTION_RADIO_OFF" />
<protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_UNLOCKED" />
<!-- ====================================================================== -->
<!-- RUNTIME PERMISSIONS -->

4
services/core/java/com/android/server/am/UserController.java
View File

@@ -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,