Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev

2 files changed, 10 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index d8da700..786196f 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -39,6 +39,7 @@ import android.telephony.TelephonyManager;
 import android.util.Slog;
 
 import com.android.internal.app.IBatteryStats;
+import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.os.BatteryStatsImpl;
 import com.android.internal.os.PowerProfile;
 import com.android.server.LocalServices;
@@ -868,6 +869,9 @@ public final class BatteryStatsService extends IBatteryStats.Stub
         if (noOutput) {
             return;
         }
+        if (BatteryStatsHelper.checkWifiOnly(mContext)) {
+            flags |= BatteryStats.DUMP_DEVICE_WIFI_ONLY;
+        }
         if (useCheckinFormat) {
             List<ApplicationInfo> apps = mContext.getPackageManager().getInstalledApplications(0);
             if (isRealCheckin) {
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 41db2c3..9734bd4 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -862,7 +862,8 @@ public final class PowerManagerService extends com.android.server.SystemService
         }
     }
 
-    private void updateWakeLockWorkSourceInternal(IBinder lock, WorkSource ws, String historyTag) {
+    private void updateWakeLockWorkSourceInternal(IBinder lock, WorkSource ws, String historyTag,
+            int callingUid) {
         synchronized (mLock) {
             int index = findWakeLockIndexLocked(lock);
             if (index < 0) {
@@ -870,7 +871,8 @@ public final class PowerManagerService extends com.android.server.SystemService
                     Slog.d(TAG, "updateWakeLockWorkSourceInternal: lock=" + Objects.hashCode(lock)
                             + " [not found], ws=" + ws);
                 }
-                throw new IllegalArgumentException("Wake lock not active");
+                throw new IllegalArgumentException("Wake lock not active: " + lock
+                        + " from uid " + callingUid);
             }
 
             WakeLock wakeLock = mWakeLocks.get(index);
@@ -2834,9 +2836,10 @@ public final class PowerManagerService extends com.android.server.SystemService
                 ws = null;
             }
 
+            final int callingUid = Binder.getCallingUid();
             final long ident = Binder.clearCallingIdentity();
             try {
-                updateWakeLockWorkSourceInternal(lock, ws, historyTag);
+                updateWakeLockWorkSourceInternal(lock, ws, historyTag, callingUid);
             } finally {
                 Binder.restoreCallingIdentity(ident);
             }