From e41b76f15a1b6f0dc257afc3af789bb46b90121c Mon Sep 17 00:00:00 2001 From: Shubang Date: Wed, 7 Jun 2017 13:23:12 -0700 Subject: [PATCH] Add permission CHANGE_HDMI_CEC_ACTIVE_SOURCE Test: mmm Bug: 62270868 Change-Id: I7e8aad5324598ae2e2408d6ef6cb62d58d687d0e --- core/res/AndroidManifest.xml | 6 ++++++ .../java/com/android/server/tv/TvInputManagerService.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ae7355f77cd02..0ebbe06ce8996 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2612,6 +2612,12 @@ + + + diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java index 25a0772efd7f8..1afde550f0271 100644 --- a/services/core/java/com/android/server/tv/TvInputManagerService.java +++ b/services/core/java/com/android/server/tv/TvInputManagerService.java @@ -1218,6 +1218,12 @@ public final class TvInputManagerService extends SystemService { @Override public void setMainSession(IBinder sessionToken, int userId) { + if (mContext.checkCallingPermission( + android.Manifest.permission.CHANGE_HDMI_CEC_ACTIVE_SOURCE) + != PackageManager.PERMISSION_GRANTED) { + throw new SecurityException( + "The caller does not have CHANGE_HDMI_CEC_ACTIVE_SOURCE permission"); + } if (DEBUG) { Slog.d(TAG, "setMainSession(sessionToken=" + sessionToken + ")"); }