Merge "Created a new API to grant scoped directory access to applications." (21f255de) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8429,6 +8429,7 @@ package android.content {
		field public static final java.lang.String ACTION_NEW_OUTGOING_CALL = "android.intent.action.NEW_OUTGOING_CALL";
		field public static final java.lang.String ACTION_OPEN_DOCUMENT = "android.intent.action.OPEN_DOCUMENT";
		field public static final java.lang.String ACTION_OPEN_DOCUMENT_TREE = "android.intent.action.OPEN_DOCUMENT_TREE";
		field public static final java.lang.String ACTION_OPEN_EXTERNAL_DIRECTORY = "android.intent.action.OPEN_EXTERNAL_DIRECTORY";
		field public static final java.lang.String ACTION_PACKAGES_SUSPENDED = "android.intent.action.PACKAGES_SUSPENDED";
		field public static final java.lang.String ACTION_PACKAGES_UNSUSPENDED = "android.intent.action.PACKAGES_UNSUSPENDED";
		field public static final java.lang.String ACTION_PACKAGE_ADDED = "android.intent.action.PACKAGE_ADDED";

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8730,6 +8730,7 @@ package android.content {
		field public static final java.lang.String ACTION_NEW_OUTGOING_CALL = "android.intent.action.NEW_OUTGOING_CALL";
		field public static final java.lang.String ACTION_OPEN_DOCUMENT = "android.intent.action.OPEN_DOCUMENT";
		field public static final java.lang.String ACTION_OPEN_DOCUMENT_TREE = "android.intent.action.OPEN_DOCUMENT_TREE";
		field public static final java.lang.String ACTION_OPEN_EXTERNAL_DIRECTORY = "android.intent.action.OPEN_EXTERNAL_DIRECTORY";
		field public static final java.lang.String ACTION_PACKAGES_SUSPENDED = "android.intent.action.PACKAGES_SUSPENDED";
		field public static final java.lang.String ACTION_PACKAGES_UNSUSPENDED = "android.intent.action.PACKAGES_UNSUSPENDED";
		field public static final java.lang.String ACTION_PACKAGE_ADDED = "android.intent.action.PACKAGE_ADDED";

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8434,6 +8434,7 @@ package android.content {
		field public static final java.lang.String ACTION_NEW_OUTGOING_CALL = "android.intent.action.NEW_OUTGOING_CALL";
		field public static final java.lang.String ACTION_OPEN_DOCUMENT = "android.intent.action.OPEN_DOCUMENT";
		field public static final java.lang.String ACTION_OPEN_DOCUMENT_TREE = "android.intent.action.OPEN_DOCUMENT_TREE";
		field public static final java.lang.String ACTION_OPEN_EXTERNAL_DIRECTORY = "android.intent.action.OPEN_EXTERNAL_DIRECTORY";
		field public static final java.lang.String ACTION_PACKAGES_SUSPENDED = "android.intent.action.PACKAGES_SUSPENDED";
		field public static final java.lang.String ACTION_PACKAGES_UNSUSPENDED = "android.intent.action.PACKAGES_UNSUSPENDED";
		field public static final java.lang.String ACTION_PACKAGE_ADDED = "android.intent.action.PACKAGE_ADDED";

core/java/android/content/Intent.java

+33 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ 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;
		@@ -3186,6 +3187,38 @@ public class Intent implements Parcelable, Cloneable {
		public static final String
		ACTION_OPEN_DOCUMENT_TREE = "android.intent.action.OPEN_DOCUMENT_TREE";

		/**
		* Activity Action: Give access to a standard storage directory after obtaining the user's
		* approval.
		* <p>
		* When invoked, the system will ask the user to grant access to the requested directory (and
		* its descendants).
		* <p>
		* To gain access to descendant (child, grandchild, etc) documents, use
		* {@link DocumentsContract#buildDocumentUriUsingTree(Uri, String)} and
		* {@link DocumentsContract#buildChildDocumentsUriUsingTree(Uri, String)} with the returned URI.
		* <p>
		* Input: full path to a standard directory, in the form of
		* {@code STORAGE_ROOT + STANDARD_DIRECTORY}, where {@code STORAGE_ROOT} is the physical path of
		* a storage container, and {@code STANDARD_DIRECTORY} is one of
		* {@link Environment#DIRECTORY_MUSIC}, {@link Environment#DIRECTORY_PODCASTS},
		* {@link Environment#DIRECTORY_RINGTONES}, {@link Environment#DIRECTORY_ALARMS},
		* {@link Environment#DIRECTORY_NOTIFICATIONS}, {@link Environment#DIRECTORY_PICTURES},
		* {@link Environment#DIRECTORY_MOVIES}, {@link Environment#DIRECTORY_DOWNLOADS},
		* {@link Environment#DIRECTORY_DCIM}, or {@link Environment#DIRECTORY_DOCUMENTS}
		* <p>
		* For example, to open the "Pictures" folder in the default external storage, the intent's data
		* would be: {@code Uri.fromFile(new File(Environment.getExternalStorageDirectory(),
		* Environment.DIRECTORY_PICTURES))}.
		* <p>
		* Output: The URI representing the requested directory tree.
		*
		* @see DocumentsContract
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String
		ACTION_OPEN_EXTERNAL_DIRECTORY = "android.intent.action.OPEN_EXTERNAL_DIRECTORY";

		/** {@hide} */
		public static final String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR";

core/java/android/os/Environment.java

+36 −5

Original line number	Diff line number	Diff line
		@@ -478,6 +478,37 @@ public class Environment {
		*/
		public static String DIRECTORY_DOCUMENTS = "Documents";

		/**
		* List of standard storage directories.
		* <p>
		* Each of its values have its own constant:
		* <ul>
		* <li>{@link #DIRECTORY_MUSIC}
		* <li>{@link #DIRECTORY_PODCASTS}
		* <li>{@link #DIRECTORY_ALARMS}
		* <li>{@link #DIRECTORY_RINGTONES}
		* <li>{@link #DIRECTORY_NOTIFICATIONS}
		* <li>{@link #DIRECTORY_PICTURES}
		* <li>{@link #DIRECTORY_MOVIES}
		* <li>{@link #DIRECTORY_DOWNLOADS}
		* <li>{@link #DIRECTORY_DCIM}
		* <li>{@link #DIRECTORY_DOCUMENTS}
		* </ul>
		* @hide
		*/
		public static final String[] STANDARD_DIRECTORIES = {
		DIRECTORY_MUSIC,
		DIRECTORY_PODCASTS,
		DIRECTORY_RINGTONES,
		DIRECTORY_ALARMS,
		DIRECTORY_NOTIFICATIONS,
		DIRECTORY_PICTURES,
		DIRECTORY_MOVIES,
		DIRECTORY_DOWNLOADS,
		DIRECTORY_DCIM,
		DIRECTORY_DOCUMENTS
		};

		/**
		* Get a top-level shared/external storage directory for placing files of a
		* particular type. This is where the user will typically place and manage
		@@ -500,8 +531,8 @@ public class Environment {
		* {@link #DIRECTORY_MUSIC}, {@link #DIRECTORY_PODCASTS},
		* {@link #DIRECTORY_RINGTONES}, {@link #DIRECTORY_ALARMS},
		* {@link #DIRECTORY_NOTIFICATIONS}, {@link #DIRECTORY_PICTURES},
		* {@link #DIRECTORY_MOVIES}, {@link #DIRECTORY_DOWNLOADS}, or
		* {@link #DIRECTORY_DCIM}. May not be null.
		* {@link #DIRECTORY_MOVIES}, {@link #DIRECTORY_DOWNLOADS},
		* {@link #DIRECTORY_DCIM}, or {@link #DIRECTORY_DOCUMENTS}. May not be null.
		* @return Returns the File path for the directory. Note that this directory
		* may not yet exist, so you must make sure it exists before using
		* it such as with {@link File#mkdirs File.mkdirs()}.