From 8a61657c6d9aa4f9dfd5e39f897469d5a81d5ad5 Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Fri, 29 Mar 2019 11:37:47 -0700
Subject: [PATCH] Disable "Battery dialog" for default apps

If it is default active app(i.e. Phone, SMS), disable battery
optimzation dialog so user can't optimize it.

Fixes: 118910079
Test: RunSettingsLibRoboTests
Change-Id: I7223913c1e6ef68d84adfc2c54d133661a529202
---
 .../applications/manageapplications/ManageApplications.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 4faa158ddc1..ee66b12d83a 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -927,6 +927,7 @@ public class ManageApplications extends InstrumentedFragment
         private boolean mHasReceivedBridgeCallback;
         private FileViewHolderController mExtraViewController;
         private SearchFilter mSearchFilter;
+        private PowerWhitelistBackend mBackend;
 
         // This is to remember and restore the last scroll position when this
         // fragment is paused. We need this special handling because app entries are added gradually
@@ -1361,8 +1362,9 @@ public class ManageApplications extends InstrumentedFragment
                 return true;
             }
             ApplicationsState.AppEntry entry = mEntries.get(position);
-            return !PowerWhitelistBackend.getInstance(mContext)
-                    .isSysWhitelisted(entry.info.packageName);
+
+            return !mBackend.isSysWhitelisted(entry.info.packageName)
+                    && !mBackend.isDefaultActiveApp(entry.info.packageName);
         }
 
         @Override