Merge tag 'android-9.0.0_r50' into staging/lineage-16.0_merge-android-9.0.0_r50 (f11d05f8) · Commits · e / os / android_frameworks_base

core/java/android/app/DownloadManager.java

+22 −20

Original line number	Diff line number	Diff line
		@@ -127,6 +127,9 @@ public class DownloadManager {
		*/
		public final static String COLUMN_STATUS = Downloads.Impl.COLUMN_STATUS;

		/** {@hide} */
		public static final String COLUMN_FILE_NAME_HINT = Downloads.Impl.COLUMN_FILE_NAME_HINT;

		/**
		* Provides more detail on the status of the download. Its meaning depends on the value of
		* {@link #COLUMN_STATUS}.
		@@ -164,6 +167,9 @@ public class DownloadManager {
		*/
		public static final String COLUMN_MEDIAPROVIDER_URI = Downloads.Impl.COLUMN_MEDIAPROVIDER_URI;

		/** {@hide} */
		public static final String COLUMN_DESTINATION = Downloads.Impl.COLUMN_DESTINATION;

		/**
		* @hide
		*/
		@@ -337,26 +343,22 @@ public class DownloadManager {
		* @hide
		*/
		public static final String[] UNDERLYING_COLUMNS = new String[] {
		Downloads.Impl._ID,
		Downloads.Impl._DATA + " AS " + COLUMN_LOCAL_FILENAME,
		Downloads.Impl.COLUMN_MEDIAPROVIDER_URI,
		Downloads.Impl.COLUMN_DESTINATION,
		Downloads.Impl.COLUMN_TITLE,
		Downloads.Impl.COLUMN_DESCRIPTION,
		Downloads.Impl.COLUMN_URI,
		Downloads.Impl.COLUMN_STATUS,
		Downloads.Impl.COLUMN_FILE_NAME_HINT,
		Downloads.Impl.COLUMN_MIME_TYPE + " AS " + COLUMN_MEDIA_TYPE,
		Downloads.Impl.COLUMN_TOTAL_BYTES + " AS " + COLUMN_TOTAL_SIZE_BYTES,
		Downloads.Impl.COLUMN_LAST_MODIFICATION + " AS " + COLUMN_LAST_MODIFIED_TIMESTAMP,
		Downloads.Impl.COLUMN_CURRENT_BYTES + " AS " + COLUMN_BYTES_DOWNLOADED_SO_FAR,
		Downloads.Impl.COLUMN_ALLOW_WRITE,
		/* add the following 'computed' columns to the cursor.
		* they are not 'returned' by the database, but their inclusion
		* eliminates need to have lot of methods in CursorTranslator
		*/
		"'placeholder' AS " + COLUMN_LOCAL_URI,
		"'placeholder' AS " + COLUMN_REASON
		DownloadManager.COLUMN_ID,
		DownloadManager.COLUMN_LOCAL_FILENAME,
		DownloadManager.COLUMN_MEDIAPROVIDER_URI,
		DownloadManager.COLUMN_DESTINATION,
		DownloadManager.COLUMN_TITLE,
		DownloadManager.COLUMN_DESCRIPTION,
		DownloadManager.COLUMN_URI,
		DownloadManager.COLUMN_STATUS,
		DownloadManager.COLUMN_FILE_NAME_HINT,
		DownloadManager.COLUMN_MEDIA_TYPE,
		DownloadManager.COLUMN_TOTAL_SIZE_BYTES,
		DownloadManager.COLUMN_LAST_MODIFIED_TIMESTAMP,
		DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR,
		DownloadManager.COLUMN_ALLOW_WRITE,
		DownloadManager.COLUMN_LOCAL_URI,
		DownloadManager.COLUMN_REASON
		};

		/**

core/java/android/app/slice/SliceProvider.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -355,7 +355,8 @@ public abstract class SliceProvider extends ContentProvider {
		@Override
		public Bundle call(String method, String arg, Bundle extras) {
		if (method.equals(METHOD_SLICE)) {
		Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI));
		Uri uri = getUriWithoutUserId(validateIncomingUriOrNull(
		extras.getParcelable(EXTRA_BIND_URI)));
		List<SliceSpec> supportedSpecs = extras.getParcelableArrayList(EXTRA_SUPPORTED_SPECS);

		String callingPackage = getCallingPackage();
		@@ -369,7 +370,7 @@ public abstract class SliceProvider extends ContentProvider {
		} else if (method.equals(METHOD_MAP_INTENT)) {
		Intent intent = extras.getParcelable(EXTRA_INTENT);
		if (intent == null) return null;
		Uri uri = onMapIntentToUri(intent);
		Uri uri = validateIncomingUriOrNull(onMapIntentToUri(intent));
		List<SliceSpec> supportedSpecs = extras.getParcelableArrayList(EXTRA_SUPPORTED_SPECS);
		Bundle b = new Bundle();
		if (uri != null) {
		@@ -383,24 +384,27 @@ public abstract class SliceProvider extends ContentProvider {
		} else if (method.equals(METHOD_MAP_ONLY_INTENT)) {
		Intent intent = extras.getParcelable(EXTRA_INTENT);
		if (intent == null) return null;
		Uri uri = onMapIntentToUri(intent);
		Uri uri = validateIncomingUriOrNull(onMapIntentToUri(intent));
		Bundle b = new Bundle();
		b.putParcelable(EXTRA_SLICE, uri);
		return b;
		} else if (method.equals(METHOD_PIN)) {
		Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI));
		Uri uri = getUriWithoutUserId(validateIncomingUriOrNull(
		extras.getParcelable(EXTRA_BIND_URI)));
		if (Binder.getCallingUid() != Process.SYSTEM_UID) {
		throw new SecurityException("Only the system can pin/unpin slices");
		}
		handlePinSlice(uri);
		} else if (method.equals(METHOD_UNPIN)) {
		Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI));
		Uri uri = getUriWithoutUserId(validateIncomingUriOrNull(
		extras.getParcelable(EXTRA_BIND_URI)));
		if (Binder.getCallingUid() != Process.SYSTEM_UID) {
		throw new SecurityException("Only the system can pin/unpin slices");
		}
		handleUnpinSlice(uri);
		} else if (method.equals(METHOD_GET_DESCENDANTS)) {
		Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI));
		Uri uri = getUriWithoutUserId(
		validateIncomingUriOrNull(extras.getParcelable(EXTRA_BIND_URI)));
		Bundle b = new Bundle();
		b.putParcelableArrayList(EXTRA_SLICE_DESCENDANTS,
		new ArrayList<>(handleGetDescendants(uri)));
		@@ -416,6 +420,10 @@ public abstract class SliceProvider extends ContentProvider {
		return super.call(method, arg, extras);
		}

		private Uri validateIncomingUriOrNull(Uri uri) {
		return uri == null ? null : validateIncomingUri(uri);
		}

		private Collection<Uri> handleGetDescendants(Uri uri) {
		mCallback = "onGetSliceDescendants";
		return onGetSliceDescendants(uri);

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

+309 −42

Original line number	Diff line number	Diff line
		@@ -28,14 +28,19 @@ import android.provider.BaseColumns;
		import android.text.TextUtils;
		import android.util.Log;

		import com.android.internal.util.ArrayUtils;

		import libcore.util.EmptyArray;

		import java.util.Arrays;
		import java.util.Iterator;
		import java.util.List;
		import java.util.Locale;
		import java.util.Map;
		import java.util.Map.Entry;
		import java.util.Objects;
		import java.util.Set;
		import java.util.regex.Matcher;
		import java.util.regex.Pattern;

		/**
		@@ -45,15 +50,24 @@ import java.util.regex.Pattern;
		public class SQLiteQueryBuilder
		{
		private static final String TAG = "SQLiteQueryBuilder";
		private static final Pattern sLimitPattern =
		Pattern.compile("\\s\\d+\\s(,\\s\\d+\\s)?");

		private Map<String, String> mProjectionMap = null;

		private static final Pattern sAggregationPattern = Pattern.compile(
		"(?i)(AVG\|COUNT\|MAX\|MIN\|SUM\|TOTAL\|GROUP_CONCAT)\\((.+)\\)");

		private List<Pattern> mProjectionGreylist = null;

		private String mTables = "";
		private StringBuilder mWhereClause = null; // lazily created
		private boolean mDistinct;
		private SQLiteDatabase.CursorFactory mFactory;
		private boolean mStrict;

		private static final int STRICT_PARENTHESES = 1 << 0;
		private static final int STRICT_COLUMNS = 1 << 1;
		private static final int STRICT_GRAMMAR = 1 << 2;

		private int mStrictFlags;

		public SQLiteQueryBuilder() {
		mDistinct = false;
		@@ -138,6 +152,37 @@ public class SQLiteQueryBuilder
		mProjectionMap = columnMap;
		}

		/**
		* Gets the projection map for the query, as last configured by
		* {@link #setProjectionMap(Map)}.
		*
		* @hide
		*/
		public @Nullable Map<String, String> getProjectionMap() {
		return mProjectionMap;
		}

		/**
		* Sets a projection greylist of columns that will be allowed through, even
		* when {@link #setStrict(boolean)} is enabled. This provides a way for
		* abusive custom columns like {@code COUNT(*)} to continue working.
		*
		* @hide
		*/
		public void setProjectionGreylist(@Nullable List<Pattern> projectionGreylist) {
		mProjectionGreylist = projectionGreylist;
		}

		/**
		* Gets the projection greylist for the query, as last configured by
		* {@link #setProjectionGreylist(List)}.
		*
		* @hide
		*/
		public @Nullable List<Pattern> getProjectionGreylist() {
		return mProjectionGreylist;
		}

		/**
		* Sets the cursor factory to be used for the query. You can use
		* one factory for all queries on a database but it is normally
		@@ -170,8 +215,90 @@ public class SQLiteQueryBuilder
		* </ul>
		* By default, this value is false.
		*/
		public void setStrict(boolean flag) {
		mStrict = flag;
		public void setStrict(boolean strict) {
		if (strict) {
		mStrictFlags \|= STRICT_PARENTHESES;
		} else {
		mStrictFlags &= ~STRICT_PARENTHESES;
		}
		}

		/**
		* Get if the query is marked as strict, as last configured by
		* {@link #setStrict(boolean)}.
		*
		* @hide
		*/
		public boolean isStrict() {
		return (mStrictFlags & STRICT_PARENTHESES) != 0;
		}

		/**
		* When enabled, verify that all projections and {@link ContentValues} only
		* contain valid columns as defined by {@link #setProjectionMap(Map)}.
		* <p>
		* This enforcement applies to {@link #insert}, {@link #query}, and
		* {@link #update} operations. Any enforcement failures will throw an
		* {@link IllegalArgumentException}.
		*
		* @hide
		*/
		public void setStrictColumns(boolean strictColumns) {
		if (strictColumns) {
		mStrictFlags \|= STRICT_COLUMNS;
		} else {
		mStrictFlags &= ~STRICT_COLUMNS;
		}
		}

		/**
		* Get if the query is marked as strict, as last configured by
		* {@link #setStrictColumns(boolean)}.
		*
		* @hide
		*/
		public boolean isStrictColumns() {
		return (mStrictFlags & STRICT_COLUMNS) != 0;
		}

		/**
		* When enabled, verify that all untrusted SQL conforms to a restricted SQL
		* grammar. Here are the restrictions applied:
		* <ul>
		* <li>In {@code WHERE} and {@code HAVING} clauses: subqueries, raising, and
		* windowing terms are rejected.
		* <li>In {@code GROUP BY} clauses: only valid columns are allowed.
		* <li>In {@code ORDER BY} clauses: only valid columns, collation, and
		* ordering terms are allowed.
		* <li>In {@code LIMIT} clauses: only numerical values and offset terms are
		* allowed.
		* </ul>
		* All column references must be valid as defined by
		* {@link #setProjectionMap(Map)}.
		* <p>
		* This enforcement applies to {@link #query}, {@link #update} and
		* {@link #delete} operations. This enforcement does not apply to trusted
		* inputs, such as those provided by {@link #appendWhere}. Any enforcement
		* failures will throw an {@link IllegalArgumentException}.
		*
		* @hide
		*/
		public void setStrictGrammar(boolean strictGrammar) {
		if (strictGrammar) {
		mStrictFlags \|= STRICT_GRAMMAR;
		} else {
		mStrictFlags &= ~STRICT_GRAMMAR;
		}
		}

		/**
		* Get if the query is marked as strict, as last configured by
		* {@link #setStrictGrammar(boolean)}.
		*
		* @hide
		*/
		public boolean isStrictGrammar() {
		return (mStrictFlags & STRICT_GRAMMAR) != 0;
		}

		/**
		@@ -207,9 +334,6 @@ public class SQLiteQueryBuilder
		throw new IllegalArgumentException(
		"HAVING clauses are only permitted when using a groupBy clause");
		}
		if (!TextUtils.isEmpty(limit) && !sLimitPattern.matcher(limit).matches()) {
		throw new IllegalArgumentException("invalid LIMIT clauses:" + limit);
		}

		StringBuilder query = new StringBuilder(120);

		@@ -383,7 +507,13 @@ public class SQLiteQueryBuilder
		projectionIn, selection, groupBy, having,
		sortOrder, limit);

		if (mStrict && selection != null && selection.length() > 0) {
		if (isStrictColumns()) {
		enforceStrictColumns(projectionIn);
		}
		if (isStrictGrammar()) {
		enforceStrictGrammar(selection, groupBy, having, sortOrder, limit);
		}
		if (isStrict()) {
		// Validate the user-supplied selection to detect syntactic anomalies
		// in the selection string that could indicate a SQL injection attempt.
		// The idea is to ensure that the selection clause is a valid SQL expression
		@@ -401,7 +531,7 @@ public class SQLiteQueryBuilder

		// Execute wrapped query for extra protection
		final String wrappedSql = buildQuery(projectionIn, wrap(selection), groupBy,
		having, sortOrder, limit);
		wrap(having), sortOrder, limit);
		sql = wrappedSql;
		} else {
		// Execute unwrapped query
		@@ -446,7 +576,13 @@ public class SQLiteQueryBuilder
		final String sql;
		final String unwrappedSql = buildUpdate(values, selection);

		if (mStrict) {
		if (isStrictColumns()) {
		enforceStrictColumns(values);
		}
		if (isStrictGrammar()) {
		enforceStrictGrammar(selection, null, null, null, null);
		}
		if (isStrict()) {
		// Validate the user-supplied selection to detect syntactic anomalies
		// in the selection string that could indicate a SQL injection attempt.
		// The idea is to ensure that the selection clause is a valid SQL expression
		@@ -516,7 +652,10 @@ public class SQLiteQueryBuilder
		final String sql;
		final String unwrappedSql = buildDelete(selection);

		if (mStrict) {
		if (isStrictGrammar()) {
		enforceStrictGrammar(selection, null, null, null, null);
		}
		if (isStrict()) {
		// Validate the user-supplied selection to detect syntactic anomalies
		// in the selection string that could indicate a SQL injection attempt.
		// The idea is to ensure that the selection clause is a valid SQL expression
		@@ -551,6 +690,82 @@ public class SQLiteQueryBuilder
		return db.executeSql(sql, sqlArgs);
		}

		private void enforceStrictColumns(@Nullable String[] projection) {
		Objects.requireNonNull(mProjectionMap, "No projection map defined");

		computeProjection(projection);
		}

		private void enforceStrictColumns(@NonNull ContentValues values) {
		Objects.requireNonNull(mProjectionMap, "No projection map defined");

		final Set<String> rawValues = values.keySet();
		final Iterator<String> rawValuesIt = rawValues.iterator();
		while (rawValuesIt.hasNext()) {
		final String column = rawValuesIt.next();
		if (!mProjectionMap.containsKey(column)) {
		throw new IllegalArgumentException("Invalid column " + column);
		}
		}
		}

		private void enforceStrictGrammar(@Nullable String selection, @Nullable String groupBy,
		@Nullable String having, @Nullable String sortOrder, @Nullable String limit) {
		SQLiteTokenizer.tokenize(selection, SQLiteTokenizer.OPTION_NONE,
		this::enforceStrictGrammarWhereHaving);
		SQLiteTokenizer.tokenize(groupBy, SQLiteTokenizer.OPTION_NONE,
		this::enforceStrictGrammarGroupBy);
		SQLiteTokenizer.tokenize(having, SQLiteTokenizer.OPTION_NONE,
		this::enforceStrictGrammarWhereHaving);
		SQLiteTokenizer.tokenize(sortOrder, SQLiteTokenizer.OPTION_NONE,
		this::enforceStrictGrammarOrderBy);
		SQLiteTokenizer.tokenize(limit, SQLiteTokenizer.OPTION_NONE,
		this::enforceStrictGrammarLimit);
		}

		private void enforceStrictGrammarWhereHaving(@NonNull String token) {
		if (isTableOrColumn(token)) return;
		if (SQLiteTokenizer.isFunction(token)) return;
		if (SQLiteTokenizer.isType(token)) return;

		// NOTE: we explicitly don't allow SELECT subqueries, since they could
		// leak data that should have been filtered by the trusted where clause
		switch (token.toUpperCase(Locale.US)) {
		case "AND": case "AS": case "BETWEEN": case "BINARY":
		case "CASE": case "CAST": case "COLLATE": case "DISTINCT":
		case "ELSE": case "END": case "ESCAPE": case "EXISTS":
		case "GLOB": case "IN": case "IS": case "ISNULL":
		case "LIKE": case "MATCH": case "NOCASE": case "NOT":
		case "NOTNULL": case "NULL": case "OR": case "REGEXP":
		case "RTRIM": case "THEN": case "WHEN":
		return;
		}
		throw new IllegalArgumentException("Invalid token " + token);
		}

		private void enforceStrictGrammarGroupBy(@NonNull String token) {
		if (isTableOrColumn(token)) return;
		throw new IllegalArgumentException("Invalid token " + token);
		}

		private void enforceStrictGrammarOrderBy(@NonNull String token) {
		if (isTableOrColumn(token)) return;
		switch (token.toUpperCase(Locale.US)) {
		case "COLLATE": case "ASC": case "DESC":
		case "BINARY": case "RTRIM": case "NOCASE":
		return;
		}
		throw new IllegalArgumentException("Invalid token " + token);
		}

		private void enforceStrictGrammarLimit(@NonNull String token) {
		switch (token.toUpperCase(Locale.US)) {
		case "OFFSET":
		return;
		}
		throw new IllegalArgumentException("Invalid token " + token);
		}

		/**
		* Construct a SELECT statement suitable for use in a group of
		* SELECT statements that will be joined through UNION operators
		@@ -611,7 +826,7 @@ public class SQLiteQueryBuilder

		StringBuilder sql = new StringBuilder(120);
		sql.append("UPDATE ");
		sql.append(mTables);
		sql.append(SQLiteDatabase.findEditTable(mTables));
		sql.append(" SET ");

		final String[] rawKeys = values.keySet().toArray(EmptyArray.STRING);
		@@ -632,7 +847,7 @@ public class SQLiteQueryBuilder
		public String buildDelete(String selection) {
		StringBuilder sql = new StringBuilder(120);
		sql.append("DELETE FROM ");
		sql.append(mTables);
		sql.append(SQLiteDatabase.findEditTable(mTables));

		final String where = computeWhere(selection);
		appendClause(sql, " WHERE ", where);
		@@ -763,35 +978,23 @@ public class SQLiteQueryBuilder
		return query.toString();
		}

		private String[] computeProjection(String[] projectionIn) {
		if (projectionIn != null && projectionIn.length > 0) {
		if (mProjectionMap != null) {
		String[] projection = new String[projectionIn.length];
		int length = projectionIn.length;

		for (int i = 0; i < length; i++) {
		String userColumn = projectionIn[i];
		String column = mProjectionMap.get(userColumn);

		if (column != null) {
		projection[i] = column;
		continue;
		private static @NonNull String maybeWithOperator(@Nullable String operator,
		@NonNull String column) {
		if (operator != null) {
		return operator + "(" + column + ")";
		} else {
		return column;
		}

		if (!mStrict &&
		( userColumn.contains(" AS ") \|\| userColumn.contains(" as "))) {
		/* A column alias already exist */
		projection[i] = userColumn;
		continue;
		}

		throw new IllegalArgumentException("Invalid column "
		+ projectionIn[i]);
		}
		return projection;
		} else {
		return projectionIn;
		/** {@hide} */
		public @Nullable String[] computeProjection(@Nullable String[] projectionIn) {
		if (!ArrayUtils.isEmpty(projectionIn)) {
		String[] projectionOut = new String[projectionIn.length];
		for (int i = 0; i < projectionIn.length; i++) {
		projectionOut[i] = computeSingleProjectionOrThrow(projectionIn[i]);
		}
		return projectionOut;
		} else if (mProjectionMap != null) {
		// Return all columns in projection map.
		Set<Entry<String, String>> entrySet = mProjectionMap.entrySet();
		@@ -813,7 +1016,71 @@ public class SQLiteQueryBuilder
		return null;
		}

		private @Nullable String computeWhere(@Nullable String selection) {
		private @NonNull String computeSingleProjectionOrThrow(@NonNull String userColumn) {
		final String column = computeSingleProjection(userColumn);
		if (column != null) {
		return column;
		} else {
		throw new IllegalArgumentException("Invalid column " + userColumn);
		}
		}

		private @Nullable String computeSingleProjection(@NonNull String userColumn) {
		// When no mapping provided, anything goes
		if (mProjectionMap == null) {
		return userColumn;
		}

		String operator = null;
		String column = mProjectionMap.get(userColumn);

		// When no direct match found, look for aggregation
		if (column == null) {
		final Matcher matcher = sAggregationPattern.matcher(userColumn);
		if (matcher.matches()) {
		operator = matcher.group(1);
		userColumn = matcher.group(2);
		column = mProjectionMap.get(userColumn);
		}
		}

		if (column != null) {
		return maybeWithOperator(operator, column);
		}

		if (mStrictFlags == 0
		&& (userColumn.contains(" AS ") \|\| userColumn.contains(" as "))) {
		/* A column alias already exist */
		return maybeWithOperator(operator, userColumn);
		}

		// If greylist is configured, we might be willing to let
		// this custom column bypass our strict checks.
		if (mProjectionGreylist != null) {
		boolean match = false;
		for (Pattern p : mProjectionGreylist) {
		if (p.matcher(userColumn).matches()) {
		match = true;
		break;
		}
		}

		if (match) {
		Log.w(TAG, "Allowing abusive custom column: " + userColumn);
		return maybeWithOperator(operator, userColumn);
		}
		}

		return null;
		}

		private boolean isTableOrColumn(String token) {
		if (mTables.equals(token)) return true;
		return computeSingleProjection(token) != null;
		}

		/** {@hide} */
		public @Nullable String computeWhere(@Nullable String selection) {
		final boolean hasInternal = !TextUtils.isEmpty(mWhereClause);
		final boolean hasExternal = !TextUtils.isEmpty(selection);

core/java/android/database/sqlite/SQLiteTokenizer.java

0 → 100644

+297 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/provider/Settings.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -5574,6 +5574,18 @@ public final class Settings {
		@Deprecated
		public static final String DEVICE_PROVISIONED = Global.DEVICE_PROVISIONED;

		/**
		* Indicates whether a DPC has been downloaded during provisioning.
		*
		* <p>Type: int (0 for false, 1 for true)
		*
		* <p>If this is true, then any attempts to begin setup again should result in factory reset
		*
		* @hide
		*/
		public static final String MANAGED_PROVISIONING_DPC_DOWNLOADED =
		"managed_provisioning_dpc_downloaded";

		/**
		* Whether the current user has been set up via setup wizard (0 = false, 1 = true)
		* @hide