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

Commit 7fceb201 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Fix bugs with Remote Connection Services." into qt-dev

parents 9070e5ab 156a33b9

telecomm/java/android/telecom/ConnectionServiceAdapter.java

+9 −0
Original line number Diff line number Diff line
@@ -325,6 +325,15 @@ final class ConnectionServiceAdapter implements DeathRecipient { 
            } catch (RemoteException e) {

                Log.e(this, e, "Exception trying to query for remote CSs");

            }

        } else {

            try {

                // This is not an error condition, so just pass back an empty list.

                // This happens when querying from a remote connection service, not the connection

                // manager itself.

                callback.onResult(Collections.EMPTY_LIST, Collections.EMPTY_LIST);

            } catch (RemoteException e) {

                Log.e(this, e, "Exception trying to query for remote CSs");

            }

        }

    }

telecomm/java/android/telecom/ConnectionServiceAdapterServant.java

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ final class ConnectionServiceAdapterServant { 
            SomeArgs args = SomeArgs.obtain();

            args.arg1 = callback;

            args.arg2 = callingPackage;

            mHandler.obtainMessage(MSG_QUERY_REMOTE_CALL_SERVICES, callback).sendToTarget();

            mHandler.obtainMessage(MSG_QUERY_REMOTE_CALL_SERVICES, args).sendToTarget();

        }



        @Override