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

Commit 0bba2aee authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

Merge "Fix typo in filling ACTION_MANAGED_PROFILE_UNLOCKED extras." into nyc-dev am: 6bdd7cab 

am: bd74449c

* commit 'bd74449c':
  Fix typo in filling ACTION_MANAGED_PROFILE_UNLOCKED extras.
parents 2f28321b bd74449c

core/res/AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -426,6 +426,7 @@ 
    <protected-broadcast android:name="android.intent.action.DYNAMIC_SENSOR_CHANGED" />

    <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.ACTION_RADIO_OFF" />

    <protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_UNLOCKED" />





    <!-- ====================================================================== -->

    <!-- ====================================================================== -->

    <!--                          RUNTIME PERMISSIONS                           -->

    <!--                          RUNTIME PERMISSIONS                           -->

services/core/java/com/android/server/am/UserController.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -302,8 +302,8 @@ final class UserController { 
                    if (parent != null) {

                    if (parent != null) {

                        final Intent profileUnlockedIntent = new Intent(

                        final Intent profileUnlockedIntent = new Intent(

                                Intent.ACTION_MANAGED_PROFILE_UNLOCKED);

                                Intent.ACTION_MANAGED_PROFILE_UNLOCKED);

                        unlockedIntent.putExtra(Intent.EXTRA_USER, UserHandle.of(userId));

                        profileUnlockedIntent.putExtra(Intent.EXTRA_USER, UserHandle.of(userId));

                        unlockedIntent.addFlags(

                        profileUnlockedIntent.addFlags(

                                Intent.FLAG_RECEIVER_REGISTERED_ONLY

                                Intent.FLAG_RECEIVER_REGISTERED_ONLY

                                | Intent.FLAG_RECEIVER_FOREGROUND);

                                | Intent.FLAG_RECEIVER_FOREGROUND);

                        mService.broadcastIntentLocked(null, null, profileUnlockedIntent,

                        mService.broadcastIntentLocked(null, null, profileUnlockedIntent,