diff options
| author | Evan Charlton <evanc@google.com> | 2014-09-03 20:07:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-03 20:07:47 +0000 |
| commit | 4d12a0377128f18b2b971f4cf2d14de4e01a129e (patch) | |
| tree | 2cc096305cd44438bc330bacbd02b748584b7916 /telecomm/java/com/android/internal | |
| parent | e7a21386353d3d89d17af9a505480438a64c319a (diff) | |
| parent | 23dc241d5e4641ee2acd4b5f7865c66d9f58c9f1 (diff) | |
| download | frameworks_base-4d12a0377128f18b2b971f4cf2d14de4e01a129e.zip frameworks_base-4d12a0377128f18b2b971f4cf2d14de4e01a129e.tar.gz frameworks_base-4d12a0377128f18b2b971f4cf2d14de4e01a129e.tar.bz2 | |
Merge "Remove startActivityFromInCall API" into lmp-dev
Diffstat (limited to 'telecomm/java/com/android/internal')
| -rw-r--r-- | telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl | 2 | ||||
| -rw-r--r-- | telecomm/java/com/android/internal/telecomm/IInCallService.aidl | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl index ef1769f..610178e 100644 --- a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl +++ b/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl @@ -76,6 +76,4 @@ oneway interface IConnectionServiceAdapter { void setCallerDisplayName(String callId, String callerDisplayName, int presentation); void setConferenceableConnections(String callId, in List<String> conferenceableCallIds); - - void startActivityFromInCall(String callId, in PendingIntent intent); } diff --git a/telecomm/java/com/android/internal/telecomm/IInCallService.aidl b/telecomm/java/com/android/internal/telecomm/IInCallService.aidl index 5d4992f..23dbaf4 100644 --- a/telecomm/java/com/android/internal/telecomm/IInCallService.aidl +++ b/telecomm/java/com/android/internal/telecomm/IInCallService.aidl @@ -43,6 +43,4 @@ oneway interface IInCallService { void onAudioStateChanged(in AudioState audioState); void bringToForeground(boolean showDialpad); - - void startActivity(String callId, in PendingIntent intent); } |