Merge "Mark more Bundles as being defusable." into nyc-dev (c83db152) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/ConnectionServiceWrapper.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -492,6 +492,7 @@ public class ConnectionServiceWrapper extends ServiceBinder {
		long token = Binder.clearCallingIdentity();
		try {
		synchronized (mLock) {
		Bundle.setDefusable(extras, true);
		logIncoming("setExtras %s %s", callId, extras);
		Call call = mCallIdMapper.getCall(callId);
		if (call != null) {
		@@ -594,6 +595,7 @@ public class ConnectionServiceWrapper extends ServiceBinder {
		long token = Binder.clearCallingIdentity();
		try {
		synchronized (mLock) {
		Bundle.setDefusable(extras, true);
		Call call = mCallIdMapper.getCall(callId);
		if (call != null) {
		call.onConnectionEvent(event, extras);

+9 −2

Original line number	Diff line number	Diff line
		@@ -977,6 +977,7 @@ public class TelecomServiceImpl {
		phoneAccountHandle);
		intent.putExtra(CallIntentProcessor.KEY_IS_INCOMING_CALL, true);
		if (extras != null) {
		extras.setDefusable(true);
		intent.putExtra(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS, extras);
		}
		mCallIntentProcessorAdapter.processIncomingCallIntent(
		@@ -1016,7 +1017,10 @@ public class TelecomServiceImpl {

		try {
		Intent intent = new Intent(TelecomManager.ACTION_NEW_UNKNOWN_CALL);
		if (extras != null) {
		extras.setDefusable(true);
		intent.putExtras(extras);
		}
		intent.putExtra(CallIntentProcessor.KEY_IS_UNKNOWN_CALL, true);
		intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE,
		phoneAccountHandle);
		@@ -1066,7 +1070,10 @@ public class TelecomServiceImpl {
		long token = Binder.clearCallingIdentity();
		try {
		final Intent intent = new Intent(Intent.ACTION_CALL, handle);
		if (extras != null) {
		extras.setDefusable(true);
		intent.putExtras(extras);
		}
		mUserCallIntentProcessorFactory.create(mContext, userHandle)
		.processIntent(
		intent, callingPackage, hasCallAppOp && hasCallPermission);