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

Merge "Fix permission error of binding to TvInputService" am: e1215118ac

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895043

Change-Id: Ia5bd19b8b295b0af556bc4510c691f9f3a8d6897
This commit is contained in:
Henry Fang
2021-11-23 20:03:44 +00:00
committed by Automerger Merge Worker
parent 2b008972b8 e1215118ac
commit 37c7128618
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/tv/TvInputManagerService.java
View File

@@ -2985,23 +2985,35 @@ public final class TvInputManagerService extends SystemService {
public void addHardwareInput(int deviceId, TvInputInfo inputInfo) { public void addHardwareInput(int deviceId, TvInputInfo inputInfo) {
ensureHardwarePermission(); ensureHardwarePermission();
ensureValidInput(inputInfo); ensureValidInput(inputInfo);
final long identity = Binder.clearCallingIdentity();
try {
synchronized (mLock) { synchronized (mLock) {
mTvInputHardwareManager.addHardwareInput(deviceId, inputInfo); mTvInputHardwareManager.addHardwareInput(deviceId, inputInfo);
addHardwareInputLocked(inputInfo); addHardwareInputLocked(inputInfo);
} }
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
public void addHdmiInput(int id, TvInputInfo inputInfo) { public void addHdmiInput(int id, TvInputInfo inputInfo) {
ensureHardwarePermission(); ensureHardwarePermission();
ensureValidInput(inputInfo); ensureValidInput(inputInfo);
final long identity = Binder.clearCallingIdentity();
try {
synchronized (mLock) { synchronized (mLock) {
mTvInputHardwareManager.addHdmiInput(id, inputInfo); mTvInputHardwareManager.addHdmiInput(id, inputInfo);
addHardwareInputLocked(inputInfo); addHardwareInputLocked(inputInfo);
} }
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
public void removeHardwareInput(String inputId) { public void removeHardwareInput(String inputId) {
ensureHardwarePermission(); ensureHardwarePermission();
final long identity = Binder.clearCallingIdentity();
try {
synchronized (mLock) { synchronized (mLock) {
ServiceState serviceState = getServiceStateLocked(mComponent, mUserId); ServiceState serviceState = getServiceStateLocked(mComponent, mUserId);
boolean removed = serviceState.hardwareInputMap.remove(inputId) != null; boolean removed = serviceState.hardwareInputMap.remove(inputId) != null;
@@ -3012,6 +3024,9 @@ public final class TvInputManagerService extends SystemService {
Slog.e(TAG, "failed to remove input " + inputId); Slog.e(TAG, "failed to remove input " + inputId);
} }
} }
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
} }