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

Commit 07800e5c authored by Binyi Wu's avatar Binyi Wu Committed by Automerger Merge Worker
Browse files

Merge "Clean up the Clear calling development feature flag" into tm-qpr-dev am: 9f4d777d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19938087



Change-Id: I2201bb0898578b3735f11666ba092f4fd6ae52cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd96d9c3 9f4d777d

core/java/android/util/FeatureFlagUtils.java

+0 −6
Original line number Diff line number Diff line
@@ -83,11 +83,6 @@ public class FeatureFlagUtils { 
    public static final String SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE =

            "settings_hide_second_layer_page_navigate_up_button_in_two_pane";



    /** Support Clear Calling feature.

     *  @hide

     */

    public static final String SETTINGS_ENABLE_CLEAR_CALLING = "settings_enable_clear_calling";



    private static final Map<String, String> DEFAULT_FLAGS;



    static {
@@ -115,7 +110,6 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS, "true");

        DEFAULT_FLAGS.put(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME, "true");

        DEFAULT_FLAGS.put(SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE, "true");

        DEFAULT_FLAGS.put(SETTINGS_ENABLE_CLEAR_CALLING, "false");

    }



    private static final Set<String> PERSISTENT_FLAGS;