am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev (78bb372f) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −8

Original line number	Diff line number	Diff line
		@@ -289,14 +289,14 @@ package android {
		field public static final deprecated int animationResolution = 16843546; // 0x101031a
		field public static final int antialias = 16843034; // 0x101011a
		field public static final int anyDensity = 16843372; // 0x101026c
		field public static final int apduServiceBanner = 16843758; // 0x10103ee
		field public static final int apduServiceBanner = 16843757; // 0x10103ed
		field public static final int apiKey = 16843281; // 0x1010211
		field public static final int author = 16843444; // 0x10102b4
		field public static final int authorities = 16842776; // 0x1010018
		field public static final int autoAdvanceViewId = 16843535; // 0x101030f
		field public static final int autoCompleteTextViewStyle = 16842859; // 0x101006b
		field public static final int autoLink = 16842928; // 0x10100b0
		field public static final int autoMirrored = 16843755; // 0x10103eb
		field public static final int autoMirrored = 16843754; // 0x10103ea
		field public static final int autoStart = 16843445; // 0x10102b5
		field public static final deprecated int autoText = 16843114; // 0x101016a
		field public static final int autoUrlDetect = 16843404; // 0x101028c
		@@ -393,7 +393,6 @@ package android {
		field public static final int cropToPadding = 16843043; // 0x1010123
		field public static final int cursorVisible = 16843090; // 0x1010152
		field public static final int customNavigationLayout = 16843474; // 0x10102d2
		field public static final int customRoots = 16843754; // 0x10103ea
		field public static final int customTokens = 16843579; // 0x101033b
		field public static final int cycles = 16843220; // 0x10101d4
		field public static final int dashGap = 16843175; // 0x10101a7
		@@ -846,7 +845,7 @@ package android {
		field public static final int prompt = 16843131; // 0x101017b
		field public static final int propertyName = 16843489; // 0x10102e1
		field public static final int protectionLevel = 16842761; // 0x1010009
		field public static final int provideAssistData = 16843759; // 0x10103ef
		field public static final int provideAssistData = 16843758; // 0x10103ee
		field public static final int publicKey = 16843686; // 0x10103a6
		field public static final int queryActionMsg = 16843227; // 0x10101db
		field public static final int queryAfterZeroResults = 16843394; // 0x1010282
		@@ -871,7 +870,7 @@ package android {
		field public static final int reqKeyboardType = 16843304; // 0x1010228
		field public static final int reqNavigation = 16843306; // 0x101022a
		field public static final int reqTouchScreen = 16843303; // 0x1010227
		field public static final int requireDeviceUnlock = 16843757; // 0x10103ed
		field public static final int requireDeviceUnlock = 16843756; // 0x10103ec
		field public static final int required = 16843406; // 0x101028e
		field public static final int requiredAccountType = 16843734; // 0x10103d6
		field public static final int requiredForAllUsers = 16843728; // 0x10103d0
		@@ -1020,7 +1019,7 @@ package android {
		field public static final int summaryOff = 16843248; // 0x10101f0
		field public static final int summaryOn = 16843247; // 0x10101ef
		field public static final int supportsRtl = 16843695; // 0x10103af
		field public static final int supportsSwitchingToNextInputMethod = 16843756; // 0x10103ec
		field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb
		field public static final int supportsUploading = 16843419; // 0x101029b
		field public static final int switchMinWidth = 16843632; // 0x1010370
		field public static final int switchPadding = 16843633; // 0x1010371
		@@ -8140,7 +8139,7 @@ package android.database {

		public class MatrixCursor.RowBuilder {
		method public android.database.MatrixCursor.RowBuilder add(java.lang.Object);
		method public android.database.MatrixCursor.RowBuilder offer(java.lang.String, java.lang.Object);
		method public android.database.MatrixCursor.RowBuilder add(java.lang.String, java.lang.Object);
		}

		public class MergeCursor extends android.database.AbstractCursor {
		@@ -20774,7 +20773,6 @@ package android.provider {
		method public static android.net.Uri buildRootUri(java.lang.String, java.lang.String);
		method public static android.net.Uri buildRootsUri(java.lang.String);
		method public static android.net.Uri buildSearchDocumentsUri(java.lang.String, java.lang.String, java.lang.String);
		method public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String);
		method public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri);
		method public static java.lang.String getDocumentId(android.net.Uri);
		method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal);

core/java/android/database/MatrixCursor.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -186,7 +186,7 @@ public class MatrixCursor extends AbstractCursor {
		* column value at a time. This follows the same ordering as the column
		* names specified at cursor construction time.
		* <li>Column and value pairs can be offered for possible inclusion using
		* {@link #offer(String, Object)}. If the cursor includes the given column,
		* {@link #add(String, Object)}. If the cursor includes the given column,
		* the value will be set for that column, otherwise the value is ignored.
		* This approach is useful when matching data to a custom projection.
		* </ul>
		@@ -227,7 +227,7 @@ public class MatrixCursor extends AbstractCursor {
		*
		* @return this builder to support chaining
		*/
		public RowBuilder offer(String columnName, Object value) {
		public RowBuilder add(String columnName, Object value) {
		for (int i = 0; i < columnNames.length; i++) {
		if (columnName.equals(columnNames[i])) {
		data[(row * columnCount) + i] = value;

core/java/android/provider/DocumentsContract.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -694,6 +694,7 @@ public final class DocumentsContract {
		* @param mimeType MIME type of new document
		* @param displayName name of new document
		* @return newly created document, or {@code null} if failed
		* @hide
		*/
		public static Uri createDocument(ContentResolver resolver, Uri parentDocumentUri,
		String mimeType, String displayName) {

core/res/res/values/attrs.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -6128,8 +6128,4 @@
		<attr name="textView" format="reference" />
		</declare-styleable>

		<declare-styleable name="DocumentsProviderInfo">
		<attr name="customRoots" format="boolean" />
		</declare-styleable>

		</resources>

core/res/res/values/public.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -2073,7 +2073,6 @@
		<public type="attr" name="vendor" />
		<public type="attr" name="category" />
		<public type="attr" name="isAsciiCapable" />
		<public type="attr" name="customRoots" />
		<public type="attr" name="autoMirrored" />
		<public type="attr" name="supportsSwitchingToNextInputMethod" />
		<public type="attr" name="requireDeviceUnlock" />