diff options
| author | Michael Wright <michaelwr@google.com> | 2015-02-11 18:23:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-11 18:23:55 +0000 |
| commit | 3292c0e2640667e5ef78896653a41c85e7de06c5 (patch) | |
| tree | e7a2425a3bd7e321f682b6c0a78ff9d81201dfee /services/core/java | |
| parent | 50996a12a8e859346d5eb3c4569c4e81c9b52a05 (diff) | |
| parent | 05aab5810a5f0296c3650f104c58479b2765c0b7 (diff) | |
| download | frameworks_base-3292c0e2640667e5ef78896653a41c85e7de06c5.zip frameworks_base-3292c0e2640667e5ef78896653a41c85e7de06c5.tar.gz frameworks_base-3292c0e2640667e5ef78896653a41c85e7de06c5.tar.bz2 | |
Merge "Stop active media projections on user switch." into lmp-mr1-dev
Diffstat (limited to 'services/core/java')
| -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 |