Merge "This is a giant mess." (0132344d) · Commits · e / os / android_frameworks_base

api/current.txt

+15 −3

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ package android {
		field public static final java.lang.String BROADCAST_SMS = "android.permission.BROADCAST_SMS";
		field public static final java.lang.String BROADCAST_STICKY = "android.permission.BROADCAST_STICKY";
		field public static final java.lang.String BROADCAST_WAP_PUSH = "android.permission.BROADCAST_WAP_PUSH";
		field public static final java.lang.String CALL_COMPANION_APP = "android.permission.CALL_COMPANION_APP";
		field public static final java.lang.String CALL_PHONE = "android.permission.CALL_PHONE";
		field public static final java.lang.String CALL_PRIVILEGED = "android.permission.CALL_PRIVILEGED";
		field public static final java.lang.String CAMERA = "android.permission.CAMERA";
		@@ -91,7 +92,6 @@ package android {
		field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";
		field public static final java.lang.String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";
		field public static final java.lang.String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS";
		field public static final java.lang.String CALL_COMPANION_APP = "android.permission.CALL_COMPANION_APP";
		field public static final java.lang.String MASTER_CLEAR = "android.permission.MASTER_CLEAR";
		field public static final java.lang.String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";
		field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";
		@@ -37533,25 +37533,37 @@ package android.provider {
		method public static android.net.Uri buildSearchDocumentsUri(java.lang.String, java.lang.String, java.lang.String);
		method public static android.net.Uri buildTreeDocumentUri(java.lang.String, java.lang.String);
		method public static android.net.Uri copyDocument(android.content.ContentInterface, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static deprecated android.net.Uri copyDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static android.net.Uri createDocument(android.content.ContentInterface, android.net.Uri, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
		method public static deprecated android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
		method public static android.content.IntentSender createWebLinkIntent(android.content.ContentInterface, android.net.Uri, android.os.Bundle) throws java.io.FileNotFoundException;
		method public static deprecated android.content.IntentSender createWebLinkIntent(android.content.ContentResolver, android.net.Uri, android.os.Bundle) throws java.io.FileNotFoundException;
		method public static boolean deleteDocument(android.content.ContentInterface, android.net.Uri) throws java.io.FileNotFoundException;
		method public static deprecated boolean deleteDocument(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;
		method public static void ejectRoot(android.content.ContentInterface, android.net.Uri);
		method public static deprecated void ejectRoot(android.content.ContentResolver, android.net.Uri);
		method public static android.provider.DocumentsContract.Path findDocumentPath(android.content.ContentInterface, android.net.Uri) throws java.io.FileNotFoundException;
		method public static deprecated android.provider.DocumentsContract.Path findDocumentPath(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;
		method public static java.lang.String getDocumentId(android.net.Uri);
		method public static android.os.Bundle getDocumentMetadata(android.content.ContentInterface, android.net.Uri) throws java.io.FileNotFoundException;
		method public static deprecated android.os.Bundle getDocumentMetadata(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;
		method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentInterface, android.net.Uri, android.graphics.Point, android.os.CancellationSignal) throws java.io.FileNotFoundException;
		method public static deprecated android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal) throws java.io.FileNotFoundException;
		method public static java.lang.String getRootId(android.net.Uri);
		method public static java.lang.String getSearchDocumentsQuery(android.net.Uri);
		method public static java.lang.String getTreeDocumentId(android.net.Uri);
		method public static boolean isChildDocument(android.content.ContentInterface, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static deprecated boolean isChildDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static boolean isDocumentUri(android.content.Context, android.net.Uri);
		method public static boolean isRootUri(android.content.Context, android.net.Uri);
		method public static boolean isRootsUri(android.content.Context, android.net.Uri);
		method public static boolean isTreeUri(android.net.Uri);
		method public static android.net.Uri moveDocument(android.content.ContentInterface, android.net.Uri, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static deprecated android.net.Uri moveDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static boolean removeDocument(android.content.ContentInterface, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static deprecated boolean removeDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static android.net.Uri renameDocument(android.content.ContentInterface, android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
		method public static deprecated android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
		field public static final java.lang.String ACTION_DOCUMENT_SETTINGS = "android.provider.action.DOCUMENT_SETTINGS";
		field public static final java.lang.String EXTRA_ERROR = "error";
		field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";
		@@ -43222,6 +43234,7 @@ package android.telecom {
		field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";
		field public static final java.lang.String EXTRA_INCOMING_VIDEO_STATE = "android.telecom.extra.INCOMING_VIDEO_STATE";
		field public static final java.lang.String EXTRA_IS_DEFAULT_CALL_SCREENING_APP = "android.telecom.extra.IS_DEFAULT_CALL_SCREENING_APP";
		field public static final java.lang.String EXTRA_IS_ENABLED = "android.telecom.extra.IS_ENABLED";
		field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telecom.extra.NOTIFICATION_COUNT";
		field public static final java.lang.String EXTRA_NOTIFICATION_PHONE_NUMBER = "android.telecom.extra.NOTIFICATION_PHONE_NUMBER";
		field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
		@@ -43229,14 +43242,13 @@ package android.telecom {
		field public static final java.lang.String EXTRA_START_CALL_WITH_RTT = "android.telecom.extra.START_CALL_WITH_RTT";
		field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";
		field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
		field public static final java.lang.String EXTRA_IS_ENABLED = "android.telecom.extra.IS_ENABLED";
		field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";
		field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";
		field public static final java.lang.String METADATA_INCLUDE_EXTERNAL_CALLS = "android.telecom.INCLUDE_EXTERNAL_CALLS";
		field public static final java.lang.String METADATA_INCLUDE_SELF_MANAGED_CALLS = "android.telecom.INCLUDE_SELF_MANAGED_CALLS";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_CAR_MODE_UI = "android.telecom.IN_CALL_SERVICE_CAR_MODE_UI";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_RINGING = "android.telecom.IN_CALL_SERVICE_RINGING";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_UI = "android.telecom.IN_CALL_SERVICE_UI";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_CAR_MODE_UI = "android.telecom.IN_CALL_SERVICE_CAR_MODE_UI";
		field public static final int PRESENTATION_ALLOWED = 1; // 0x1
		field public static final int PRESENTATION_PAYPHONE = 4; // 0x4
		field public static final int PRESENTATION_RESTRICTED = 2; // 0x2

api/removed.txt

+0 −15

Original line number	Diff line number	Diff line
		@@ -508,21 +508,6 @@ package android.provider {
		field public static final deprecated java.lang.String TIMESTAMP = "timestamp";
		}

		public final class DocumentsContract {
		method public static android.net.Uri copyDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
		method public static android.content.IntentSender createWebLinkIntent(android.content.ContentResolver, android.net.Uri, android.os.Bundle) throws java.io.FileNotFoundException;
		method public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;
		method public static void ejectRoot(android.content.ContentResolver, android.net.Uri);
		method public static android.provider.DocumentsContract.Path findDocumentPath(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;
		method public static android.os.Bundle getDocumentMetadata(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;
		method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal) throws java.io.FileNotFoundException;
		method public static boolean isChildDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static android.net.Uri moveDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static boolean removeDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;
		method public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
		}

		public static final class Settings.Global extends android.provider.Settings.NameValueTable {
		field public static final deprecated java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync";
		}

core/java/android/provider/DocumentsContract.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -1275,7 +1275,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static Bitmap getDocumentThumbnail(ContentResolver content, Uri documentUri, Point size,
		CancellationSignal signal) throws FileNotFoundException {
		return getDocumentThumbnail((ContentInterface) content, documentUri, size, signal);
		@@ -1307,7 +1307,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static Uri createDocument(ContentResolver content, Uri parentDocumentUri,
		String mimeType, String displayName) throws FileNotFoundException {
		return createDocument((ContentInterface) content, parentDocumentUri, mimeType, displayName);
		@@ -1345,7 +1345,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static boolean isChildDocument(ContentResolver content, Uri parentDocumentUri,
		Uri childDocumentUri) throws FileNotFoundException {
		return isChildDocument((ContentInterface) content, parentDocumentUri, childDocumentUri);
		@@ -1382,7 +1382,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static Uri renameDocument(ContentResolver content, Uri documentUri,
		String displayName) throws FileNotFoundException {
		return renameDocument((ContentInterface) content, documentUri, displayName);
		@@ -1410,7 +1410,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static boolean deleteDocument(ContentResolver content, Uri documentUri)
		throws FileNotFoundException {
		return deleteDocument((ContentInterface) content, documentUri);
		@@ -1441,7 +1441,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static Uri copyDocument(ContentResolver content, Uri sourceDocumentUri,
		Uri targetParentDocumentUri) throws FileNotFoundException {
		return copyDocument((ContentInterface) content, sourceDocumentUri, targetParentDocumentUri);
		@@ -1474,7 +1474,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static Uri moveDocument(ContentResolver content, Uri sourceDocumentUri,
		Uri sourceParentDocumentUri, Uri targetParentDocumentUri) throws FileNotFoundException {
		return moveDocument((ContentInterface) content, sourceDocumentUri, sourceParentDocumentUri,
		@@ -1508,7 +1508,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static boolean removeDocument(ContentResolver content, Uri documentUri,
		Uri parentDocumentUri) throws FileNotFoundException {
		return removeDocument((ContentInterface) content, documentUri, parentDocumentUri);
		@@ -1531,7 +1531,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static void ejectRoot(ContentResolver content, Uri rootUri) {
		ejectRoot((ContentInterface) content, rootUri);
		}
		@@ -1581,7 +1581,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static Bundle getDocumentMetadata(ContentResolver content, Uri documentUri)
		throws FileNotFoundException {
		return getDocumentMetadata((ContentInterface) content, documentUri);
		@@ -1618,7 +1618,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static Path findDocumentPath(ContentResolver content, Uri treeUri)
		throws FileNotFoundException {
		return findDocumentPath((ContentInterface) content, treeUri);
		@@ -1697,7 +1697,7 @@ public final class DocumentsContract {
		}
		}

		/** @removed */
		@Deprecated
		public static IntentSender createWebLinkIntent(ContentResolver content, Uri uri,
		Bundle options) throws FileNotFoundException {
		return createWebLinkIntent((ContentInterface) content, uri, options);