Merge "Respond to API council feedback." (9fbd2a92) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −3

Original line number	Diff line number	Diff line
		@@ -13089,10 +13089,10 @@ package android.database.sqlite {
		method @Deprecated public String buildUnionSubQuery(String, String[], java.util.Set<java.lang.String>, int, String, String, String[], String, String);
		method public int delete(@NonNull android.database.sqlite.SQLiteDatabase, @Nullable String, @Nullable String[]);
		method @Nullable public android.database.sqlite.SQLiteDatabase.CursorFactory getCursorFactory();
		method public boolean getDistinct();
		method @Nullable public java.util.Map<java.lang.String,java.lang.String> getProjectionMap();
		method public boolean getStrict();
		method @Nullable public String getTables();
		method public boolean isDistinct();
		method public boolean isStrict();
		method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, String[], String, String[], String, String, String);
		method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, String[], String, String[], String, String, String, String);
		method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, String[], String, String[], String, String, String, String, android.os.CancellationSignal);
		@@ -29267,7 +29267,6 @@ package android.net {
		method public abstract boolean isRelative();
		method public android.net.Uri normalizeScheme();
		method public static android.net.Uri parse(String);
		method @NonNull public String toSafeString();
		method public abstract String toString();
		method public static android.net.Uri withAppendedPath(android.net.Uri, String);
		method public static void writeToParcel(android.os.Parcel, android.net.Uri);

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -4233,6 +4233,10 @@ package android.net {
		field public static final int TAG_SYSTEM_PROBE = -190; // 0xffffff42
		}

		public abstract class Uri implements java.lang.Comparable<android.net.Uri> android.os.Parcelable {
		method @NonNull public String toSafeString();
		}

		public class VpnService extends android.app.Service {
		method @RequiresPermission(android.Manifest.permission.CONTROL_VPN) public static void prepareAndAuthorize(android.content.Context);
		}

core/java/android/database/sqlite/SQLiteQueryBuilder.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ public class SQLiteQueryBuilder {
		* Get if the query is marked as {@code DISTINCT}, as last configured by
		* {@link #setDistinct(boolean)}.
		*/
		public boolean getDistinct() {
		public boolean isDistinct() {
		return mDistinct;
		}

		@@ -215,7 +215,7 @@ public class SQLiteQueryBuilder {
		}

		/**
		* Sets the cursor factory to be used for the query, as last configured by
		* Gets the cursor factory to be used for the query, as last configured by
		* {@link #setCursorFactory(android.database.sqlite.SQLiteDatabase.CursorFactory)}.
		*/
		public @Nullable SQLiteDatabase.CursorFactory getCursorFactory() {
		@@ -251,7 +251,7 @@ public class SQLiteQueryBuilder {
		* Get if the query is marked as strict, as last configured by
		* {@link #setStrict(boolean)}.
		*/
		public boolean getStrict() {
		public boolean isStrict() {
		return mStrict;
		}

core/java/android/net/Uri.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.net;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.UnsupportedAppUsage;
		import android.content.Intent;
		import android.os.Environment;
		@@ -380,9 +381,10 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
		* returned as {@code tel:xxx-xxx-xxxx} and {@code http://example.com/path/to/item/} is
		* returned as {@code http://example.com/...}.
		* @return the common forms PII redacted string of this URI
		* @hide
		*/
		@NonNull
		public String toSafeString() {
		@SystemApi
		public @NonNull String toSafeString() {
		String scheme = getScheme();
		String ssp = getSchemeSpecificPart();
		if (scheme != null) {