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

Merge "Plumb context object to PowerWhitelistBackend."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-30 01:50:40 +00:00
committed by Android (Google) Code Review
parent 3a05544d34 7e395e1a00
commit 6e06da361a
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/applications/AppStatePowerBridge.java
View File

@@ -15,6 +15,8 @@
*/
package com.android.settings.applications;
import android.content.Context;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -28,10 +30,11 @@ import java.util.ArrayList;
*/
public class AppStatePowerBridge extends AppStateBaseBridge {
private final PowerWhitelistBackend mBackend = PowerWhitelistBackend.getInstance();
private final PowerWhitelistBackend mBackend;
public AppStatePowerBridge(ApplicationsState appState, Callback callback) {
public AppStatePowerBridge(Context context, ApplicationsState appState, Callback callback) {
super(appState, callback);
mBackend = PowerWhitelistBackend.getInstance(context);
}
@Override
@@ -50,11 +53,6 @@ public class AppStatePowerBridge extends AppStateBaseBridge {
app.extraInfo = mBackend.isWhitelisted(pkg) ? Boolean.TRUE : Boolean.FALSE;
}
public static class HighPowerState {
public boolean isHighPower;
public boolean isSystemHighPower;
}
public static final AppFilter FILTER_POWER_WHITELISTED = new CompoundFilter(
ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED, new AppFilter() {
@Override

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

@@ -893,7 +893,7 @@ public class ManageApplications extends InstrumentedFragment
} else if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) {
mExtraInfoBridge = new AppStateUsageBridge(mContext, mState, this);
} else if (mManageApplications.mListType == LIST_TYPE_HIGH_POWER) {
mExtraInfoBridge = new AppStatePowerBridge(mState, this);
mExtraInfoBridge = new AppStatePowerBridge(mContext, mState, this);
} else if (mManageApplications.mListType == LIST_TYPE_OVERLAY) {
mExtraInfoBridge = new AppStateOverlayBridge(mContext, mState, this);
} else if (mManageApplications.mListType == LIST_TYPE_WRITE_SETTINGS) {
@@ -1285,7 +1285,8 @@ public class ManageApplications extends InstrumentedFragment
return true;
}
ApplicationsState.AppEntry entry = mEntries.get(position);
return !PowerWhitelistBackend.getInstance().isSysWhitelisted(entry.info.packageName);
return !PowerWhitelistBackend.getInstance(mContext)
.isSysWhitelisted(entry.info.packageName);
}
@Override