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

Commit 6a723f73 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Add constant to link to app's general settings" into nyc-dev

parents 7aea4f49 2f68e8a6

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8469,6 +8469,7 @@ package android.content { 
    field public static final java.lang.String ACTION_AIRPLANE_MODE_CHANGED = "android.intent.action.AIRPLANE_MODE";

    field public static final java.lang.String ACTION_ALL_APPS = "android.intent.action.ALL_APPS";

    field public static final java.lang.String ACTION_ANSWER = "android.intent.action.ANSWER";

    field public static final java.lang.String ACTION_APPLICATION_PREFERENCES = "android.intent.action.APPLICATION_PREFERENCES";

    field public static final java.lang.String ACTION_APPLICATION_RESTRICTIONS_CHANGED = "android.intent.action.APPLICATION_RESTRICTIONS_CHANGED";

    field public static final java.lang.String ACTION_APP_ERROR = "android.intent.action.APP_ERROR";

    field public static final java.lang.String ACTION_ASSIST = "android.intent.action.ASSIST";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8781,6 +8781,7 @@ package android.content { 
    field public static final java.lang.String ACTION_AIRPLANE_MODE_CHANGED = "android.intent.action.AIRPLANE_MODE";

    field public static final java.lang.String ACTION_ALL_APPS = "android.intent.action.ALL_APPS";

    field public static final java.lang.String ACTION_ANSWER = "android.intent.action.ANSWER";

    field public static final java.lang.String ACTION_APPLICATION_PREFERENCES = "android.intent.action.APPLICATION_PREFERENCES";

    field public static final java.lang.String ACTION_APPLICATION_RESTRICTIONS_CHANGED = "android.intent.action.APPLICATION_RESTRICTIONS_CHANGED";

    field public static final java.lang.String ACTION_APP_ERROR = "android.intent.action.APP_ERROR";

    field public static final java.lang.String ACTION_ASSIST = "android.intent.action.ASSIST";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8474,6 +8474,7 @@ package android.content { 
    field public static final java.lang.String ACTION_AIRPLANE_MODE_CHANGED = "android.intent.action.AIRPLANE_MODE";

    field public static final java.lang.String ACTION_ALL_APPS = "android.intent.action.ALL_APPS";

    field public static final java.lang.String ACTION_ANSWER = "android.intent.action.ANSWER";

    field public static final java.lang.String ACTION_APPLICATION_PREFERENCES = "android.intent.action.APPLICATION_PREFERENCES";

    field public static final java.lang.String ACTION_APPLICATION_RESTRICTIONS_CHANGED = "android.intent.action.APPLICATION_RESTRICTIONS_CHANGED";

    field public static final java.lang.String ACTION_APP_ERROR = "android.intent.action.APP_ERROR";

    field public static final java.lang.String ACTION_ASSIST = "android.intent.action.ASSIST";

core/java/android/content/Intent.java

+18 −16
Original line number Diff line number Diff line
@@ -16,24 +16,13 @@ 


package android.content;



import android.content.pm.ApplicationInfo;

import android.os.ResultReceiver;

import android.os.ShellCommand;

import android.provider.MediaStore;

import android.util.ArraySet;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;



import android.annotation.AnyRes;

import android.annotation.IntDef;

import android.annotation.SdkConstant;

import android.annotation.SystemApi;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.content.pm.ActivityInfo;



import static android.content.ContentProvider.maybeAddUserId;



import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.res.Resources;
@@ -41,21 +30,24 @@ import android.content.res.TypedArray; 
import android.graphics.Rect;

import android.net.Uri;

import android.os.Bundle;

import android.os.Environment;

import android.os.IBinder;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Process;

import android.os.ResultReceiver;

import android.os.ShellCommand;

import android.os.StrictMode;

import android.os.UserHandle;

import android.provider.DocumentsContract;

import android.provider.DocumentsProvider;

import android.provider.MediaStore;

import android.provider.OpenableColumns;

import android.util.ArraySet;

import android.util.AttributeSet;

import android.util.Log;



import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlSerializer;



import java.io.IOException;
@@ -71,6 +63,8 @@ import java.util.Locale; 
import java.util.Objects;

import java.util.Set;



import static android.content.ContentProvider.maybeAddUserId;



/**

 * An intent is an abstract description of an operation to be performed.  It

 * can be used with {@link Context#startActivity(Intent) startActivity} to
@@ -758,6 +752,14 @@ public class Intent implements Parcelable, Cloneable { 
    public static final String EXTRA_SHORTCUT_ICON_RESOURCE =

            "android.intent.extra.shortcut.ICON_RESOURCE";



    /**

     * An activity that provides a user interface for adjusting application preferences.

     * Optional but recommended settings for all applications which have settings.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_APPLICATION_PREFERENCES

            = "android.intent.action.APPLICATION_PREFERENCES";



    /**

     * Represents a shortcut/live folder icon resource.

     *