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

Commit db4dc276 authored by Yo Chiang's avatar Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Remove feature flag "settings_dynamic_system"" am: 7b84f49b am: 3048afdb 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If301821ebc25b51135f26be7fc768b40bc71581e
parents 257155ac 3048afdb

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -1726,7 +1726,6 @@ package android.util { 
    method public static java.util.Map<java.lang.String,java.lang.String> getAllFeatureFlags();

    method public static boolean isEnabled(android.content.Context, String);

    method public static void setEnabled(android.content.Context, String, boolean);

    field public static final String DYNAMIC_SYSTEM = "settings_dynamic_system";

    field public static final String FFLAG_OVERRIDE_PREFIX = "sys.fflag.override.";

    field public static final String FFLAG_PREFIX = "sys.fflag.";

    field public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";

core/java/android/util/FeatureFlagUtils.java

+0 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ public class FeatureFlagUtils { 
    public static final String SEAMLESS_TRANSFER = "settings_seamless_transfer";

    public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";

    public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press";

    public static final String DYNAMIC_SYSTEM = "settings_dynamic_system";

    public static final String SETTINGS_WIFITRACKER2 = "settings_wifitracker2";

    public static final String SETTINGS_FUSE_FLAG = "settings_fuse";

    /** @hide */
@@ -53,7 +52,6 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put("settings_audio_switcher", "true");

        DEFAULT_FLAGS.put("settings_systemui_theme", "true");

        DEFAULT_FLAGS.put(SETTINGS_FUSE_FLAG, "true");

        DEFAULT_FLAGS.put(DYNAMIC_SYSTEM, "false");

        DEFAULT_FLAGS.put(SEAMLESS_TRANSFER, "false");

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");

        DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false");

packages/DynamicSystemInstallationService/src/com/android/dynsystem/BootCompletedReceiver.java

+1 −8
Original line number Diff line number Diff line
@@ -19,11 +19,9 @@ package com.android.dynsystem; 
import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.image.DynamicSystemClient;

import android.os.image.DynamicSystemManager;

import android.util.FeatureFlagUtils;





/**
@@ -48,7 +46,7 @@ public class BootCompletedReceiver extends BroadcastReceiver { 


        boolean isInUse = (dynSystem != null) && dynSystem.isInUse();



        if (!isInUse && !featureFlagEnabled()) {

        if (!isInUse) {

            return;

        }
@@ -58,9 +56,4 @@ public class BootCompletedReceiver extends BroadcastReceiver { 
        startServiceIntent.setAction(DynamicSystemClient.ACTION_NOTIFY_IF_IN_USE);

        context.startServiceAsUser(startServiceIntent, UserHandle.SYSTEM);

    }



    private boolean featureFlagEnabled() {

        return SystemProperties.getBoolean(

                FeatureFlagUtils.PERSIST_PREFIX + FeatureFlagUtils.DYNAMIC_SYSTEM, false);

    }

}

packages/DynamicSystemInstallationService/src/com/android/dynsystem/VerificationActivity.java

+0 −13
Original line number Diff line number Diff line
@@ -22,10 +22,8 @@ import android.content.Context; 
import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.image.DynamicSystemClient;

import android.util.FeatureFlagUtils;

import android.util.Log;



/**
@@ -46,12 +44,6 @@ public class VerificationActivity extends Activity { 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (!featureFlagEnabled()) {

            Log.w(TAG, FeatureFlagUtils.DYNAMIC_SYSTEM + " not enabled; activity aborted.");

            finish();

            return;

        }



        KeyguardManager km = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);



        if (km != null) {
@@ -101,11 +93,6 @@ public class VerificationActivity extends Activity { 
        startServiceAsUser(intent, UserHandle.SYSTEM);

    }



    private boolean featureFlagEnabled() {

        return SystemProperties.getBoolean(

                FeatureFlagUtils.PERSIST_PREFIX + FeatureFlagUtils.DYNAMIC_SYSTEM, false);

    }



    static boolean isVerified(String url) {

        if (url == null) return true;

        return sVerifiedUrl != null && sVerifiedUrl.equals(url);