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

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

Merge "Pass calling package for invocations of endCall API." am: 44289caa am: e05da7e8 

am: 654b7fc3

Change-Id: Id7c74fa539b7e7e26dfdc8b612d9299d8c20c19b
parents a454df9c 654b7fc3

telecomm/java/android/telecom/TelecomManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1320,7 +1320,7 @@ public class TelecomManager { 
    public boolean endCall() {

        try {

            if (isServiceConnected()) {

                return getTelecomService().endCall();

                return getTelecomService().endCall(mContext.getPackageName());

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelecomService#endCall", e);

telecomm/java/com/android/internal/telecom/ITelecomService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ interface ITelecomService { 
    /**

     * @see TelecomServiceImpl#endCall

     */

    boolean endCall();

    boolean endCall(String callingPackage);



    /**

     * @see TelecomServiceImpl#acceptRingingCall