commit 82e90b4e78e26327db287b9827a1e2abb781c43f
author Xin Li <delphij@google.com> Mon Aug 14 15:40:44 2023 -0700
committer Xin Li <delphij@google.com> Mon Aug 14 15:40:44 2023 -0700
tree e9924b64a83621683f9ae9bef6a67193a16edc15
parent b61b148c40d67491b5a199c60f8543b61be2e9a2
parent 572bfdb0380e304d023aedc42e3bb5fe4729c05f

Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I02c9eb59eabf16a5b862ae78670d31db6e1fc15f
Change-Id: I99658fca1f094ca57dc843a5fccd7e28e39eaa06

src/java/android/net/sip/SipAudioCall.java

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 @@
  */
 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 {

src/java/com/android/server/sip/SipWakeupTimer.java

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 @@
                 context.getSystemService(Context.ALARM_SERVICE);
 
         IntentFilter filter = new IntentFilter(getAction());
-        context.registerReceiver(this, filter);
+        context.registerReceiver(this, filter, Context.RECEIVER_EXPORTED_UNAUDITED);
         mExecutor = executor;
     }
 

src/jni/rtp/AudioGroup.cpp

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 @@
         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();