am 04e740a6: am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev (5c1994ee) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -16943,6 +16943,7 @@ package android.os {
		method public android.os.StrictMode.VmPolicy build();
		method public android.os.StrictMode.VmPolicy.Builder detectActivityLeaks();
		method public android.os.StrictMode.VmPolicy.Builder detectAll();
		method public android.os.StrictMode.VmPolicy.Builder detectFileUriExposure();
		method public android.os.StrictMode.VmPolicy.Builder detectLeakedClosableObjects();
		method public android.os.StrictMode.VmPolicy.Builder detectLeakedRegistrationObjects();
		method public android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects();

core/java/android/app/Activity.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -3513,7 +3513,8 @@ public class Activity extends ContextThemeWrapper
		try {
		String resolvedType = null;
		if (fillInIntent != null) {
		fillInIntent.setAllowFds(false);
		fillInIntent.migrateExtraStreamToClipData();
		fillInIntent.prepareToLeaveProcess();
		resolvedType = fillInIntent.resolveTypeIfNeeded(getContentResolver());
		}
		int result = ActivityManagerNative.getDefault()
		@@ -3738,7 +3739,8 @@ public class Activity extends ContextThemeWrapper
		if (mParent == null) {
		int result = ActivityManager.START_RETURN_INTENT_TO_CALLER;
		try {
		intent.setAllowFds(false);
		intent.migrateExtraStreamToClipData();
		intent.prepareToLeaveProcess();
		result = ActivityManagerNative.getDefault()
		.startActivity(mMainThread.getApplicationThread(), getBasePackageName(),
		intent, intent.resolveTypeIfNeeded(getContentResolver()),
		@@ -3808,7 +3810,8 @@ public class Activity extends ContextThemeWrapper
		public boolean startNextMatchingActivity(Intent intent, Bundle options) {
		if (mParent == null) {
		try {
		intent.setAllowFds(false);
		intent.migrateExtraStreamToClipData();
		intent.prepareToLeaveProcess();
		return ActivityManagerNative.getDefault()
		.startNextMatchingActivity(mToken, intent, options);
		} catch (RemoteException e) {
		@@ -4162,7 +4165,7 @@ public class Activity extends ContextThemeWrapper
		if (false) Log.v(TAG, "Finishing self: token=" + mToken);
		try {
		if (resultData != null) {
		resultData.setAllowFds(false);
		resultData.prepareToLeaveProcess();
		}
		if (ActivityManagerNative.getDefault()
		.finishActivity(mToken, resultCode, resultData)) {
		@@ -4314,7 +4317,7 @@ public class Activity extends ContextThemeWrapper
		int flags) {
		String packageName = getPackageName();
		try {
		data.setAllowFds(false);
		data.prepareToLeaveProcess();
		IIntentSender target =
		ActivityManagerNative.getDefault().getIntentSender(
		ActivityManager.INTENT_SENDER_ACTIVITY_RESULT, packageName,
		@@ -4993,9 +4996,10 @@ public class Activity extends ContextThemeWrapper
		resultData = mResultData;
		}
		if (resultData != null) {
		resultData.setAllowFds(false);
		resultData.prepareToLeaveProcess();
		}
		try {
		upIntent.prepareToLeaveProcess();
		return ActivityManagerNative.getDefault().navigateUpTo(mToken, upIntent,
		resultCode, resultData);
		} catch (RemoteException e) {

core/java/android/app/ContextImpl.java

+19 −18

Original line number	Diff line number	Diff line
		@@ -1020,7 +1020,8 @@ class ContextImpl extends Context {
		try {
		String resolvedType = null;
		if (fillInIntent != null) {
		fillInIntent.setAllowFds(false);
		fillInIntent.migrateExtraStreamToClipData();
		fillInIntent.prepareToLeaveProcess();
		resolvedType = fillInIntent.resolveTypeIfNeeded(getContentResolver());
		}
		int result = ActivityManagerNative.getDefault()
		@@ -1040,7 +1041,7 @@ class ContextImpl extends Context {
		warnIfCallingFromSystemProcess();
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, false, false,
		@@ -1054,7 +1055,7 @@ class ContextImpl extends Context {
		warnIfCallingFromSystemProcess();
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, receiverPermission, AppOpsManager.OP_NONE,
		@@ -1068,7 +1069,7 @@ class ContextImpl extends Context {
		warnIfCallingFromSystemProcess();
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, receiverPermission, appOp, false, false,
		@@ -1083,7 +1084,7 @@ class ContextImpl extends Context {
		warnIfCallingFromSystemProcess();
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, receiverPermission, AppOpsManager.OP_NONE, true, false,
		@@ -1126,7 +1127,7 @@ class ContextImpl extends Context {
		}
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, rd,
		initialCode, initialData, initialExtras, receiverPermission, appOp,
		@@ -1139,7 +1140,7 @@ class ContextImpl extends Context {
		public void sendBroadcastAsUser(Intent intent, UserHandle user) {
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(mMainThread.getApplicationThread(),
		intent, resolvedType, null, Activity.RESULT_OK, null, null, null,
		AppOpsManager.OP_NONE, false, false, user.getIdentifier());
		@@ -1152,7 +1153,7 @@ class ContextImpl extends Context {
		String receiverPermission) {
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, receiverPermission, AppOpsManager.OP_NONE, false, false,
		@@ -1184,7 +1185,7 @@ class ContextImpl extends Context {
		}
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, rd,
		initialCode, initialData, initialExtras, receiverPermission,
		@@ -1198,7 +1199,7 @@ class ContextImpl extends Context {
		warnIfCallingFromSystemProcess();
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, false, true,
		@@ -1232,7 +1233,7 @@ class ContextImpl extends Context {
		}
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, rd,
		initialCode, initialData, initialExtras, null,
		@@ -1249,7 +1250,7 @@ class ContextImpl extends Context {
		intent.setDataAndType(intent.getData(), resolvedType);
		}
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().unbroadcastIntent(
		mMainThread.getApplicationThread(), intent, getUserId());
		} catch (RemoteException e) {
		@@ -1260,7 +1261,7 @@ class ContextImpl extends Context {
		public void sendStickyBroadcastAsUser(Intent intent, UserHandle user) {
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, false, true, user.getIdentifier());
		@@ -1292,7 +1293,7 @@ class ContextImpl extends Context {
		}
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, rd,
		initialCode, initialData, initialExtras, null,
		@@ -1309,7 +1310,7 @@ class ContextImpl extends Context {
		intent.setDataAndType(intent.getData(), resolvedType);
		}
		try {
		intent.setAllowFds(false);
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().unbroadcastIntent(
		mMainThread.getApplicationThread(), intent, user.getIdentifier());
		} catch (RemoteException e) {
		@@ -1393,7 +1394,7 @@ class ContextImpl extends Context {
		@Override
		public ComponentName startServiceAsUser(Intent service, UserHandle user) {
		try {
		service.setAllowFds(false);
		service.prepareToLeaveProcess();
		ComponentName cn = ActivityManagerNative.getDefault().startService(
		mMainThread.getApplicationThread(), service,
		service.resolveTypeIfNeeded(getContentResolver()), user.getIdentifier());
		@@ -1417,7 +1418,7 @@ class ContextImpl extends Context {
		@Override
		public boolean stopServiceAsUser(Intent service, UserHandle user) {
		try {
		service.setAllowFds(false);
		service.prepareToLeaveProcess();
		int res = ActivityManagerNative.getDefault().stopService(
		mMainThread.getApplicationThread(), service,
		service.resolveTypeIfNeeded(getContentResolver()), user.getIdentifier());
		@@ -1459,7 +1460,7 @@ class ContextImpl extends Context {
		< android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
		flags \|= BIND_WAIVE_PRIORITY;
		}
		service.setAllowFds(false);
		service.prepareToLeaveProcess();
		int res = ActivityManagerNative.getDefault().bindService(
		mMainThread.getApplicationThread(), getActivityToken(),
		service, service.resolveTypeIfNeeded(getContentResolver()),

core/java/android/app/Instrumentation.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -1410,8 +1410,8 @@ public class Instrumentation {
		}
		}
		try {
		intent.setAllowFds(false);
		intent.migrateExtraStreamToClipData();
		intent.prepareToLeaveProcess();
		int result = ActivityManagerNative.getDefault()
		.startActivity(whoThread, who.getBasePackageName(), intent,
		intent.resolveTypeIfNeeded(who.getContentResolver()),
		@@ -1467,7 +1467,8 @@ public class Instrumentation {
		try {
		String[] resolvedTypes = new String[intents.length];
		for (int i=0; i<intents.length; i++) {
		intents[i].setAllowFds(false);
		intents[i].migrateExtraStreamToClipData();
		intents[i].prepareToLeaveProcess();
		resolvedTypes[i] = intents[i].resolveTypeIfNeeded(who.getContentResolver());
		}
		int result = ActivityManagerNative.getDefault()
		@@ -1526,8 +1527,8 @@ public class Instrumentation {
		}
		}
		try {
		intent.setAllowFds(false);
		intent.migrateExtraStreamToClipData();
		intent.prepareToLeaveProcess();
		int result = ActivityManagerNative.getDefault()
		.startActivity(whoThread, who.getBasePackageName(), intent,
		intent.resolveTypeIfNeeded(who.getContentResolver()),
		@@ -1586,8 +1587,8 @@ public class Instrumentation {
		}
		}
		try {
		intent.setAllowFds(false);
		intent.migrateExtraStreamToClipData();
		intent.prepareToLeaveProcess();
		int result = ActivityManagerNative.getDefault()
		.startActivityAsUser(whoThread, who.getBasePackageName(), intent,
		intent.resolveTypeIfNeeded(who.getContentResolver()),

core/java/android/app/NotificationManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.os.Handler;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.StrictMode;
		import android.os.UserHandle;
		import android.util.Log;

		@@ -126,6 +127,9 @@ public class NotificationManager
		String pkg = mContext.getPackageName();
		if (notification.sound != null) {
		notification.sound = notification.sound.getCanonicalUri();
		if (StrictMode.vmFileUriExposureEnabled()) {
		notification.sound.checkFileUriExposed("Notification.sound");
		}
		}
		if (localLOGV) Log.v(TAG, pkg + ": notify(" + id + ", " + notification + ")");
		try {
		@@ -148,6 +152,9 @@ public class NotificationManager
		String pkg = mContext.getPackageName();
		if (notification.sound != null) {
		notification.sound = notification.sound.getCanonicalUri();
		if (StrictMode.vmFileUriExposureEnabled()) {
		notification.sound.checkFileUriExposed("Notification.sound");
		}
		}
		if (localLOGV) Log.v(TAG, pkg + ": notify(" + id + ", " + notification + ")");
		try {