Merge "Implement OP_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS exemption"

This commit is contained in:
Alex Johnston
2023-02-15 09:37:12 +00:00
committed by Android (Google) Code Review
13 changed files with 57 additions and 53 deletions

View File

@@ -96,7 +96,7 @@ public class AppStateAppBatteryUsageBridge extends AppStateBaseBridge {
// Unrestricted = AppOpsManager.MODE_ALLOWED + allowListed
// Optimized = AppOpsManager.MODE_ALLOWED + !allowListed
boolean allowListed = mPowerAllowlistBackend.isAllowlisted(pkg);
boolean allowListed = mPowerAllowlistBackend.isAllowlisted(pkg, uid);
int aomMode =
mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, uid, pkg);
@OptimizationMode int mode = MODE_UNKNOWN;

View File

@@ -43,14 +43,14 @@ public class AppStatePowerBridge extends AppStateBaseBridge {
final int N = apps.size();
for (int i = 0; i < N; i++) {
AppEntry app = apps.get(i);
app.extraInfo = mBackend.isAllowlisted(app.info.packageName)
app.extraInfo = mBackend.isAllowlisted(app.info.packageName, app.info.uid)
? Boolean.TRUE : Boolean.FALSE;
}
}
@Override
protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
app.extraInfo = mBackend.isAllowlisted(pkg) ? Boolean.TRUE : Boolean.FALSE;
app.extraInfo = mBackend.isAllowlisted(pkg, uid) ? Boolean.TRUE : Boolean.FALSE;
}
public static final AppFilter FILTER_POWER_ALLOWLISTED = new CompoundFilter(

View File

@@ -1722,7 +1722,7 @@ public class ManageApplications extends InstrumentedFragment
ApplicationsState.AppEntry entry = mEntries.get(applicationPosition);
return !mBackend.isSysAllowlisted(entry.info.packageName)
&& !mBackend.isDefaultActiveApp(entry.info.packageName);
&& !mBackend.isDefaultActiveApp(entry.info.packageName, entry.info.uid);
}
@Override