Merge "Idle timebase" into mnc-dev

diff --cc services/core/java/com/android/server/DeviceIdleController.java
index 76465d4,cfd2db6..0b33812
--- 1/services/core/java/com/android/server/DeviceIdleController.java
--- 2/services/core/java/com/android/server/DeviceIdleController.java
+++ b/services/core/java/com/android/server/DeviceIdleController.java
@@@ -452,9 -447,21 +456,16 @@@ public class DeviceIdleController exten
          }
      }
  
+     public boolean isPowerSaveWhitelistAppInternal(String packageName) {
+         synchronized (this) {
+             return mPowerSaveWhitelistApps.containsKey(packageName)
+                     || mPowerSaveWhitelistUserApps.containsKey(packageName);
+         }
+     }
+ 
      public int[] getAppIdWhitelistInternal() {
          synchronized (this) {
 -            int size = mPowerSaveWhitelistAppIds.size();
 -            int[] appids = new int[size];
 -            for (int i = 0; i < size; i++) {
 -                appids[i] = mPowerSaveWhitelistAppIds.keyAt(i);
 -            }
 -            return appids;
 +            return mPowerSaveWhitelistAppIdArray;
          }
      }
  

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge