Merge branch 'cm-14.1' into eelo-0.1 (dd86631b) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentProvider.java

+57 −32

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import java.io.IOException;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Objects;

		/**
		* Content providers are one of the primary building blocks of Android applications, providing
		@@ -207,8 +208,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		public Cursor query(String callingPkg, Uri uri, String[] projection,
		String selection, String[] selectionArgs, String sortOrder,
		ICancellationSignal cancellationSignal) {
		validateIncomingUri(uri);
		uri = getUriWithoutUserId(uri);
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		if (enforceReadPermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
		// The caller has no access to the data, so return an empty cursor with
		// the columns in the requested order. The caller may ask for an invalid
		@@ -246,16 +247,16 @@ public abstract class ContentProvider implements ComponentCallbacks2 {

		@Override
		public String getType(Uri uri) {
		validateIncomingUri(uri);
		uri = getUriWithoutUserId(uri);
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		return ContentProvider.this.getType(uri);
		}

		@Override
		public Uri insert(String callingPkg, Uri uri, ContentValues initialValues) {
		validateIncomingUri(uri);
		uri = validateIncomingUri(uri);
		int userId = getUserIdFromUri(uri);
		uri = getUriWithoutUserId(uri);
		uri = maybeGetUriWithoutUserId(uri);
		if (enforceWritePermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
		return rejectInsert(uri, initialValues);
		}
		@@ -269,8 +270,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {

		@Override
		public int bulkInsert(String callingPkg, Uri uri, ContentValues[] initialValues) {
		validateIncomingUri(uri);
		uri = getUriWithoutUserId(uri);
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		if (enforceWritePermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
		return 0;
		}
		@@ -291,11 +292,12 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		for (int i = 0; i < numOperations; i++) {
		ContentProviderOperation operation = operations.get(i);
		Uri uri = operation.getUri();
		validateIncomingUri(uri);
		userIds[i] = getUserIdFromUri(uri);
		if (userIds[i] != UserHandle.USER_CURRENT) {
		// Removing the user id from the uri.
		operation = new ContentProviderOperation(operation, true);
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		// Rebuild operation if we changed the Uri above
		if (!Objects.equals(operation.getUri(), uri)) {
		operation = new ContentProviderOperation(operation, uri);
		operations.set(i, operation);
		}
		if (operation.isReadOperation()) {
		@@ -330,8 +332,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {

		@Override
		public int delete(String callingPkg, Uri uri, String selection, String[] selectionArgs) {
		validateIncomingUri(uri);
		uri = getUriWithoutUserId(uri);
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		if (enforceWritePermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
		return 0;
		}
		@@ -346,8 +348,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		@Override
		public int update(String callingPkg, Uri uri, ContentValues values, String selection,
		String[] selectionArgs) {
		validateIncomingUri(uri);
		uri = getUriWithoutUserId(uri);
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		if (enforceWritePermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
		return 0;
		}
		@@ -363,8 +365,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		public ParcelFileDescriptor openFile(
		String callingPkg, Uri uri, String mode, ICancellationSignal cancellationSignal,
		IBinder callerToken) throws FileNotFoundException {
		validateIncomingUri(uri);
		uri = getUriWithoutUserId(uri);
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		enforceFilePermission(callingPkg, uri, mode, callerToken);
		final String original = setCallingPackage(callingPkg);
		try {
		@@ -379,8 +381,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		public AssetFileDescriptor openAssetFile(
		String callingPkg, Uri uri, String mode, ICancellationSignal cancellationSignal)
		throws FileNotFoundException {
		validateIncomingUri(uri);
		uri = getUriWithoutUserId(uri);
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		enforceFilePermission(callingPkg, uri, mode, null);
		final String original = setCallingPackage(callingPkg);
		try {
		@@ -405,8 +407,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {

		@Override
		public String[] getStreamTypes(Uri uri, String mimeTypeFilter) {
		validateIncomingUri(uri);
		uri = getUriWithoutUserId(uri);
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		return ContentProvider.this.getStreamTypes(uri, mimeTypeFilter);
		}

		@@ -414,8 +416,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		public AssetFileDescriptor openTypedAssetFile(String callingPkg, Uri uri, String mimeType,
		Bundle opts, ICancellationSignal cancellationSignal) throws FileNotFoundException {
		Bundle.setDefusable(opts, true);
		validateIncomingUri(uri);
		uri = getUriWithoutUserId(uri);
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		enforceFilePermission(callingPkg, uri, "r", null);
		final String original = setCallingPackage(callingPkg);
		try {
		@@ -433,7 +435,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {

		@Override
		public Uri canonicalize(String callingPkg, Uri uri) {
		validateIncomingUri(uri);
		uri = validateIncomingUri(uri);
		int userId = getUserIdFromUri(uri);
		uri = getUriWithoutUserId(uri);
		if (enforceReadPermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
		@@ -449,7 +451,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {

		@Override
		public Uri uncanonicalize(String callingPkg, Uri uri) {
		validateIncomingUri(uri);
		uri = validateIncomingUri(uri);
		int userId = getUserIdFromUri(uri);
		uri = getUriWithoutUserId(uri);
		if (enforceReadPermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
		@@ -1735,7 +1737,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		*/
		if (mContext == null) {
		mContext = context;
		if (context != null) {
		if (context != null && mTransport != null) {
		mTransport.mAppOpsManager = (AppOpsManager) context.getSystemService(
		Context.APP_OPS_SERVICE);
		}
		@@ -1844,13 +1846,15 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		}

		/** @hide */
		private void validateIncomingUri(Uri uri) throws SecurityException {
		public Uri validateIncomingUri(Uri uri) throws SecurityException {
		String auth = uri.getAuthority();
		if (!mSingleUser) {
		int userId = getUserIdFromAuthority(auth, UserHandle.USER_CURRENT);
		if (userId != UserHandle.USER_CURRENT && userId != mContext.getUserId()) {
		throw new SecurityException("trying to query a ContentProvider in user "
		+ mContext.getUserId() + " with a uri belonging to user " + userId);
		}
		}
		if (!matchesOurAuthorities(getAuthorityWithoutUserId(auth))) {
		String message = "The authority of the uri " + uri + " does not match the one of the "
		+ "contentProvider: ";
		@@ -1861,6 +1865,27 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		}
		throw new SecurityException(message);
		}

		// Normalize the path by removing any empty path segments, which can be
		// a source of security issues.
		final String encodedPath = uri.getEncodedPath();
		if (encodedPath != null && encodedPath.indexOf("//") != -1) {
		final Uri normalized = uri.buildUpon()
		.encodedPath(encodedPath.replaceAll("//+", "/")).build();
		Log.w(TAG, "Normalized " + uri + " to " + normalized
		+ " to avoid possible security issues");
		return normalized;
		} else {
		return uri;
		}
		}

		/** @hide */
		private Uri maybeGetUriWithoutUserId(Uri uri) {
		if (mSingleUser) {
		return uri;
		}
		return getUriWithoutUserId(uri);
		}

		/** @hide */

core/java/android/content/ContentProviderOperation.java

+2 −14

Original line number	Diff line number	Diff line
		@@ -94,13 +94,9 @@ public class ContentProviderOperation implements Parcelable {
		}

		/** @hide */
		public ContentProviderOperation(ContentProviderOperation cpo, boolean removeUserIdFromUri) {
		public ContentProviderOperation(ContentProviderOperation cpo, Uri withUri) {
		mType = cpo.mType;
		if (removeUserIdFromUri) {
		mUri = ContentProvider.getUriWithoutUserId(cpo.mUri);
		} else {
		mUri = cpo.mUri;
		}
		mUri = withUri;
		mValues = cpo.mValues;
		mSelection = cpo.mSelection;
		mSelectionArgs = cpo.mSelectionArgs;
		@@ -110,14 +106,6 @@ public class ContentProviderOperation implements Parcelable {
		mYieldAllowed = cpo.mYieldAllowed;
		}

		/** @hide */
		public ContentProviderOperation getWithoutUserIdInUri() {
		if (ContentProvider.uriHasUserId(mUri)) {
		return new ContentProviderOperation(this, true);
		}
		return this;
		}

		public void writeToParcel(Parcel dest, int flags) {
		dest.writeInt(mType);
		Uri.writeToParcel(dest, mUri);

core/res/res/values-mcc302-mnc220/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@
		<item>ERR_ESTIMATE=0</item>
		<item>INTERMEDIATE_POS=0</item>
		<item>GPS_LOCK=0</item>
		<item>SUPL_ES=0</item>
		<item>SUPL_ES=1</item>
		</string-array>

		</resources>

core/res/res/values-mcc302-mnc221/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@
		<item>ERR_ESTIMATE=0</item>
		<item>INTERMEDIATE_POS=0</item>
		<item>GPS_LOCK=0</item>
		<item>SUPL_ES=0</item>
		<item>SUPL_ES=1</item>
		</string-array>

		</resources>

core/res/res/values-mcc302-mnc370/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@
		<item>ERR_ESTIMATE=0</item>
		<item>INTERMEDIATE_POS=0</item>
		<item>GPS_LOCK=0</item>
		<item>SUPL_ES=0</item>
		<item>SUPL_ES=1</item>
		</string-array>

		</resources>