Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev (17e9d246) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/HdmiControlService.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -1033,6 +1033,7 @@ public final class HdmiControlService extends SystemService {

		@Override
		public HdmiDeviceInfo getActiveSource() {
		enforceAccessPermission();
		HdmiCecLocalDeviceTv tv = tv();
		if (tv == null) {
		Slog.w(TAG, "Local tv device not available");
		@@ -1365,11 +1366,13 @@ public final class HdmiControlService extends SystemService {

		@Override
		public void setHdmiRecordListener(IHdmiRecordListener listener) {
		enforceAccessPermission();
		HdmiControlService.this.setHdmiRecordListener(listener);
		}

		@Override
		public void startOneTouchRecord(final int recorderAddress, final byte[] recordSource) {
		enforceAccessPermission();
		runOnServiceThread(new Runnable() {
		@Override
		public void run() {
		@@ -1384,6 +1387,7 @@ public final class HdmiControlService extends SystemService {

		@Override
		public void stopOneTouchRecord(final int recorderAddress) {
		enforceAccessPermission();
		runOnServiceThread(new Runnable() {
		@Override
		public void run() {
		@@ -1399,6 +1403,7 @@ public final class HdmiControlService extends SystemService {
		@Override
		public void startTimerRecording(final int recorderAddress, final int sourceType,
		final byte[] recordSource) {
		enforceAccessPermission();
		runOnServiceThread(new Runnable() {
		@Override
		public void run() {
		@@ -1414,6 +1419,7 @@ public final class HdmiControlService extends SystemService {
		@Override
		public void clearTimerRecording(final int recorderAddress, final int sourceType,
		final byte[] recordSource) {
		enforceAccessPermission();
		runOnServiceThread(new Runnable() {
		@Override
		public void run() {