summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tyler Gunn <tgunn@google.com> 2018-02-09 21:57:39 +0000
committer android-build-merger <android-build-merger@google.com> 2018-02-09 21:57:39 +0000
commit654b7fc322aaad6b5b9a5537a64019abeb1a944e (patch)
tree4bf7195875beae30c286d1e7f9658e198970fcb3
parent351b45873db4a8206496c48dfb37b749025d5947 (diff)
parente05da7e86b0430d16733ec9c1d90f0aa95c4d6e5 (diff)
Merge "Pass calling package for invocations of endCall API." am: 44289caa11
am: e05da7e86b Change-Id: If051e7875ba1863bc67dd029fa9b5cc0c858d103
-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 7e897453ab59..c848f77c2c0e 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1301,7 +1301,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