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

Commit 73068cf4 authored by Yuncheol Heo's avatar Yuncheol Heo Committed by Automerger Merge Worker
Browse files

Merge "Revert "Expose ActivityOptions.fromBundle() as ModuleApi."" into tm-dev am: 9048187a 

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

Change-Id: I962b536c2c65075eb0783f5ad7c89ef5c7d78ce9
parents 6d5eae5f 9048187a

core/api/module-lib-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String);

  }



  public class ActivityOptions {

    method @NonNull public static android.app.ActivityOptions fromBundle(@NonNull android.os.Bundle);

  }



  public class AppOpsManager {

    field public static final String OPSTR_NO_ISOLATED_STORAGE = "android:no_isolated_storage";

  }

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ package android.app { 
  }



  public class ActivityOptions {

    method @NonNull public static android.app.ActivityOptions fromBundle(@NonNull android.os.Bundle);

    method public boolean isEligibleForLegacyPermissionPrompt();

    method @NonNull public static android.app.ActivityOptions makeCustomAnimation(@NonNull android.content.Context, int, int, int, @Nullable android.os.Handler, @Nullable android.app.ActivityOptions.OnAnimationStartedListener, @Nullable android.app.ActivityOptions.OnAnimationFinishedListener);

    method @NonNull @RequiresPermission(android.Manifest.permission.START_TASKS_FROM_RECENTS) public static android.app.ActivityOptions makeCustomTaskAnimation(@NonNull android.content.Context, int, int, @Nullable android.os.Handler, @Nullable android.app.ActivityOptions.OnAnimationStartedListener, @Nullable android.app.ActivityOptions.OnAnimationFinishedListener);

core/java/android/app/ActivityOptions.java

+3 −11
Original line number Diff line number Diff line
@@ -1421,17 +1421,9 @@ public class ActivityOptions extends ComponentOptions { 
        return mRemoteTransition;

    }



    /**

     * Creates an ActivityOptions from the Bundle generated from {@link ActivityOptions#toBundle()}.

     * Returns an instance of ActivityOptions populated with options with known keys from the

     * provided Bundle, stripping out unknown entries.

     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @TestApi

    @NonNull

    public static ActivityOptions fromBundle(@NonNull Bundle bOptions) {

        return new ActivityOptions(bOptions);

    /** @hide */

    public static ActivityOptions fromBundle(Bundle bOptions) {

        return bOptions != null ? new ActivityOptions(bOptions) : null;

    }



    /** @hide */

core/java/android/app/servertransaction/LaunchActivityItem.java

+1 −6
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public class LaunchActivityItem extends ClientTransactionItem { 
                in.readPersistableBundle(getClass().getClassLoader()),

                in.createTypedArrayList(ResultInfo.CREATOR),

                in.createTypedArrayList(ReferrerIntent.CREATOR),

                readActivityOptions(in), in.readBoolean(),

                ActivityOptions.fromBundle(in.readBundle()), in.readBoolean(),

                in.readTypedObject(ProfilerInfo.CREATOR),

                in.readStrongBinder(),

                IActivityClientController.Stub.asInterface(in.readStrongBinder()),
@@ -187,11 +187,6 @@ public class LaunchActivityItem extends ClientTransactionItem { 
                in.readBoolean());

    }



    private static ActivityOptions readActivityOptions(Parcel in) {

        Bundle bundle = in.readBundle();

        return bundle != null ? ActivityOptions.fromBundle(bundle) : null;

    }



    public static final @NonNull Creator<LaunchActivityItem> CREATOR =

            new Creator<LaunchActivityItem>() {

        public LaunchActivityItem createFromParcel(Parcel in) {

core/java/android/app/servertransaction/StartActivityItem.java

+1 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.Nullable; 
import android.app.ActivityOptions;

import android.app.ActivityThread.ActivityClientRecord;

import android.app.ClientTransactionHandler;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Trace;
@@ -84,8 +83,7 @@ public class StartActivityItem extends ActivityLifecycleItem { 


    /** Read from Parcel. */

    private StartActivityItem(Parcel in) {

        Bundle bundle = in.readBundle();

        mActivityOptions = bundle != null ? ActivityOptions.fromBundle(bundle) : null;

        mActivityOptions = ActivityOptions.fromBundle(in.readBundle());

    }



    public static final @NonNull Creator<StartActivityItem> CREATOR =