From eb4786ed70b0645f67c0de0df4858deb50eb7d31 Mon Sep 17 00:00:00 2001
From: Kweku Adams <kwekua@google.com>
Date: Fri, 15 May 2020 10:42:40 -0700
Subject: [PATCH] Migrate to PowerWhitelistManager.

In preparation for DeviceIdle mainlining, we have to define stable APIs
for other modules and the rest of the system to use. This migrates to
the stable PowerWhitelistManager API.

Bug: 142420609
Bug: 144864180
Test: Android builds
Change-Id: Ic1006c03f3b73c2855fd127ee2cd7fff676caf3e
---
 .../RequestIgnoreBatteryOptimizations.java      | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
index 27bd889afcb..c06a4ffba1f 100644
--- a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
+++ b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
@@ -22,10 +22,8 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.IDeviceIdleController;
 import android.os.PowerManager;
-import android.os.RemoteException;
-import android.os.ServiceManager;
+import android.os.PowerWhitelistManager;
 import android.util.Log;
 
 import com.android.internal.app.AlertActivity;
@@ -36,17 +34,14 @@ public class RequestIgnoreBatteryOptimizations extends AlertActivity implements
         DialogInterface.OnClickListener {
     static final String TAG = "RequestIgnoreBatteryOptimizations";
 
-    private static final String DEVICE_IDLE_SERVICE = "deviceidle";
-
-    IDeviceIdleController mDeviceIdleService;
+    private PowerWhitelistManager mPowerWhitelistManager;
     String mPackageName;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mDeviceIdleService = IDeviceIdleController.Stub.asInterface(
-                ServiceManager.getService(DEVICE_IDLE_SERVICE));
+        mPowerWhitelistManager = getSystemService(PowerWhitelistManager.class);
 
         Uri data = getIntent().getData();
         if (data == null) {
@@ -102,11 +97,7 @@ public class RequestIgnoreBatteryOptimizations extends AlertActivity implements
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case BUTTON_POSITIVE:
-                try {
-                    mDeviceIdleService.addPowerSaveWhitelistApp(mPackageName);
-                } catch (RemoteException e) {
-                    Log.w(TAG, "Unable to reach IDeviceIdleController", e);
-                }
+                mPowerWhitelistManager.addToWhitelist(mPackageName);
                 setResult(RESULT_OK);
                 break;
             case BUTTON_NEGATIVE: