commit 9cb988073b8944f1031f8ac0b12cdad89c32ff4b
author Linux Build Service Account <lnxbuild@localhost> Fri Nov 27 20:31:35 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Nov 27 20:31:35 2015 -0800
tree a44027ed45a416b6a8dd9d07d8037d9f17569ac8
parent 4f8e6d6a18c34aa2e954c3497dd76a6369f6618d
parent d6b1fcafd54b2611354ff9d693b2c40fd9dda738

Merge "Update the uid correctly."

services/core/java/com/android/server/AlarmManagerService.java

diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
index edbb289..9de6f2a 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -2089,7 +2089,7 @@
             workSource = _ws;
             flags = _flags;
             alarmClock = _info;
-            uid = _uid;
+            uid = operation.getCreatorUid();
             pid = Binder.getCallingPid();
         }
 
@@ -2244,6 +2244,12 @@
                 mInFlight.add(inflight);
                 mBroadcastRefCount++;
                 mTriggeredUids.add(new Integer(alarm.uid));
+                if (checkReleaseWakeLock()) {
+                    if (mWakeLock.isHeld()) {
+                        mWakeLock.release();
+                        if (localLOGV) Slog.v(TAG, "AM WakeLock Released Internally deliverAlarms");
+                    }
+                }
 
                 if (allowWhileIdle) {
                     // Record the last time this uid handled an ALLOW_WHILE_IDLE alarm.
@@ -2712,8 +2718,12 @@
                     }
                 } else {
                     // the next of our alarms is now in flight.  reattribute the wakelock.
+                    InFlight inFlight = null;
                     if (mInFlight.size() > 0) {
-                        InFlight inFlight = mInFlight.get(0);
+                        for(int index = 0; index < mInFlight.size(); index++){
+                            inFlight = mInFlight.get(index);
+                            if(!mBlockedUids.contains(inFlight.mUid)) break;
+                        }
                         setWakelockWorkSource(inFlight.mPendingIntent, inFlight.mWorkSource,
                                 inFlight.mAlarmType, inFlight.mTag, false);
                     } else {