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

Commit ddc52a80 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #6426645: API REVIEW: android.app.ActivityOptions 

Change-Id: If2f7b987e1825a8b0ebaf2c499924dfc1527274b
parent a2c21308

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ package android { 
  public static final class Manifest.permission_group {

    ctor public Manifest.permission_group();

    field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";

    field public static final java.lang.String AFFECTS_BATTERY = "android.permission-group.AFFECTS_BATTERY";

    field public static final java.lang.String APP_INFO = "android.permission-group.APP_INFO";

    field public static final java.lang.String AUDIO_SETTINGS = "android.permission-group.AUDIO_SETTINGS";

    field public static final java.lang.String BOOKMARKS = "android.permission-group.BOOKMARKS";
@@ -150,7 +151,6 @@ package android { 
    field public static final java.lang.String DEVELOPMENT_TOOLS = "android.permission-group.DEVELOPMENT_TOOLS";

    field public static final java.lang.String DEVICE_ALARMS = "android.permission-group.DEVICE_ALARMS";

    field public static final java.lang.String DISPLAY = "android.permission-group.DISPLAY";

    field public static final java.lang.String AFFECTS_BATTERY = "android.permission-group.AFFECTS_BATTERY";

    field public static final java.lang.String HARDWARE_CONTROLS = "android.permission-group.HARDWARE_CONTROLS";

    field public static final java.lang.String LOCATION = "android.permission-group.LOCATION";

    field public static final java.lang.String MESSAGES = "android.permission-group.MESSAGES";
@@ -2935,11 +2935,11 @@ package android.app { 
  }















  public class ActivityOptions {













    method public void join(android.app.ActivityOptions);















    method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);















    method public static android.app.ActivityOptions makeScaleUpAnimation(android.view.View, int, int, int, int);















    method public static android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int);















    method public android.os.Bundle toBundle();













    method public void update(android.app.ActivityOptions);















  }





























  public class AlarmManager {

























core/java/android/app/ActivityOptions.java



+3
−2




























Original line number
Diff line number
Diff line








@@ -325,10 +325,11 @@ public class ActivityOptions {













    }































    /**













     * Join the values in <var>otherOptions</var> in to this one.  Any values













     * Update the current values in this ActivityOptions from those supplied













     * in <var>otherOptions</var>.  Any values















     * defined in <var>otherOptions</var> replace those in the base options.















     */













    public void join(ActivityOptions otherOptions) {













    public void update(ActivityOptions otherOptions) {















        if (otherOptions.mPackageName != null) {















            mPackageName = otherOptions.mPackageName;















        }