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

Commit f2754ec5 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "profiles: Don't broadcast before boot completed" into cm-10.1

parents d4a07e7d e976624b

services/java/com/android/server/ProfileManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import org.xmlpull.v1.XmlPullParser; 
import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlPullParserFactory;



import android.app.ActivityManagerNative;

import android.app.IProfileManager;

import android.app.NotificationGroup;

import android.app.Profile;
@@ -227,7 +228,8 @@ public class ProfileManagerService extends IProfileManager.Stub { 


                restoreCallingIdentity(token);

                persistIfDirty();

            } else if (lastProfile != mActiveProfile) {

            } else if (lastProfile != mActiveProfile &&

                    ActivityManagerNative.isSystemReady()) {

                // Something definitely changed: notify.

                long token = clearCallingIdentity();

                Intent broadcast = new Intent(INTENT_ACTION_PROFILE_UPDATED);