summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-05-30 03:08:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-30 03:08:20 +0000
commitdb9d4b0e4447aa6d93e38b1fcb38802887de873d (patch)
tree2416ec8ed6cfb6d9c8322df3332a40c3dd32c499
parent0dd06d4d16b5e85833e93b97f8580f3409763edf (diff)
parent203d99a18fb4074c264ea5b3f97d25bf3b02bc4f (diff)
downloadTvSettings-db9d4b0e4447aa6d93e38b1fcb38802887de873d.tar.gz
Merge "Update argument when creating PowerWhitelistBackend." into pi-dev
-rw-r--r--Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java
index 74845e2cb..b9c65bd2c 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java
@@ -38,8 +38,7 @@ import com.android.tv.settings.SettingsPreferenceFragment;
public class HighPower extends SettingsPreferenceFragment implements
ManageApplicationsController.Callback {
- private final PowerWhitelistBackend mPowerWhitelistBackend =
- PowerWhitelistBackend.getInstance();
+ private PowerWhitelistBackend mPowerWhitelistBackend;
private ManageApplicationsController mManageApplicationsController;
private final ApplicationsState.AppFilter mFilter =
new ApplicationsState.CompoundFilter(
@@ -67,6 +66,7 @@ public class HighPower extends SettingsPreferenceFragment implements
@Override
public void onAttach(Context context) {
super.onAttach(context);
+ mPowerWhitelistBackend = PowerWhitelistBackend.getInstance(context);
mManageApplicationsController = new ManageApplicationsController(context, this,
getLifecycle(), mFilter, ApplicationsState.ALPHA_COMPARATOR);
}