commit e113f0c4876b7529170768f8c7cf99f218d48ca8
author Julia Reynolds <juliacr@google.com> Fri Aug 07 16:45:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 07 16:45:04 2015 +0000
tree dd37668b84ab672b9c027133caca3a6b9c5738b2
parent 233f1b61ce627819adb4351eb0b2d78f3020a38d
parent b7028f254de1f7fdda5c3ee248f2e5a9294cc4dd

am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev

* commit 'b7028f254de1f7fdda5c3ee248f2e5a9294cc4dd':
  Hide optimization control on battery details page for non whitelisted apps.

src/com/android/settings/fuelgauge/PowerUsageDetail.java

diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 6d4e398..6332558 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -430,7 +430,8 @@
             } else {
                 removePreference(KEY_TWO_BUTTONS);
             }
-            if (mApp != null) {
+            if (mApp != null
+                    && PowerWhitelistBackend.getInstance().isWhitelisted(mApp.packageName)) {
                 mHighPower = findPreference(KEY_HIGH_POWER);
                 mHighPower.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                     @Override