Merge "Prevent crashes when user is stopping" into oc-dev am: b4656dafc1 (230fc75e) · Commits · e / os / android_frameworks_base

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -373,11 +373,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
	}		}

	private void onPackageBroadcastReceived(Intent intent, int userId) {		private void onPackageBroadcastReceived(Intent intent, int userId) {
	if (!mUserManager.isUserUnlockingOrUnlocked(userId) \|\|
	isProfileWithLockedParent(userId)) {
	return;
	}

	final String action = intent.getAction();		final String action = intent.getAction();
	boolean added = false;		boolean added = false;
	boolean changed = false;		boolean changed = false;
	@@ -408,7 +403,11 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
	}		}

	synchronized (mLock) {		synchronized (mLock) {
	ensureGroupStateLoadedLocked(userId);		if (!mUserManager.isUserUnlockingOrUnlocked(userId) \|\|
			isProfileWithLockedParent(userId)) {
			return;
			}
			ensureGroupStateLoadedLocked(userId, /* enforceUserUnlockingOrUnlocked */ false);

	Bundle extras = intent.getExtras();		Bundle extras = intent.getExtras();

	@@ -844,7 +843,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
	mSecurityPolicy.enforceCallFromPackage(callingPackage);		mSecurityPolicy.enforceCallFromPackage(callingPackage);

	synchronized (mLock) {		synchronized (mLock) {
	ensureGroupStateLoadedLocked(userId);		ensureGroupStateLoadedLocked(userId, /* enforceUserUnlockingOrUnlocked */ false);

	// NOTE: The lookup is enforcing security across users by making		// NOTE: The lookup is enforcing security across users by making
	// sure the caller can only access hosts it owns.		// sure the caller can only access hosts it owns.