Merge "Protect System UI from crashing when sharing file: URIs." into qt-dev am: df379f7d4a (d3d2f008) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/chooser/ChooserHelper.java

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.app.ActivityTaskManager;
	import android.content.Intent;		import android.content.Intent;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.IBinder;		import android.os.IBinder;
			import android.os.StrictMode;

	/**		/**
	* When a target is chosen from the SystemUI Chooser activity, unpack its arguments and		* When a target is chosen from the SystemUI Chooser activity, unpack its arguments and
	@@ -40,7 +41,15 @@ public class ChooserHelper {
	final boolean ignoreTargetSecurity =		final boolean ignoreTargetSecurity =
	thisIntent.getBooleanExtra(ActivityTaskManager.EXTRA_IGNORE_TARGET_SECURITY, false);		thisIntent.getBooleanExtra(ActivityTaskManager.EXTRA_IGNORE_TARGET_SECURITY, false);
	final int userId = thisIntent.getIntExtra(Intent.EXTRA_USER_ID, -1);		final int userId = thisIntent.getIntExtra(Intent.EXTRA_USER_ID, -1);

			// We're dispatching intents that might be coming from legacy apps, so
			// (as in com.android.internal.app.ResolverActivity) exempt ourselves from death.
			StrictMode.disableDeathOnFileUriExposure();
			try {
	activity.startActivityAsCaller(		activity.startActivityAsCaller(
	chosenIntent, options, permissionToken, ignoreTargetSecurity, userId);		chosenIntent, options, permissionToken, ignoreTargetSecurity, userId);
			} finally {
			StrictMode.enableDeathOnFileUriExposure();
			}
	}		}
	}		}