Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0ec2e00 authored Mar 21, 2016 by Jeff Sharkey

Mark even more Bundles as defusable.

Bug: 27766193
Change-Id: Ib027ac7b40c7a575a76f289faabde9655338865e

parent 8c536f91

media/java/android/media/MediaMetadata.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -365,7 +365,7 @@ public final class MediaMetadata implements Parcelable {
		}

		private MediaMetadata(Parcel in) {
		mBundle = in.readBundle();
		mBundle = Bundle.setDefusable(in.readBundle(), true);
		}

		/**

services/core/java/com/android/server/am/ActiveServices.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -811,10 +811,8 @@ public final class ActiveServices {
		// Hacky kind of thing -- allow system stuff to tell us
		// what they are, so we can report this elsewhere for
		// others to know why certain services are running.
		try {
		service.setDefusable(true);
		clientIntent = service.getParcelableExtra(Intent.EXTRA_CLIENT_INTENT);
		} catch (RuntimeException e) {
		}
		if (clientIntent != null) {
		clientLabel = service.getIntExtra(Intent.EXTRA_CLIENT_LABEL, 0);
		if (clientLabel != 0) {

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -6923,6 +6923,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		intents[i].setDefusable(true);
		}
		}
		Bundle.setDefusable(bOptions, true);

		final boolean noCreate = (flags&PendingIntent.FLAG_NO_CREATE) != 0;
		final boolean cancelCurrent = (flags&PendingIntent.FLAG_CANCEL_CURRENT) != 0;

services/core/java/com/android/server/am/PendingIntentRecord.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -208,6 +208,9 @@ final class PendingIntentRecord extends IIntentSender.Stub {
		String requiredPermission, IBinder resultTo, String resultWho, int requestCode,
		int flagsMask, int flagsValues, Bundle options, IActivityContainer container)
		throws TransactionTooLargeException {
		if (intent != null) intent.setDefusable(true);
		if (options != null) options.setDefusable(true);

		synchronized (owner) {
		final ActivityContainer activityContainer = (ActivityContainer)container;
		if (activityContainer != null && activityContainer.mParentActivity != null &&

telecomm/java/android/telecom/ParcelableConnection.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -188,7 +188,7 @@ public final class ParcelableConnection implements Parcelable {
		DisconnectCause disconnectCause = source.readParcelable(classLoader);
		List<String> conferenceableConnectionIds = new ArrayList<>();
		source.readStringList(conferenceableConnectionIds);
		Bundle extras = source.readBundle(classLoader);
		Bundle extras = Bundle.setDefusable(source.readBundle(classLoader), true);

		return new ParcelableConnection(
		phoneAccount,