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

Commit feca69dc authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Fix bugs with Remote Connection Services." into qt-dev am: 7fceb201 

am: 0c925a4b

Change-Id: Iaf23e334e60e6b3d35e7e5962cba6e113d860cc0
parents 52a9dabf 0c925a4b

telecomm/java/android/telecom/ConnectionServiceAdapter.java

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

            } catch (RemoteException e) {

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

                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 Original line Diff line number Diff line
@@ -477,7 +477,7 @@ final class ConnectionServiceAdapterServant { 
            SomeArgs args = SomeArgs.obtain();

            SomeArgs args = SomeArgs.obtain();

            args.arg1 = callback;

            args.arg1 = callback;

            args.arg2 = callingPackage;

            args.arg2 = callingPackage;

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

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

        }

        }





        @Override

        @Override