Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix app standby bugs." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-27 23:38:37 +00:00
committed by Android (Google) Code Review
parent 97c4cda831 52b52a6016
commit 9d62182591
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
View File

@@ -1322,6 +1322,8 @@ public class AppStandbyController implements AppStandbyInternal {
private void setAppStandbyBucket(String packageName, int userId, @StandbyBuckets int newBucket, private void setAppStandbyBucket(String packageName, int userId, @StandbyBuckets int newBucket,
int reason, long elapsedRealtime, boolean resetTimeout) { int reason, long elapsedRealtime, boolean resetTimeout) {
if (!mAppIdleEnabled) return;
synchronized (mAppIdleLock) { synchronized (mAppIdleLock) {
// If the package is not installed, don't allow the bucket to be set. // If the package is not installed, don't allow the bucket to be set.
if (!mInjector.isPackageInstalled(packageName, 0, userId)) { if (!mInjector.isPackageInstalled(packageName, 0, userId)) {

8
services/core/java/com/android/server/AppStateTracker.java
View File

@@ -448,6 +448,7 @@ public class AppStateTracker {
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_USER_REMOVED); filter.addAction(Intent.ACTION_USER_REMOVED);
filter.addAction(Intent.ACTION_BATTERY_CHANGED); filter.addAction(Intent.ACTION_BATTERY_CHANGED);
filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
mContext.registerReceiver(new MyReceiver(), filter); mContext.registerReceiver(new MyReceiver(), filter);
refreshForcedAppStandbyUidPackagesLocked(); refreshForcedAppStandbyUidPackagesLocked();
@@ -688,6 +689,13 @@ public class AppStateTracker {
mIsPluggedIn = (intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0); mIsPluggedIn = (intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0);
} }
updateForceAllAppStandbyState(); 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();
}
} }
} }
} }