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

Merge "TvInputHardwareManager: Fix Integer conversion error"

Browse Source
This commit is contained in:
Wonsik Kim
2014-06-18 16:13:16 +00:00
committed by Android (Google) Code Review
parent a420a330a9 e7ae0ce53b
commit 94cdec6e98
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/tv/TvInputHardwareManager.java
View File

@@ -116,6 +116,19 @@ class TvInputHardwareManager implements TvInputHal.Callback {
}
}
private boolean checkUidChangedLocked(
Connection connection, int callingUid, int resolvedUserId) {
Integer connectionCallingUid = connection.getCallingUidLocked();
Integer connectionResolvedUserId = connection.getResolvedUserIdLocked();
if (connectionCallingUid == null || connectionResolvedUserId == null) {
return true;
}
if (connectionCallingUid != callingUid || connectionResolvedUserId != resolvedUserId) {
return true;
}
return false;
}
/**
* Create a TvInputHardware object with a specific deviceId. One service at a time can access
* the object, and if more than one process attempts to create hardware with the same deviceId,
@@ -133,8 +146,7 @@ class TvInputHardwareManager implements TvInputHal.Callback {
Slog.e(TAG, "Invalid deviceId : " + deviceId);
return null;
}
if (connection.getCallingUidLocked() != callingUid
|| connection.getResolvedUserIdLocked() != resolvedUserId) {
if (checkUidChangedLocked(connection, callingUid, resolvedUserId)) {
TvInputHardwareImpl hardware = new TvInputHardwareImpl(connection.getInfoLocked());
try {
callback.asBinder().linkToDeath(connection, 0);
@@ -160,8 +172,7 @@ class TvInputHardwareManager implements TvInputHal.Callback {
return;
}
if (connection.getHardwareLocked() != hardware
|| connection.getCallingUidLocked() != callingUid
|| connection.getResolvedUserIdLocked() != resolvedUserId) {
|| checkUidChangedLocked(connection, callingUid, resolvedUserId)) {
return;
}
connection.resetLocked(null, null, null, null);
@@ -226,11 +237,11 @@ class TvInputHardwareManager implements TvInputHal.Callback {
return mConfigs;
}
public int getCallingUidLocked() {
public Integer getCallingUidLocked() {
return mCallingUid;
}
public int getResolvedUserIdLocked() {
public Integer getResolvedUserIdLocked() {
return mResolvedUserId;
}