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

Commit 62630f72 authored by Hall Liu's avatar Hall Liu
Browse files

Add null check for call handle 

Call.getHandle() can return null for some self-managed connection
services. CallLogManager sometimes would throw a NPE that gets swallowed
by the binder.

Add null checks throughout Telecom for the call handle. Also add logging
in CSW to actually display exceptions that happen during binder
transactions.

Also replace some unholy tabs with rightous spaces in CSW.

Change-Id: I816f86441a969a410095bb12bae307323c517fed
Fixes: 78811915
Test: manual
parent 6b772309

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

+5 −0
Original line number Diff line number Diff line
@@ -1172,6 +1172,11 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
            return false;

        }



        if (getHandle() == null) {

            // No point in logging a null-handle call. Some self-managed calls will have this.

            return false;

        }



        if (!PhoneAccount.SCHEME_SIP.equals(getHandle().getScheme()) &&

                !PhoneAccount.SCHEME_TEL.equals(getHandle().getScheme())) {

            // Can't log schemes other than SIP or TEL for now.

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

+8 −4
Original line number Diff line number Diff line
@@ -993,7 +993,9 @@ public class CallsManager extends Call.ListenerBase 
                final String handleScheme = handle.getSchemeSpecificPart();

                Call fromCall = mCalls.stream()

                        .filter((c) -> mPhoneNumberUtilsAdapter.isSamePhoneNumber(

                                c.getHandle().getSchemeSpecificPart(), handleScheme))

                                (c.getHandle() == null

                                        ? null : c.getHandle().getSchemeSpecificPart()),

                                handleScheme))

                        .findFirst()

                        .orElse(null);

                if (fromCall != null) {
@@ -1415,6 +1417,8 @@ public class CallsManager extends Call.ListenerBase 
                com.android.internal.R.bool.config_requireCallCapableAccountForHandle);

        final boolean isOutgoingCallPermitted = isOutgoingCallPermitted(call,

                call.getTargetPhoneAccount());

        final String callHandleScheme =

                call.getHandle() == null ? null : call.getHandle().getScheme();

        if (call.getTargetPhoneAccount() != null || call.isEmergencyCall()) {

            // If the account has been set, proceed to place the outgoing call.

            // Otherwise the connection will be initiated when the account is set by the user.
@@ -1429,7 +1433,7 @@ public class CallsManager extends Call.ListenerBase 
                call.startCreateConnection(mPhoneAccountRegistrar);

            }

        } else if (mPhoneAccountRegistrar.getCallCapablePhoneAccounts(

                requireCallCapableAccountByHandle ? call.getHandle().getScheme() : null, false,

                requireCallCapableAccountByHandle ? callHandleScheme : null, false,

                call.getInitiatingUser()).isEmpty()) {

            // If there are no call capable accounts, disconnect the call.

            markCallAsDisconnected(call, new DisconnectCause(DisconnectCause.CANCELED,
@@ -3710,11 +3714,11 @@ public class CallsManager extends Call.ListenerBase 
    }



    public void acceptHandover(Uri srcAddr, int videoState, PhoneAccountHandle destAcct) {



        final String handleScheme = srcAddr.getSchemeSpecificPart();

        Call fromCall = mCalls.stream()

                .filter((c) -> mPhoneNumberUtilsAdapter.isSamePhoneNumber(

                        c.getHandle().getSchemeSpecificPart(), handleScheme))

                        (c.getHandle() == null ? null : c.getHandle().getSchemeSpecificPart()),

                        handleScheme))

                .findFirst()

                .orElse(null);

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

+102 −3
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        }

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -109,6 +112,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        // Log.w(this, "setActive, unknown call id: %s", msg.obj);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -129,6 +135,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        // Log.w(this, "setRinging, unknown call id: %s", msg.obj);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -148,6 +157,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.setVideoProvider(videoProvider);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -168,6 +180,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        // Log.w(this, "setDialing, unknown call id: %s", msg.obj);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -186,6 +201,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        mCallsManager.markCallAsPulling(call);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -208,6 +226,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        // Log.w(this, "setDisconnected, unknown call id: %s", args.arg1);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -228,6 +249,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        // Log.w(this, "setOnHold, unknown call id: %s", msg.obj);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -249,6 +273,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        // Log.w(this, "setRingback, unknown call id: %s", args.arg1);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -272,6 +299,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        }

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -294,6 +324,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        // "setConnectionCapabilities, unknown call id: %s", msg.obj);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -313,6 +346,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.setConnectionProperties(connectionProperties);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -340,6 +376,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        // Log.w(this, "setIsConferenced, unknown call id: %s", args.arg1);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -363,6 +402,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        Log.w(this, "setConferenceMergeFailed, unknown call id: %s", callId);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -451,6 +493,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        }

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -472,6 +517,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        // Log.w(this, "onPostDialWait, unknown call id: %s", args.arg1);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -493,6 +541,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        // Log.w(this, "onPostDialChar, unknown call id: %s", args.arg1);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -511,6 +562,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                    ConnectionServiceWrapper.this

                            .queryRemoteConnectionServices(callingUserHandle, callback);

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -529,6 +583,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.setVideoState(videoState);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -547,6 +604,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.setIsVoipAudioMode(isVoip);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -564,6 +624,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                            CallAudioState.audioRouteToString(audioRoute));

                    mCallsManager.setAudioRoute(audioRoute, bluetoothAddress);

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -583,6 +646,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.setStatusHints(statusHints);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -601,6 +667,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.putExtras(Call.SOURCE_CONNECTION_SERVICE, extras);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -619,6 +688,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.removeExtras(Call.SOURCE_CONNECTION_SERVICE, keys);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -638,6 +710,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.setHandle(address, presentation);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -658,6 +733,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.setCallerDisplayName(callerDisplayName, presentation);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -687,6 +765,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.setConferenceableCalls(conferenceableCalls);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -760,6 +841,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                                "addExistingConnection.");

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -779,6 +863,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.onConnectionEvent(event, extras);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -803,6 +890,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.onRttConnectionFailure(reason);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -827,6 +917,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.onRemoteRttRequest();

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -850,6 +943,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        call.setTargetPhoneAccount(pHandle);

                    }

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();
@@ -866,6 +962,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                    mConnSvrFocusListener.onConnectionServiceReleased(

                            ConnectionServiceWrapper.this);

                }

            } catch (Throwable t) {

                Log.e(ConnectionServiceWrapper.this, t, "");

                throw t;

            } finally {

                Binder.restoreCallingIdentity(token);

                Log.endSession();

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

+2 −1
Original line number Diff line number Diff line
@@ -374,7 +374,8 @@ public class CreateConnectionProcessor implements CreateConnectionResponse { 
                        PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS)) {

                    CallAttemptRecord callAttemptRecord = new CallAttemptRecord(callManagerHandle,

                            mPhoneAccountRegistrar.getOutgoingPhoneAccountForSchemeOfCurrentUser(

                                    mCall.getHandle().getScheme()));

                                    mCall.getHandle() == null

                                            ? null : mCall.getHandle().getScheme()));

                    if (!mAttemptRecords.contains(callAttemptRecord)) {

                        Log.i(this, "Will try Connection Manager account %s for emergency",

                                callManager);