Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d48bc4f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b-186518774" into sc-v2-dev-plus-aosp 

* changes:
  [automerge] DO NOT MERGE Re-restrict phone ops on user addition 2p: 7fac473e
  DO NOT MERGE Re-restrict phone ops on user addition
parents bb0d53e7 c53b4132

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

+10 −0
Original line number Diff line number Diff line
@@ -947,6 +947,15 @@ public class InCallController extends CallsManagerListenerBase implements 
        }

    };



    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 @@ public class InCallController extends CallsManagerListenerBase implements 
        mSystemStateHelper.addListener(mSystemStateListener);

        mClockProxy = clockProxy;

        restrictPhoneCallOps();

        mContext.registerReceiver(mUserAddedReceiver, new IntentFilter(Intent.ACTION_USER_ADDED));

    }



    private void restrictPhoneCallOps() {