summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index c1ab5b6a315e..ae4cd02c3f2b 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -16771,21 +16771,18 @@ public class ActivityManagerService extends IActivityManager.Stub
@Override
public void setDeviceOwnerUid(int uid) {
- synchronized (ActivityManagerService.this) {
- mDeviceOwnerUid = uid;
- }
+ mDeviceOwnerUid = uid;
}
@Override
public boolean isDeviceOwner(int uid) {
- synchronized (ActivityManagerService.this) {
- return uid >= 0 && mDeviceOwnerUid == uid;
- }
+ int cachedUid = mDeviceOwnerUid;
+ return uid >= 0 && cachedUid == uid;
}
@Override
public void addPendingTopUid(int uid, int pid) {
- mPendingStartActivityUids.add(uid, pid);
+ mPendingStartActivityUids.add(uid, pid);
}
@Override