Revert "Mark uids holding WakeLocks as foreground"

This reverts commit 442b6b6673e41d996d8930cfbbe2a91e58445e79.

Conflicts:

	services/java/com/android/server/am/ActivityManagerService.java

2 files changed, 0 insertions, 56 deletions

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index fcb7e29..493a348 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -728,12 +728,6 @@ class PowerManagerService extends IPowerManager.Stub
 
         if (acquireType >= 0) {
             try {
-                mActivityService.noteStartWakeLock(acquireUid, acquireName, acquireType);
-            } catch (RemoteException e) {
-                // Ignore
-            }
-
-            try {
                 mBatteryStats.noteStartWakelock(acquireUid, acquireName, acquireType);
             } catch (RemoteException e) {
                 // Ignore
@@ -802,12 +796,6 @@ class PowerManagerService extends IPowerManager.Stub
         releaseType = wl.monitorType;
 
         if (releaseType >= 0) {
-            try {
-                mActivityService.noteStopWakeLock(releaseUid, releaseName, releaseType);
-            } catch (RemoteException e) {
-                // Ignore
-            }
-
             long origId = Binder.clearCallingIdentity();
             try {
                 mBatteryStats.noteStopWakelock(releaseUid, releaseName, releaseType);
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 73ecdaa..0c11940 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -702,11 +702,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
             = new ArrayList<ServiceRecord>();
 
     /**
-     * Count of WakeLocks held per uid
-     */
-    final HashMap<Integer, Integer> mUidWakeLocks = new HashMap<Integer, Integer>();
-
-    /**
      * Backup/restore process management
      */
     String mBackupAppName = null;
@@ -4410,39 +4405,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
             Binder.restoreCallingIdentity(origId);
         }
     }
-
-    public void noteStartWakeLock(int uid, String tag, int type) {
-        Integer iuid = Integer.valueOf(uid);
-        synchronized (this) {
-            Integer count = mUidWakeLocks.get(iuid);
-            if (count == null) {
-                count = new Integer(1);
-                mUidWakeLocks.put(iuid, count);
-                updateOomAdjLocked();
-            } else {
-                ++count;
-                mUidWakeLocks.put(iuid, count);
-            }
-        }
-    }
-
-    public void noteStopWakeLock(int uid, String tag, int type) {
-        Integer iuid = Integer.valueOf(uid);
-        synchronized (this) {
-            Integer count = mUidWakeLocks.get(iuid);
-            if (count != null) {
-                if (--count > 0) {
-                    mUidWakeLocks.put(iuid, count);
-                } else {
-                    mUidWakeLocks.remove(iuid);
-                    updateOomAdjLocked();
-                }
-            } else {
-                Log.e(TAG, "Stopping stopped wake lock for uid "
-                    + uid + ": " + tag);
-            }
-        }
-    }
     
     /**
      * Perform clean-up of service connections in an activity record.
@@ -13880,12 +13842,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
             adj = FOREGROUND_APP_ADJ;
             schedGroup = Process.THREAD_GROUP_DEFAULT;
             app.adjType = "exec-service";
-        } else if (mUidWakeLocks.get(app.info.uid) != null) {
-            // An app that is currently holding a wakelock also
-            // counts as being in the foreground.
-            adj = FOREGROUND_APP_ADJ;
-            schedGroup = Process.THREAD_GROUP_DEFAULT;
-            app.adjType = "wakelock";
         } else if (app.foregroundServices) {
             // The user is aware of this app, so make it visible.
             adj = VISIBLE_APP_ADJ;