commit 6ff873c80e8235b33692e5792b066de3895b84d2
author android-build-team Robot <android-build-team-robot@google.com> Fri May 14 21:58:00 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 14 21:58:00 2021 +0000
tree 95e808b9683dcb889208e11506948482685941a4
parent f4631696248a51c8895060771176e0c1e4b036f2
parent f08b2f1a3c0ad631d99480a98969ee198f8caf88

Merge cherrypicks of [14551043, 14550658, 14550659, 14550660, 14550661, 14552046, 14554284, 14554486, 14552047, 14554032, 14554033, 14554034, 14554035, 14554036, 14554037, 14554038, 14554039, 14550926, 14554040, 14554341, 14554662, 14554041] into security-aosp-rvc-release

Change-Id: I331c3c81aaa98291460b4eccef3ff4b1ea4a72a3

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

diff --git a/src/java/com/android/server/sip/SipService.java b/src/java/com/android/server/sip/SipService.java
index ca91943..c68508b 100644
--- a/src/java/com/android/server/sip/SipService.java
+++ b/src/java/com/android/server/sip/SipService.java
@@ -344,7 +344,7 @@
         if (DBG) log("notify: profile added: " + localProfile);
         Intent intent = new Intent(SipManager.ACTION_SIP_ADD_PHONE);
         intent.putExtra(SipManager.EXTRA_LOCAL_URI, localProfile.getUriString());
-        mContext.sendBroadcast(intent);
+        mContext.sendBroadcast(intent, android.Manifest.permission.USE_SIP);
         if (mSipGroups.size() == 1) {
             registerReceivers();
         }
@@ -354,7 +354,7 @@
         if (DBG) log("notify: profile removed: " + localProfile);
         Intent intent = new Intent(SipManager.ACTION_SIP_REMOVE_PROFILE);
         intent.putExtra(SipManager.EXTRA_LOCAL_URI, localProfile.getUriString());
-        mContext.sendBroadcast(intent);
+        mContext.sendBroadcast(intent, android.Manifest.permission.USE_SIP);
         if (mSipGroups.size() == 0) {
             unregisterReceivers();
         }