Merge "DO NOT MERGE: Hide crypto consts from docs" into lmp-preview-dev (575510c4) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -21668,10 +21668,6 @@ 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 int CRYPT_TYPE_DEFAULT = 1; // 0x1
		field public static final int CRYPT_TYPE_PASSWORD = 0; // 0x0
		field public static final int CRYPT_TYPE_PATTERN = 2; // 0x2
		field public static final int CRYPT_TYPE_PIN = 3; // 0x3
		}

		}

+10 −18

Original line number	Diff line number	Diff line
		@@ -58,24 +58,6 @@ import java.util.concurrent.atomic.AtomicInteger;
		* argument of {@link android.content.Context#STORAGE_SERVICE}.
		*/
		public class StorageManager {

		/// Consts to match the password types in cryptfs.h
		/** Master key is encrypted with a password.
		*/
		public static final int CRYPT_TYPE_PASSWORD = 0;

		/** Master key is encrypted with the default password.
		*/
		public static final int CRYPT_TYPE_DEFAULT = 1;

		/** Master key is encrypted with a pattern.
		*/
		public static final int CRYPT_TYPE_PATTERN = 2;

		/** Master key is encrypted with a pin.
		*/
		public static final int CRYPT_TYPE_PIN = 3;

		private static final String TAG = "StorageManager";

		private final ContentResolver mResolver;
		@@ -663,4 +645,14 @@ public class StorageManager {
		return Settings.Global.getLong(mResolver, Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES,
		DEFAULT_FULL_THRESHOLD_BYTES);
		}

		/// Consts to match the password types in cryptfs.h
		/** @hide */
		public static final int CRYPT_TYPE_PASSWORD = 0;
		/** @hide */
		public static final int CRYPT_TYPE_DEFAULT = 1;
		/** @hide */
		public static final int CRYPT_TYPE_PATTERN = 2;
		/** @hide */
		public static final int CRYPT_TYPE_PIN = 3;
		}