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

* commit '17e9d2468fea360ab17679161f31cf6a38198fc7':
  CEC: Add missing protections for some HdmiControlService API
This commit is contained in:
Jinsuk Kim
2014-10-20 22:56:20 +00:00
committed by Android Git Automerger

View File

@@ -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() {