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

Merge "[TIAF] Add null checks to avoid NPEs" into udc-dev

Browse Source
This commit is contained in:
Shubang Lu
2023-05-18 05:08:04 +00:00
committed by Android (Google) Code Review
parent e61670d58e a15deadbd5
commit 3ede2ac6c1
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,6 +269,10 @@ class TvInputHardwareManager implements TvInputHal.Callback {
@Override @Override
public void onTvMessage(int deviceId, int type, Bundle data) { public void onTvMessage(int deviceId, int type, Bundle data) {
synchronized (mLock) { synchronized (mLock) {
String inputId = mHardwareInputIdMap.get(deviceId);
if (inputId == null) {
return;
}
SomeArgs args = SomeArgs.obtain(); SomeArgs args = SomeArgs.obtain();
args.arg1 = mHardwareInputIdMap.get(deviceId); args.arg1 = mHardwareInputIdMap.get(deviceId);
args.arg2 = data; args.arg2 = data;

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

@@ -4152,6 +4152,10 @@ public final class TvInputManagerService extends SystemService {
synchronized (mLock) { synchronized (mLock) {
UserState userState = getOrCreateUserStateLocked(mCurrentUserId); UserState userState = getOrCreateUserStateLocked(mCurrentUserId);
TvInputState inputState = userState.inputMap.get(inputId); TvInputState inputState = userState.inputMap.get(inputId);
if (inputState == null) {
Slog.e(TAG, "failed to send TV message - unknown input id " + inputId);
return;
}
ServiceState serviceState = userState.serviceStateMap.get(inputState.info ServiceState serviceState = userState.serviceStateMap.get(inputState.info
.getComponent()); .getComponent());
for (IBinder token : serviceState.sessionTokens) { for (IBinder token : serviceState.sessionTokens) {