Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1e93717 authored by Shubang Lu's avatar Shubang Lu Committed by Automerger Merge Worker
Browse files

Merge "[TIAF] Add null checks to avoid NPEs" into udc-dev am: 3ede2ac6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23269989



Change-Id: I07ea9fdb3e6438d40b07ce1ab360d0f5b6738f0e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 672a824f 3ede2ac6

services/core/java/com/android/server/tv/TvInputHardwareManager.java

+4 −0
Original line number Diff line number Diff line
@@ -269,6 +269,10 @@ class TvInputHardwareManager implements TvInputHal.Callback { 
    @Override

    public void onTvMessage(int deviceId, int type, Bundle data) {

        synchronized (mLock) {

            String inputId = mHardwareInputIdMap.get(deviceId);

            if (inputId == null) {

                return;

            }

            SomeArgs args = SomeArgs.obtain();

            args.arg1 = mHardwareInputIdMap.get(deviceId);

            args.arg2 = data;

services/core/java/com/android/server/tv/TvInputManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -4152,6 +4152,10 @@ public final class TvInputManagerService extends SystemService { 
            synchronized (mLock) {

                UserState userState = getOrCreateUserStateLocked(mCurrentUserId);

                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

                        .getComponent());

                for (IBinder token : serviceState.sessionTokens) {