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

Commit 4853cd5b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "TIAF: fix TvIAppView and TIAMS bugs"

parents 50506617 60d47601

media/java/android/media/tv/interactive/TvIAppView.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }



    /**

services/core/java/com/android/server/tv/interactive/TvIAppManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

        }