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

Commit eced6d98 authored by Mark Renouf's avatar Mark Renouf Committed by Android (Google) Code Review
Browse files

Merge "Add ChooserResult constructor to @TestApi" into main

parents 15d9cb4a da2d69c8

core/api/test-current.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -3063,6 +3063,14 @@ package android.service.autofill.augmented { 




}

}





package android.service.chooser {



  @FlaggedApi("android.service.chooser.enable_chooser_result") public final class ChooserResult implements android.os.Parcelable {

    ctor public ChooserResult(int, @Nullable android.content.ComponentName, boolean);

  }



}



package android.service.dreams {

package android.service.dreams {





  public abstract class DreamOverlayService extends android.app.Service {

  public abstract class DreamOverlayService extends android.app.Service {

core/java/android/service/chooser/ChooserResult.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.FlaggedApi; 
import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.compat.annotation.ChangeId;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledSince;

import android.compat.annotation.EnabledSince;

import android.compat.annotation.Overridable;

import android.compat.annotation.Overridable;
@@ -91,6 +92,7 @@ public final class ChooserResult implements Parcelable { 
    }

    }





    /** @hide */

    /** @hide */

    @TestApi

    public ChooserResult(@ResultType int type, @Nullable ComponentName componentName,

    public ChooserResult(@ResultType int type, @Nullable ComponentName componentName,

            boolean isShortcut) {

            boolean isShortcut) {

        mType = type;

        mType = type;