Merge "Exposing file:// beyond your app is bad, m'kay?" (d2454432) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -28538,6 +28538,10 @@ package android.os {
		field public static final int OPEN = 32; // 0x20
		}

		public class FileUriExposedException extends java.lang.RuntimeException {
		ctor public FileUriExposedException(java.lang.String);
		}

		public class Handler {
		ctor public Handler();
		ctor public Handler(android.os.Handler.Callback);
		@@ -29129,6 +29133,7 @@ package android.os {
		method public android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDeath();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();
		method public android.os.StrictMode.VmPolicy.Builder penaltyLog();
		method public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int);

api/system-current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -30566,6 +30566,10 @@ package android.os {
		field public static final int OPEN = 32; // 0x20
		}

		public class FileUriExposedException extends java.lang.RuntimeException {
		ctor public FileUriExposedException(java.lang.String);
		}

		public class Handler {
		ctor public Handler();
		ctor public Handler(android.os.Handler.Callback);
		@@ -31165,6 +31169,7 @@ package android.os {
		method public android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDeath();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();
		method public android.os.StrictMode.VmPolicy.Builder penaltyLog();
		method public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int);

api/test-current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -28547,6 +28547,10 @@ package android.os {
		field public static final int OPEN = 32; // 0x20
		}

		public class FileUriExposedException extends java.lang.RuntimeException {
		ctor public FileUriExposedException(java.lang.String);
		}

		public class Handler {
		ctor public Handler();
		ctor public Handler(android.os.Handler.Callback);
		@@ -29138,6 +29142,7 @@ package android.os {
		method public android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDeath();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();
		method public android.os.StrictMode.VmPolicy.Builder penaltyLog();
		method public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int);

core/java/android/app/Activity.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -4397,7 +4397,7 @@ public class Activity extends ContextThemeWrapper
		String resolvedType = null;
		if (fillInIntent != null) {
		fillInIntent.migrateExtraStreamToClipData();
		fillInIntent.prepareToLeaveProcess();
		fillInIntent.prepareToLeaveProcess(this);
		resolvedType = fillInIntent.resolveTypeIfNeeded(getContentResolver());
		}
		int result = ActivityManagerNative.getDefault()
		@@ -4629,7 +4629,7 @@ public class Activity extends ContextThemeWrapper
		intent.putExtra(Intent.EXTRA_REFERRER, referrer);
		}
		intent.migrateExtraStreamToClipData();
		intent.prepareToLeaveProcess();
		intent.prepareToLeaveProcess(this);
		result = ActivityManagerNative.getDefault()
		.startActivity(mMainThread.getApplicationThread(), getBasePackageName(),
		intent, intent.resolveTypeIfNeeded(getContentResolver()), mToken,
		@@ -4700,7 +4700,7 @@ public class Activity extends ContextThemeWrapper
		if (mParent == null) {
		try {
		intent.migrateExtraStreamToClipData();
		intent.prepareToLeaveProcess();
		intent.prepareToLeaveProcess(this);
		return ActivityManagerNative.getDefault()
		.startNextMatchingActivity(mToken, intent, options);
		} catch (RemoteException e) {
		@@ -5128,7 +5128,7 @@ public class Activity extends ContextThemeWrapper
		if (false) Log.v(TAG, "Finishing self: token=" + mToken);
		try {
		if (resultData != null) {
		resultData.prepareToLeaveProcess();
		resultData.prepareToLeaveProcess(this);
		}
		if (ActivityManagerNative.getDefault()
		.finishActivity(mToken, resultCode, resultData, finishTask)) {
		@@ -5355,7 +5355,7 @@ public class Activity extends ContextThemeWrapper
		@PendingIntent.Flags int flags) {
		String packageName = getPackageName();
		try {
		data.prepareToLeaveProcess();
		data.prepareToLeaveProcess(this);
		IIntentSender target =
		ActivityManagerNative.getDefault().getIntentSender(
		ActivityManager.INTENT_SENDER_ACTIVITY_RESULT, packageName,
		@@ -6335,10 +6335,10 @@ public class Activity extends ContextThemeWrapper
		resultData = mResultData;
		}
		if (resultData != null) {
		resultData.prepareToLeaveProcess();
		resultData.prepareToLeaveProcess(this);
		}
		try {
		upIntent.prepareToLeaveProcess();
		upIntent.prepareToLeaveProcess(this);
		return ActivityManagerNative.getDefault().navigateUpTo(mToken, upIntent,
		resultCode, resultData);
		} catch (RemoteException e) {

core/java/android/app/ActivityThread.java

+13 −6

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import android.net.Uri;
		import android.opengl.GLUtils;
		import android.os.AsyncTask;
		import android.os.Binder;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Debug;
		import android.os.DropBoxManager;
		@@ -4959,16 +4960,22 @@ public final class ActivityThread {
		}

		/**
		* For apps targetting SDK Honeycomb or later, we don't allow
		* network usage on the main event loop / UI thread.
		*
		* Note to those grepping: this is what ultimately throws
		* NetworkOnMainThreadException ...
		* For apps targetting Honeycomb or later, we don't allow network usage
		* on the main event loop / UI thread. This is what ultimately throws
		* {@link NetworkOnMainThreadException}.
		*/
		if (data.appInfo.targetSdkVersion > 9) {
		if (data.appInfo.targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB) {
		StrictMode.enableDeathOnNetwork();
		}

		/**
		* For apps targetting N or later, we don't allow file:// Uri exposure.
		* This is what ultimately throws {@link FileUriExposedException}.
		*/
		if (data.appInfo.targetSdkVersion >= Build.VERSION_CODES.N) {
		StrictMode.enableDeathOnFileUriExposure();
		}

		NetworkSecurityPolicy.getInstance().setCleartextTrafficPermitted(
		(data.appInfo.flags & ApplicationInfo.FLAG_USES_CLEARTEXT_TRAFFIC) != 0);