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

Commit 09c0dfed authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up ecc_keyguard flag" into main

parents 10b8cca0 1c7fe59e

flags/telecom_incallservice_flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -9,14 +9,6 @@ flag { 
  bug: "282113261"

}



# OWNER=pmadapurmath TARGET=24Q2

flag {

  name: "ecc_keyguard"

  namespace: "telecom"

  description: "Ensure that users are able to return to call from keyguard UI for ECC"

  bug: "306582821"

}



# OWNER=tjstuart TARGET=24Q4

flag {

  name: "do_not_send_call_to_null_ics"

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

+2 −2
Original line number Diff line number Diff line
@@ -1929,8 +1929,8 @@ public class InCallController extends CallsManagerListenerBase implements 
        // the admin user. This needs to account for emergency calls placed from secondary/guest

        // users as well as the work profile. Once the screen is locked, the user should be able to

        // return to the call (from the keyguard UI).

        if (mFeatureFlags.eccKeyguard() && mCallsManager.isInEmergencyCall()

                && isLockscreenRestricted && !serviceMap.containsKey(callingUser)) {

        if (mCallsManager.isInEmergencyCall() && isLockscreenRestricted

                && !serviceMap.containsKey(callingUser)) {

            // If screen is locked and the current user is the system, query calls for the work

            // profile user, if available. Otherwise, the user is in the secondary/guest profile,

            // so we can default to the system user.