diff options
| -rw-r--r-- | media/java/android/media/session/MediaSession.java | 17 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java index b8184a0789b6..b8d01c44348b 100644 --- a/media/java/android/media/session/MediaSession.java +++ b/media/java/android/media/session/MediaSession.java @@ -119,7 +119,8 @@ public final class MediaSession { private final ISession mBinder; private final CallbackStub mCbStub; - private CallbackMessageHandler mCallbackHandler; + // Do not change the name of mCallback. Support lib accesses this by using reflection. + private CallbackMessageHandler mCallback; private VolumeProvider mVolumeProvider; private PlaybackState mPlaybackState; @@ -194,13 +195,13 @@ public final class MediaSession { */ public void setCallback(@Nullable Callback callback, @Nullable Handler handler) { synchronized (mLock) { - if (mCallbackHandler != null) { + if (mCallback != null) { // We're updating the callback, clear the session from the old one. - mCallbackHandler.mCallback.mSession = null; - mCallbackHandler.removeCallbacksAndMessages(null); + mCallback.mCallback.mSession = null; + mCallback.removeCallbacksAndMessages(null); } if (callback == null) { - mCallbackHandler = null; + mCallback = null; return; } if (handler == null) { @@ -209,7 +210,7 @@ public final class MediaSession { callback.mSession = this; CallbackMessageHandler msgHandler = new CallbackMessageHandler(handler.getLooper(), callback); - mCallbackHandler = msgHandler; + mCallback = msgHandler; } } @@ -634,8 +635,8 @@ public final class MediaSession { private void postToCallback(int what, Object obj, Bundle extras) { synchronized (mLock) { - if (mCallbackHandler != null) { - mCallbackHandler.post(what, obj, extras); + if (mCallback != null) { + mCallback.post(what, obj, extras); } } } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 6b8af98d77c9..f230b12eb2f5 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -4371,7 +4371,7 @@ public class ActivityManagerService extends IActivityManager.Stub "updateUsageStats: comp=" + component + "res=" + resumed); final BatteryStatsImpl stats = mBatteryStatsService.getActiveStatistics(); StatsLog.write(StatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED, - component.userId, component.realActivity.getPackageName(), + component.app.uid, component.realActivity.getPackageName(), component.realActivity.getShortClassName(), resumed ? StatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED__ACTIVITY__MOVE_TO_FOREGROUND : StatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED__ACTIVITY__MOVE_TO_BACKGROUND); |