commit c53b413236db784a6f87ba50e49b571fb661edfb
author Alex Stetson <alexstetson@google.com> Fri Mar 04 01:37:31 2022 +0000
committer Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Fri Mar 04 01:37:31 2022 +0000
tree a83e34a97ee3c8618f7999b519bf33756bd8e155
parent e5365e7e6d5ae2cd5cd291a9ee3fb68ac425c287
parent 7fac473e334a9c5b2f6be07f3e4c85000de95655

[automerge] DO NOT MERGE Re-restrict phone ops on user addition 2p: 7fac473e33

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/16982321

Bug: 186518774
Change-Id: I19fe82f12f3fc2bfb2ee4be8bd7d3105ba3a3cba

src/com/android/server/telecom/InCallController.java

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index d315127..2cc1398 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -947,6 +947,15 @@
         }
     };
 
+    private final BroadcastReceiver mUserAddedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (Intent.ACTION_USER_ADDED.equals(intent.getAction())) {
+                restrictPhoneCallOps();
+            }
+        }
+    };
+
     private final SystemStateListener mSystemStateListener = new SystemStateListener() {
         @Override
         public void onCarModeChanged(int priority, String packageName, boolean isCarMode) {
@@ -1055,6 +1064,7 @@
         mSystemStateHelper.addListener(mSystemStateListener);
         mClockProxy = clockProxy;
         restrictPhoneCallOps();
+        mContext.registerReceiver(mUserAddedReceiver, new IntentFilter(Intent.ACTION_USER_ADDED));
     }
 
     private void restrictPhoneCallOps() {