drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue with early service start" into klp-modular-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-03-25 17:22:11 +00:00
committed by Android (Google) Code Review
parent 27f67d25c8 a6db4ab619
commit 415e6f8ed4
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@ -1195,7 +1195,6 @@ public class NotificationManagerService extends SystemService {
getContext().registerReceiver(mIntentReceiver, sdFilter);
mSettingsObserver = new SettingsObserver(mHandler);
mSettingsObserver.observe();
// spin up NotificationScorers
String[] notificationScorerNames = resources.getStringArray(
@ -1250,8 +1249,10 @@ public class NotificationManagerService extends SystemService {
// Grab our optional AudioService
mAudioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);
// make sure our listener services are properly bound
rebindListenerServices();
} else if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) {
// This observer will force an update when observe is called, causing us to
// bind to listener services.
mSettingsObserver.observe();
}
}

4
services/core/java/com/android/server/pm/UserManagerService.java
View File

@ -233,9 +233,7 @@ public class UserManagerService extends IUserManager.Stub {
}
void systemReady() {
final Context context = ActivityThread.systemMain().getSystemContext();
mUserPackageMonitor.register(context,
null, UserHandle.ALL, false);
mUserPackageMonitor.register(mContext, null, UserHandle.ALL, false);
userForeground(UserHandle.USER_OWNER);
}