Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev

This commit is contained in:
Jaewan Kim
2016-09-21 22:21:03 +00:00
committed by Android (Google) Code Review

View File

@@ -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;
@@ -697,6 +698,14 @@ public class MediaSessionService extends SystemService implements Monitor {
final int uid = Binder.getCallingUid();
final long token = Binder.clearCallingIdentity();
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;
}
try {
synchronized (mLock) {
MediaSessionRecord session = mPriorityStack