diff options
author | Jaewan Kim <jaewan@google.com> | 2016-09-19 21:19:55 +0900 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2016-09-27 00:17:46 -0700 |
commit | 3de09838fb0996bb4b420630800ad34e828fd1b6 (patch) | |
tree | c458c2d45072363197f6c51b0354647a2d84b9af | |
parent | 31f351160cdfd9dbe9919682ebe41bde3bcf91c6 (diff) | |
download | base-nougat-release.tar.gz |
DO NOT MERGE Check caller for sending media key to global priority sessionandroid-7.0.0_r15nougat-release
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().
Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
(cherry picked from commit 09c3df004bad9343092e377a7e74e11f9635734a)
-rw-r--r-- | services/core/java/com/android/server/media/MediaSessionService.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index a4d2cd25cb14..70e7b7ea8836 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -47,6 +47,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.os.PowerManager; +import android.os.Process; import android.os.RemoteException; import android.os.ResultReceiver; import android.os.ServiceManager; @@ -763,6 +764,13 @@ public class MediaSessionService extends SystemService implements Monitor { + "setup is in progress."); return; } + if (isGlobalPriorityActive() && uid != Process.SYSTEM_UID) { + // Prevent dispatching key event through reflection while the global priority + // session is active. + Slog.i(TAG, "Only the system can dispatch media key event " + + "to the global priority session."); + return; + } synchronized (mLock) { // If we don't have a media button receiver to fall back on |