diff options
| author | Michael Wright <michaelwr@google.com> | 2015-02-11 18:33:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-11 18:33:00 +0000 |
| commit | 40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55 (patch) | |
| tree | 24f16e56822d88a2007ee887d6f7249b3000a7f1 /services | |
| parent | 46dbb5be4c56e8af603514a3cf2bd7daf0191724 (diff) | |
| parent | 3292c0e2640667e5ef78896653a41c85e7de06c5 (diff) | |
| download | frameworks_base-40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55.zip frameworks_base-40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55.tar.gz frameworks_base-40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55.tar.bz2 | |
Merge "Stop active media projections on user switch." into lmp-mr1-dev
automerge: 3292c0e
* commit '3292c0e2640667e5ef78896653a41c85e7de06c5':
Stop active media projections on user switch.
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java index e9b3f8b..bfdc400 100644 --- a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java +++ b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java @@ -98,6 +98,11 @@ public final class MediaProjectionManagerService extends SystemService @Override public void onSwitchUser(int userId) { mMediaRouter.rebindAsUser(userId); + synchronized (mLock) { + if (mProjectionGrant != null) { + mProjectionGrant.stop(); + } + } } @Override |