Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jinsuk Kim
2014-10-20 22:50:36 +00:00
committed by Android (Google) Code Review
parent 01c9d330b7 b22d9ee0a3
commit 17e9d2468f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -1033,6 +1033,7 @@ public final class HdmiControlService extends SystemService {
@Override @Override
public HdmiDeviceInfo getActiveSource() { public HdmiDeviceInfo getActiveSource() {
enforceAccessPermission();
HdmiCecLocalDeviceTv tv = tv(); HdmiCecLocalDeviceTv tv = tv();
if (tv == null) { if (tv == null) {
Slog.w(TAG, "Local tv device not available"); Slog.w(TAG, "Local tv device not available");
@@ -1365,11 +1366,13 @@ public final class HdmiControlService extends SystemService {
@Override @Override
public void setHdmiRecordListener(IHdmiRecordListener listener) { public void setHdmiRecordListener(IHdmiRecordListener listener) {
enforceAccessPermission();
HdmiControlService.this.setHdmiRecordListener(listener); HdmiControlService.this.setHdmiRecordListener(listener);
} }
@Override @Override
public void startOneTouchRecord(final int recorderAddress, final byte[] recordSource) { public void startOneTouchRecord(final int recorderAddress, final byte[] recordSource) {
enforceAccessPermission();
runOnServiceThread(new Runnable() { runOnServiceThread(new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -1384,6 +1387,7 @@ public final class HdmiControlService extends SystemService {
@Override @Override
public void stopOneTouchRecord(final int recorderAddress) { public void stopOneTouchRecord(final int recorderAddress) {
enforceAccessPermission();
runOnServiceThread(new Runnable() { runOnServiceThread(new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -1399,6 +1403,7 @@ public final class HdmiControlService extends SystemService {
@Override @Override
public void startTimerRecording(final int recorderAddress, final int sourceType, public void startTimerRecording(final int recorderAddress, final int sourceType,
final byte[] recordSource) { final byte[] recordSource) {
enforceAccessPermission();
runOnServiceThread(new Runnable() { runOnServiceThread(new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -1414,6 +1419,7 @@ public final class HdmiControlService extends SystemService {
@Override @Override
public void clearTimerRecording(final int recorderAddress, final int sourceType, public void clearTimerRecording(final int recorderAddress, final int sourceType,
final byte[] recordSource) { final byte[] recordSource) {
enforceAccessPermission();
runOnServiceThread(new Runnable() { runOnServiceThread(new Runnable() {
@Override @Override
public void run() { public void run() {