From 60d476015ebbd296905fd4c2d1f3889763206e59 Mon Sep 17 00:00:00 2001 From: shubang Date: Mon, 27 Dec 2021 00:54:48 -0800 Subject: [PATCH] TIAF: fix TvIAppView and TIAMS bugs Bug: 212188318 Bug: 212183051 Test: mmm Change-Id: Ide3c4c963003cd4879d52ac1ae8a96fb24d25754 --- media/java/android/media/tv/interactive/TvIAppView.java | 4 ++-- .../android/server/tv/interactive/TvIAppManagerService.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/media/java/android/media/tv/interactive/TvIAppView.java b/media/java/android/media/tv/interactive/TvIAppView.java index 62ec4e31931f2..bc015d1aa9880 100644 --- a/media/java/android/media/tv/interactive/TvIAppView.java +++ b/media/java/android/media/tv/interactive/TvIAppView.java @@ -114,7 +114,7 @@ public class TvIAppView extends ViewGroup { } public TvIAppView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, /* attrs = */null, /* defStyleAttr = */0); + super(context, attrs, defStyleAttr); int sourceResId = Resources.getAttributeSetSourceResId(attrs); if (sourceResId != Resources.ID_NULL) { Log.d(TAG, "Build local AttributeSet"); @@ -127,7 +127,7 @@ public class TvIAppView extends ViewGroup { } mDefStyleAttr = defStyleAttr; resetSurfaceView(); - mTvIAppManager = (TvIAppManager) getContext().getSystemService("tv_interactive_app"); + mTvIAppManager = (TvIAppManager) getContext().getSystemService(Context.TV_IAPP_SERVICE); } /** diff --git a/services/core/java/com/android/server/tv/interactive/TvIAppManagerService.java b/services/core/java/com/android/server/tv/interactive/TvIAppManagerService.java index 02a56ec8d9510..ef36f514367f5 100644 --- a/services/core/java/com/android/server/tv/interactive/TvIAppManagerService.java +++ b/services/core/java/com/android/server/tv/interactive/TvIAppManagerService.java @@ -158,6 +158,7 @@ public class TvIAppManagerService extends SystemService { } iAppState.mInfo = info; iAppState.mUid = getIAppUid(info); + iAppState.mComponentName = info.getComponent(); iAppMap.put(iAppServiceId, iAppState); iAppState.mIAppNumber = count; }