Merge "Use the Deletion Helper when system storage is low." into nyc-mr1-dev (64012175) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -29602,6 +29602,7 @@ package android.os.storage {
		method public boolean isObbMounted(java.lang.String);
		method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);
		method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);
		field public static final java.lang.String ACTION_MANAGE_STORAGE = "android.os.storage.action.MANAGE_STORAGE";
		}

		public final class StorageVolume implements android.os.Parcelable {
		@@ -32387,7 +32388,6 @@ package android.provider {
		field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
		field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";
		field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
		field public static final java.lang.String ACTION_DELETION_HELPER_SETTINGS = "android.settings.DELETION_HELPER_SETTINGS";
		field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";
		field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";
		field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";

+1 −1

Original line number	Diff line number	Diff line
		@@ -32137,6 +32137,7 @@ package android.os.storage {
		method public boolean isObbMounted(java.lang.String);
		method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);
		method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);
		field public static final java.lang.String ACTION_MANAGE_STORAGE = "android.os.storage.action.MANAGE_STORAGE";
		}

		public final class StorageVolume implements android.os.Parcelable {
		@@ -35093,7 +35094,6 @@ package android.provider {
		field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
		field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";
		field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
		field public static final java.lang.String ACTION_DELETION_HELPER_SETTINGS = "android.settings.DELETION_HELPER_SETTINGS";
		field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";
		field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";
		field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";

+1 −1

Original line number	Diff line number	Diff line
		@@ -29673,6 +29673,7 @@ package android.os.storage {
		method public boolean isObbMounted(java.lang.String);
		method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);
		method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);
		field public static final java.lang.String ACTION_MANAGE_STORAGE = "android.os.storage.action.MANAGE_STORAGE";
		}

		public final class StorageVolume implements android.os.Parcelable {
		@@ -32461,7 +32462,6 @@ package android.provider {
		field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
		field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";
		field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
		field public static final java.lang.String ACTION_DELETION_HELPER_SETTINGS = "android.settings.DELETION_HELPER_SETTINGS";
		field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";
		field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";
		field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";

+14 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.net.TrafficStats.MB_IN_BYTES;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SdkConstant;
		import android.app.ActivityThread;
		import android.content.ContentResolver;
		import android.content.Context;
		@@ -95,6 +96,19 @@ public class StorageManager {
		/** {@hide} */
		public static final String UUID_PRIMARY_PHYSICAL = "primary_physical";


		/**
		* Activity Action: Allows the user to manage their storage. This activity provides the ability
		* to free up space on the device by deleting data such as apps.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing.
		*/
		@SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_MANAGE_STORAGE
		= "android.os.storage.action.MANAGE_STORAGE";

		/** {@hide} */
		public static final int DEBUG_FORCE_ADOPTABLE = 1 << 0;
		/** {@hide} */

+0 −11

Original line number	Diff line number	Diff line
		@@ -1277,17 +1277,6 @@ public final class Settings {
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_WEBVIEW_SETTINGS = "android.settings.WEBVIEW_SETTINGS";

		/**
		* Activity Action: Show the Deletion Helper settings.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing.
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_DELETION_HELPER_SETTINGS
		= "android.settings.DELETION_HELPER_SETTINGS";

		// End of Intent actions for Settings

		/**