Merge "Fix app standby bugs." into rvc-dev am: 9d62182591 am: 926b6b1d17 (a565c722) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1322,6 +1322,8 @@ public class AppStandbyController implements AppStandbyInternal {

		private void setAppStandbyBucket(String packageName, int userId, @StandbyBuckets int newBucket,
		int reason, long elapsedRealtime, boolean resetTimeout) {
		if (!mAppIdleEnabled) return;

		synchronized (mAppIdleLock) {
		// If the package is not installed, don't allow the bucket to be set.
		if (!mInjector.isPackageInstalled(packageName, 0, userId)) {

+8 −0

Original line number	Diff line number	Diff line
		@@ -448,6 +448,7 @@ public class AppStateTracker {
		IntentFilter filter = new IntentFilter();
		filter.addAction(Intent.ACTION_USER_REMOVED);
		filter.addAction(Intent.ACTION_BATTERY_CHANGED);
		filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
		mContext.registerReceiver(new MyReceiver(), filter);

		refreshForcedAppStandbyUidPackagesLocked();
		@@ -688,6 +689,13 @@ public class AppStateTracker {
		mIsPluggedIn = (intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0);
		}
		updateForceAllAppStandbyState();
		} else if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())
		&& !intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) {
		final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1);
		final String pkgName = intent.getData().getSchemeSpecificPart();
		if (mExemptedPackages.remove(userId, pkgName)) {
		mHandler.notifyExemptChanged();
		}
		}
		}
		}