am d3fc46c7: am b3c5aebd: am 2d091225: Merge "Gracefully handle races with... (5d4a67ff) · Commits · e / os / android_frameworks_base

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -5503,8 +5503,10 @@ public final class ActivityManagerService extends ActivityManagerNative
		// Entire package setting changed
		enabled = pm.getApplicationEnabledSetting(packageName,
		(userId != UserHandle.USER_ALL) ? userId : UserHandle.USER_OWNER);
		} catch (RemoteException e) {
		// Can't happen...
		} catch (Exception e) {
		// No such package/component; probably racing with uninstall. In any
		// event it means we have nothing further to do here.
		return;
		}
		packageDisabled = enabled != PackageManager.COMPONENT_ENABLED_STATE_ENABLED
		&& enabled != PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
		@@ -5519,8 +5521,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		enabled = pm.getComponentEnabledSetting(
		new ComponentName(packageName, changedClass),
		(userId != UserHandle.USER_ALL) ? userId : UserHandle.USER_OWNER);
		} catch (RemoteException e) {
		// Can't happen...
		} catch (Exception e) {
		// As above, probably racing with uninstall.
		return;
		}
		if (enabled != PackageManager.COMPONENT_ENABLED_STATE_ENABLED
		&& enabled != PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {