summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tyler Gunn <tgunn@google.com> 2018-02-09 22:19:49 +0000
committer android-build-merger <android-build-merger@google.com> 2018-02-09 22:19:49 +0000
commitcfad0bea7eb112fc33204a4d36ec69adf52151bc (patch)
tree990a81052d46b57f2274f72c54e7f7e0b1dc2f32
parenta454df9c06829b66da017e7a933ae5147dca021f (diff)
parent654b7fc322aaad6b5b9a5537a64019abeb1a944e (diff)
Merge "Pass calling package for invocations of endCall API." am: 44289caa11 am: e05da7e86b
am: 654b7fc322 Change-Id: Id7c74fa539b7e7e26dfdc8b612d9299d8c20c19b
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java2
-rw-r--r--telecomm/java/com/android/internal/telecom/ITelecomService.aidl2
2 files changed, 2 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 1fe5db5d2cc7..a180da6d6480 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -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);
diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
index 3460754ff9eb..b4e7d56bc642 100644
--- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
+++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
@@ -187,7 +187,7 @@ interface ITelecomService {
/**
* @see TelecomServiceImpl#endCall
*/
- boolean endCall();
+ boolean endCall(String callingPackage);
/**
* @see TelecomServiceImpl#acceptRingingCall