PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use BatteryOptimizeUtils to add packageName into PowerSaveWhitelistUserApps allowlist, which will set app into Unrestricted Mode" into main

Browse Source
This commit is contained in:
Xinyi Mao
2024-10-17 04:59:43 +00:00
committed by Android (Google) Code Review
parent 4d19f45505 1b83703adc
commit efb5fa5003
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.fuelgauge; package com.android.settings.fuelgauge;
import static com.android.settings.fuelgauge.BatteryOptimizeUtils.MODE_UNRESTRICTED;
import android.Manifest; import android.Manifest;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
@@ -24,20 +26,20 @@ import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.PowerWhitelistManager; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController; import com.android.internal.app.AlertController;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
public class RequestIgnoreBatteryOptimizations extends AlertActivity public class RequestIgnoreBatteryOptimizations extends AlertActivity
implements DialogInterface.OnClickListener { implements DialogInterface.OnClickListener {
private static final String TAG = "RequestIgnoreBatteryOptimizations"; private static final String TAG = "RequestIgnoreBatteryOptimizations";
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
private PowerWhitelistManager mPowerWhitelistManager; private ApplicationInfo mApplicationInfo;
private String mPackageName;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@@ -47,8 +49,6 @@ public class RequestIgnoreBatteryOptimizations extends AlertActivity
android.view.WindowManager.LayoutParams android.view.WindowManager.LayoutParams
.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
mPowerWhitelistManager = getSystemService(PowerWhitelistManager.class);
Uri data = getIntent().getData(); Uri data = getIntent().getData();
if (data == null) { if (data == null) {
debugLog( debugLog(
@@ -56,17 +56,18 @@ public class RequestIgnoreBatteryOptimizations extends AlertActivity
finish(); finish();
return; return;
} }
mPackageName = data.getSchemeSpecificPart(); final String packageName = data.getSchemeSpecificPart();
if (mPackageName == null) { if (TextUtils.isEmpty(packageName)) {
debugLog( debugLog(
"No data supplied for IGNORE_BATTERY_OPTIMIZATION_SETTINGS in: " + getIntent()); "No data supplied for IGNORE_BATTERY_OPTIMIZATION_SETTINGS in: " + getIntent());
finish(); finish();
return; return;
} }
// Package in Unrestricted mode already ignoring the battery optimizations.
PowerManager power = getSystemService(PowerManager.class); PowerManager power = getSystemService(PowerManager.class);
if (power.isIgnoringBatteryOptimizations(mPackageName)) { if (power.isIgnoringBatteryOptimizations(packageName)) {
debugLog("Not should prompt, already ignoring optimizations: " + mPackageName); debugLog("Not should prompt, already ignoring optimizations: " + packageName);
finish(); finish();
return; return;
} }
@@ -74,29 +75,28 @@ public class RequestIgnoreBatteryOptimizations extends AlertActivity
if (getPackageManager() if (getPackageManager()
.checkPermission( .checkPermission(
Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
mPackageName) packageName)
!= PackageManager.PERMISSION_GRANTED) { != PackageManager.PERMISSION_GRANTED) {
debugLog( debugLog(
"Requested package " "Requested package "
+ mPackageName + packageName
+ " does not hold permission " + " does not hold permission "
+ Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS); + Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
finish(); finish();
return; return;
} }
ApplicationInfo ai;
try { try {
ai = getPackageManager().getApplicationInfo(mPackageName, 0); mApplicationInfo = getPackageManager().getApplicationInfo(packageName, 0);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
debugLog("Requested package doesn't exist: " + mPackageName); debugLog("Requested package doesn't exist: " + packageName);
finish(); finish();
return; return;
} }
final AlertController.AlertParams p = mAlertParams; final AlertController.AlertParams p = mAlertParams;
final CharSequence appLabel = final CharSequence appLabel =
ai.loadSafeLabel( mApplicationInfo.loadSafeLabel(
getPackageManager(), getPackageManager(),
PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX, PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,
PackageItemInfo.SAFE_LABEL_FLAG_TRIM PackageItemInfo.SAFE_LABEL_FLAG_TRIM
@@ -114,7 +114,12 @@ public class RequestIgnoreBatteryOptimizations extends AlertActivity
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
switch (which) { switch (which) {
case BUTTON_POSITIVE: case BUTTON_POSITIVE:
mPowerWhitelistManager.addToWhitelist(mPackageName); BatteryOptimizeUtils batteryOptimizeUtils =
new BatteryOptimizeUtils(
getApplicationContext(),
mApplicationInfo.uid,
mApplicationInfo.packageName);
batteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED, Action.APPLY);
break; break;
case BUTTON_NEGATIVE: case BUTTON_NEGATIVE:
break; break;