summaryrefslogtreecommitdiffstats
path: root/telecomm/java/com
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-05-13 14:14:54 -0700
committerYorke Lee <yorkelee@google.com>2015-05-13 14:58:15 -0700
commit4af5935c71f1e31ef1aec27661c4ef60545a0924 (patch)
treed04fc16471211040e00b7ce66665c461ab0a0dfa /telecomm/java/com
parent4201be08a1cb1358e7ee30f81927b7c11f477ea3 (diff)
downloadframeworks_base-4af5935c71f1e31ef1aec27661c4ef60545a0924.zip
frameworks_base-4af5935c71f1e31ef1aec27661c4ef60545a0924.tar.gz
frameworks_base-4af5935c71f1e31ef1aec27661c4ef60545a0924.tar.bz2
Rename AudioState to CallAudioState
Deprecate AudioState class and make methods @SystemApi where necessary to minimize impact to SystemApi Replace usages of AudioState inside Telecom sub-systems Fire both onCallAudioStateChanged and onAudioStateChanged callbacks for backward compatibility Support both setAudioState and setCallAudioState for all classes Bug: 21040387 Bug: 21088300 Change-Id: I3ec7b3afdaa344c6d639d1c421f1842d67f7d0f7
Diffstat (limited to 'telecomm/java/com')
-rw-r--r--telecomm/java/com/android/internal/telecom/IConnectionService.aidl4
-rw-r--r--telecomm/java/com/android/internal/telecom/IInCallService.aidl4
2 files changed, 4 insertions, 4 deletions
diff --git a/telecomm/java/com/android/internal/telecom/IConnectionService.aidl b/telecomm/java/com/android/internal/telecom/IConnectionService.aidl
index 339a982..c2e8530 100644
--- a/telecomm/java/com/android/internal/telecom/IConnectionService.aidl
+++ b/telecomm/java/com/android/internal/telecom/IConnectionService.aidl
@@ -17,7 +17,7 @@
package com.android.internal.telecom;
import android.os.Bundle;
-import android.telecom.AudioState;
+import android.telecom.CallAudioState;
import android.telecom.ConnectionRequest;
import android.telecom.PhoneAccountHandle;
@@ -56,7 +56,7 @@ oneway interface IConnectionService {
void unhold(String callId);
- void onAudioStateChanged(String activeCallId, in AudioState audioState);
+ void onCallAudioStateChanged(String activeCallId, in CallAudioState callAudioState);
void playDtmfTone(String callId, char digit);
diff --git a/telecomm/java/com/android/internal/telecom/IInCallService.aidl b/telecomm/java/com/android/internal/telecom/IInCallService.aidl
index d26f6cb..ded47d5 100644
--- a/telecomm/java/com/android/internal/telecom/IInCallService.aidl
+++ b/telecomm/java/com/android/internal/telecom/IInCallService.aidl
@@ -17,7 +17,7 @@
package com.android.internal.telecom;
import android.app.PendingIntent;
-import android.telecom.AudioState;
+import android.telecom.CallAudioState;
import android.telecom.ParcelableCall;
import com.android.internal.telecom.IInCallAdapter;
@@ -40,7 +40,7 @@ oneway interface IInCallService {
void setPostDialWait(String callId, String remaining);
- void onAudioStateChanged(in AudioState audioState);
+ void onCallAudioStateChanged(in CallAudioState callAudioState);
void bringToForeground(boolean showDialpad);