commit f566d756b267ce13832babee421f9a02eb56b900
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 17 05:34:39 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 17 05:34:39 2018 +0000
tree 31077af9334b1336e47c6deb225d5eb3eebb7910
parent 6d684ebc2500dcd8fa3a80ae8707fe3b01b37298
parent 5e5c171dea2bb43013fbd72933a1b84df9dba818

Merge "Clear the right uid's alarms, please"

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index a0799ed..dfe89e0 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -6243,7 +6243,7 @@
 
                     // Clear its pending alarms
                     AlarmManagerInternal ami = LocalServices.getService(AlarmManagerInternal.class);
-                    ami.removeAlarmsForUid(uid);
+                    ami.removeAlarmsForUid(appInfo.uid);
                 }
             } catch (RemoteException e) {
             }