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

Commit 5130655b authored by Chulwoo Lee's avatar Chulwoo Lee Committed by Android (Google) Code Review
Browse files

Merge "Pass input ID to the setup/settings activity" into lmp-dev

parents 3b2f5079 029179d7

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -16555,7 +16555,7 @@ package android.media.tv { 
    method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);

    method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final java.lang.String EXTRA_SERVICE_NAME = "serviceName";

    field public static final java.lang.String EXTRA_INPUT_ID = "inputId";

    field public static final int TYPE_HDMI = 1; // 0x1

    field public static final int TYPE_PASSTHROUGH = 3; // 0x3

    field public static final int TYPE_TUNER = 2; // 0x2

media/java/android/media/tv/TvInputInfo.java

+4 −4
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ public final class TvInputInfo implements Parcelable { 
    public static final int TYPE_PASSTHROUGH = 3;



    /**

     * The name of the TV input service to provide to the setup activity and settings activity.

     * The ID of the TV input to provide to the setup activity and settings activity.

     */

    public static final String EXTRA_SERVICE_NAME = "serviceName";

    public static final String EXTRA_INPUT_ID = "inputId";



    private static final String XML_START_TAG_NAME = "tv-input";
@@ -190,7 +190,7 @@ public final class TvInputInfo implements Parcelable { 
        if (!TextUtils.isEmpty(mSetupActivity)) {

            Intent intent = new Intent(Intent.ACTION_MAIN);

            intent.setClassName(mService.serviceInfo.packageName, mSetupActivity);

            intent.putExtra(EXTRA_SERVICE_NAME, mService.serviceInfo.name);

            intent.putExtra(EXTRA_INPUT_ID, getId());

            return intent;

        }

        return null;
@@ -203,7 +203,7 @@ public final class TvInputInfo implements Parcelable { 
        if (!TextUtils.isEmpty(mSettingsActivity)) {

            Intent intent = new Intent(Intent.ACTION_MAIN);

            intent.setClassName(mService.serviceInfo.packageName, mSettingsActivity);

            intent.putExtra(EXTRA_SERVICE_NAME, mService.serviceInfo.name);

            intent.putExtra(EXTRA_INPUT_ID, getId());

            return intent;

        }

        return null;