commit 13b1ef14820c9ed803fedfc32d16e8affe3c5fb6
author Julia Reynolds <juliacr@google.com> Fri Aug 07 17:04:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 07 17:04:24 2015 +0000
tree 47902f59445d658b944af02bbb772d7a4b0cf1f8
parent ccd54267aeb549c1bd9228d282a18eb6d07537a3
parent af3414c2c759f07d3febb89cd161bac4f91ce21a

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

* commit 'af3414c2c759f07d3febb89cd161bac4f91ce21a':
  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