diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 39 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/UserController.java | 8 |
2 files changed, 17 insertions, 30 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index f72c9fbf1a1b..df90a4054751 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -2535,11 +2535,8 @@ public class ActivityManagerService extends IActivityManager.Stub Slog.d(TAG_SWITCH, "updateActivityUsageStats: comp=" + activity + " hash=" + appToken.hashCode() + " event=" + event); } - synchronized (this) { - if (mUsageStatsService != null) { - mUsageStatsService.reportEvent(activity, userId, event, appToken.hashCode(), - taskRoot); - } + if (mUsageStatsService != null) { + mUsageStatsService.reportEvent(activity, userId, event, appToken.hashCode(), taskRoot); } if (mContentCaptureService != null && (event == Event.ACTIVITY_PAUSED || event == Event.ACTIVITY_RESUMED || event == Event.ACTIVITY_STOPPED @@ -2559,10 +2556,8 @@ public class ActivityManagerService extends IActivityManager.Stub Slog.d(TAG_SWITCH, "updateActivityUsageStats: package=" + packageName + " event=" + event); } - synchronized (this) { - if (mUsageStatsService != null) { - mUsageStatsService.reportEvent(packageName, userId, event); - } + if (mUsageStatsService != null) { + mUsageStatsService.reportEvent(packageName, userId, event); } } @@ -2577,12 +2572,10 @@ public class ActivityManagerService extends IActivityManager.Stub Slog.d(TAG_SWITCH, "updateForegroundServiceUsageStats: comp=" + service + " started=" + started); } - synchronized (this) { - if (mUsageStatsService != null) { - mUsageStatsService.reportEvent(service, userId, - started ? UsageEvents.Event.FOREGROUND_SERVICE_START - : UsageEvents.Event.FOREGROUND_SERVICE_STOP, 0, null); - } + if (mUsageStatsService != null) { + mUsageStatsService.reportEvent(service, userId, + started ? UsageEvents.Event.FOREGROUND_SERVICE_START + : UsageEvents.Event.FOREGROUND_SERVICE_STOP, 0, null); } } @@ -6100,7 +6093,7 @@ public class ActivityManagerService extends IActivityManager.Stub return pfd; } - void reportGlobalUsageEventLocked(int event) { + void reportGlobalUsageEvent(int event) { final int currentUserId = mUserController.getCurrentUserId(); mUsageStatsService.reportEvent(Event.DEVICE_EVENT_PACKAGE_NAME, currentUserId, event); int[] profiles = mUserController.getCurrentProfileIds(); @@ -6114,8 +6107,8 @@ public class ActivityManagerService extends IActivityManager.Stub } } - void reportCurWakefulnessUsageEventLocked() { - reportGlobalUsageEventLocked(mWakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE + void reportCurWakefulnessUsageEvent() { + reportGlobalUsageEvent(mWakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE ? UsageEvents.Event.SCREEN_INTERACTIVE : UsageEvents.Event.SCREEN_NON_INTERACTIVE); } @@ -6129,7 +6122,7 @@ public class ActivityManagerService extends IActivityManager.Stub if (wasAwake != isAwake) { // Also update state in a special way for running foreground services UI. mServices.updateScreenStateLocked(isAwake); - reportCurWakefulnessUsageEventLocked(); + reportCurWakefulnessUsageEvent(); mActivityTaskManager.onScreenAwakeChanged(isAwake); mOomAdjProfiler.onWakefulnessChanged(wakefulness); } @@ -16529,11 +16522,9 @@ public class ActivityManagerService extends IActivityManager.Stub } public void reportCurKeyguardUsageEvent(boolean keyguardShowing) { - synchronized(ActivityManagerService.this) { - ActivityManagerService.this.reportGlobalUsageEventLocked(keyguardShowing - ? UsageEvents.Event.KEYGUARD_SHOWN - : UsageEvents.Event.KEYGUARD_HIDDEN); - } + ActivityManagerService.this.reportGlobalUsageEvent(keyguardShowing + ? UsageEvents.Event.KEYGUARD_SHOWN + : UsageEvents.Event.KEYGUARD_HIDDEN); } @Override diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index ffe1d68c0583..3bbc8373cef3 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -3046,15 +3046,11 @@ class UserController implements Handler.Callback { } void reportGlobalUsageEventLocked(int event) { - synchronized (mService) { - mService.reportGlobalUsageEventLocked(event); - } + mService.reportGlobalUsageEvent(event); } void reportCurWakefulnessUsageEvent() { - synchronized (mService) { - mService.reportCurWakefulnessUsageEventLocked(); - } + mService.reportCurWakefulnessUsageEvent(); } void taskSupervisorRemoveUser(@UserIdInt int userId) { |