diff options
| author | Xin Li <delphij@google.com> | 2023-10-06 05:34:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-10-06 05:34:30 +0000 |
| commit | bef47153681f46df3f5712de0fd1db4885b3b021 (patch) | |
| tree | e9924b64a83621683f9ae9bef6a67193a16edc15 | |
| parent | b61b148c40d67491b5a199c60f8543b61be2e9a2 (diff) | |
| parent | 3a3d1aca75435247f485c317c4807f73e57059b6 (diff) | |
| download | voip-bef47153681f46df3f5712de0fd1db4885b3b021.tar.gz | |
Merge "Merge Android 14" into main
| -rw-r--r-- | src/java/android/net/sip/SipAudioCall.java | 4 | ||||
| -rw-r--r-- | src/java/com/android/server/sip/SipWakeupTimer.java | 2 | ||||
| -rw-r--r-- | src/jni/rtp/AudioGroup.cpp | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/java/android/net/sip/SipAudioCall.java b/src/java/android/net/sip/SipAudioCall.java index 4d70017..9894056 100644 --- a/src/java/android/net/sip/SipAudioCall.java +++ b/src/java/android/net/sip/SipAudioCall.java @@ -61,14 +61,14 @@ import java.net.UnknownHostException; */ public class SipAudioCall { private static final String LOG_TAG = SipAudioCall.class.getSimpleName(); - private static final boolean DBG = true; + private static final boolean DBG = false; private static final boolean RELEASE_SOCKET = true; private static final boolean DONT_RELEASE_SOCKET = false; private static final int SESSION_TIMEOUT = 5; // in seconds private static final int TRANSFER_TIMEOUT = 15; // in seconds /** Listener for events relating to a SIP call, such as when a call is being - * recieved ("on ringing") or a call is outgoing ("on calling"). + * received ("on ringing") or a call is outgoing ("on calling"). * <p>Many of these events are also received by {@link SipSession.Listener}.</p> */ public static class Listener { diff --git a/src/java/com/android/server/sip/SipWakeupTimer.java b/src/java/com/android/server/sip/SipWakeupTimer.java index 8122070..7ec8689 100644 --- a/src/java/com/android/server/sip/SipWakeupTimer.java +++ b/src/java/com/android/server/sip/SipWakeupTimer.java @@ -55,7 +55,7 @@ class SipWakeupTimer extends BroadcastReceiver { context.getSystemService(Context.ALARM_SERVICE); IntentFilter filter = new IntentFilter(getAction()); - context.registerReceiver(this, filter); + context.registerReceiver(this, filter, Context.RECEIVER_EXPORTED_UNAUDITED); mExecutor = executor; } diff --git a/src/jni/rtp/AudioGroup.cpp b/src/jni/rtp/AudioGroup.cpp index eb3b18f..08e8933 100644 --- a/src/jni/rtp/AudioGroup.cpp +++ b/src/jni/rtp/AudioGroup.cpp @@ -855,10 +855,9 @@ bool AudioGroup::DeviceThread::threadLoop() if (mGroup->platformHasAec()) { aec = new AudioEffect(mGroup->mAttributionSource); aec->set(FX_IID_AEC, - NULL, - 0, - 0, - 0, + nullptr, // uid + 0, // priority + nullptr, // callback record->getSessionId(), AUDIO_IO_HANDLE_NONE); // record sessionId is sufficient. status_t status = aec->initCheck(); |