commit cfad0bea7eb112fc33204a4d36ec69adf52151bc
author Tyler Gunn <tgunn@google.com> Fri Feb 09 22:19:49 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 09 22:19:49 2018 +0000
tree 990a81052d46b57f2274f72c54e7f7e0b1dc2f32
parent a454df9c06829b66da017e7a933ae5147dca021f
parent 654b7fc322aaad6b5b9a5537a64019abeb1a944e

Merge "Pass calling package for invocations of endCall API." am: 44289caa11 am: e05da7e86b
am: 654b7fc322

Change-Id: Id7c74fa539b7e7e26dfdc8b612d9299d8c20c19b

telecomm/java/android/telecom/TelecomManager.java

diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 1fe5db5..a180da6 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1320,7 +1320,7 @@
     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

diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
index 3460754..b4e7d56 100644
--- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
+++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
@@ -187,7 +187,7 @@
     /**
      * @see TelecomServiceImpl#endCall
      */
-    boolean endCall();
+    boolean endCall(String callingPackage);
 
     /**
      * @see TelecomServiceImpl#acceptRingingCall