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

Commit e2e4cdff authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Mark more Bundles as being defusable. 

They're destined for the system, so they're okay to look inside.

Bug: 27726127
Change-Id: I1376f7ac89dcc8ac0e9361ceb572c1a1d7ee7949
parent 99053b6a

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);

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

+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);