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

Merge changes Ib80d68d6,I0d57d5b2 into qt-dev

Browse Source 
* changes:
  Init PowerWhitelistbackend to stop crash
  Create gitignore for Settings
This commit is contained in:
Lei Yu
2019-04-05 17:11:34 +00:00
committed by Android (Google) Code Review
parent 41f0a69b76 033fe6eec0
commit e323b40f4e
4 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -952,6 +952,7 @@ public class ManageApplications extends InstrumentedFragment
mContext = manageApplications.getActivity();
mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
mAppFilter = appFilter;
mBackend = PowerWhitelistBackend.getInstance(mContext);
if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
mExtraInfoBridge = new AppStateNotificationBridge(mContext, mState, this,
manageApplications.mUsageStatsManager,

16
src/com/android/settings/fuelgauge/HighPowerDetail.java
View File

@@ -173,10 +173,18 @@ public class HighPowerDetail extends InstrumentedDialogFragment implements OnCli
}
public static CharSequence getSummary(Context context, String pkg) {
PowerWhitelistBackend powerWhitelist = PowerWhitelistBackend.getInstance(context);
return context.getString(powerWhitelist.isSysWhitelisted(pkg) ? R.string.high_power_system
: powerWhitelist.isWhitelisted(pkg) ? R.string.high_power_on
: R.string.high_power_off);
return getSummary(context, PowerWhitelistBackend.getInstance(context), pkg);
}
@VisibleForTesting
static CharSequence getSummary(Context context, PowerWhitelistBackend powerWhitelist,
String pkg) {
return context.getString(
powerWhitelist.isSysWhitelisted(pkg) || powerWhitelist.isDefaultActiveApp(pkg)
? R.string.high_power_system
: powerWhitelist.isWhitelisted(pkg)
? R.string.high_power_on
: R.string.high_power_off);
}
public static void show(Fragment caller, int uid, String packageName, int requestCode) {