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

Commit 089ade84 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "SystemServer: reformat flag dumpsys" into main am: ff711f23 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3237257



Change-Id: I3bc608b5f78dfebf8d826b8f6d6bdc1c3aef88f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f6011dd ff711f23

service/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ java_defaults { 
            "-Xep:EmptyCatch:ERROR",

            "-Xep:EqualsIncompatibleType:ERROR",

            "-Xep:FutureReturnValueIgnored:ERROR",

            "-Xep:InlineFormatString:ERROR",

            "-Xep:InlineMeInliner:ERROR",

            "-Xep:InvalidBlockTag:ERROR",

            "-Xep:InvalidInlineTag:ERROR",

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+96 −22
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import android.os.SystemClock; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.DeviceConfig;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.sysprop.BluetoothProperties;
@@ -116,6 +117,7 @@ import java.util.concurrent.FutureTask; 
import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeoutException;

import java.util.concurrent.locks.ReentrantReadWriteLock;

import java.util.stream.Collectors;



class BluetoothManagerService {

    private static final String TAG = BluetoothManagerService.class.getSimpleName();
@@ -2335,6 +2337,13 @@ class BluetoothManagerService { 
        }

        String errorMsg = null;



        String flagString = "";

        try {

            flagString = dumpBluetoothFlags(writer);

        } catch (Exception e) {

            writer.println("Exception while dumping Bluetooth Flags");

        }



        writer.println("Bluetooth Status");

        writer.println("  enabled: " + isEnabled());

        writer.println("  state: " + mState);
@@ -2390,11 +2399,7 @@ class BluetoothManagerService { 
            args[0] = "--print";

        }



        try {

            dumpBluetoothFlags(writer);

        } catch (Exception e) {

            writer.println("Exception while dumping Bluetooth Flags");

        }

        writer.println(flagString);



        if (mAdapter == null) {

            errorMsg = "Bluetooth Service not connected";
@@ -2410,28 +2415,97 @@ class BluetoothManagerService { 
        }

    }



    private void dumpBluetoothFlags(PrintWriter writer)

            throws IllegalAccessException, InvocationTargetException {

        writer.println("🚩Flag dump:");

    private static class FlagValue {

        private final String mSnakeName;

        private final boolean mDefaultValue;

        private final boolean mManuallyEnabledInJava;

        private final boolean mManuallyEnabledInNative;



        // maxLen is used to align the flag output

        int maxLen =

                Arrays.stream(Flags.class.getDeclaredMethods())

                        .map(Method::getName)

                        .map(String::length)

                        .max(Integer::compare)

                        .get();

        FlagValue(String name, boolean defaultValue) {

            mSnakeName = name.replaceAll("([A-Z])", "_$1").toLowerCase(Locale.US);

            mDefaultValue = defaultValue;

            mManuallyEnabledInJava = getJavaFlagValue();

            mManuallyEnabledInNative = getNativeFlagValue();

        }



        private boolean getJavaFlagValue() {

            return DeviceConfig.getBoolean(

                    DeviceConfig.NAMESPACE_BLUETOOTH,

                    "com.android.bluetooth.flags." + mSnakeName,

                    false);

        }



        private boolean getNativeFlagValue() {

            return SystemProperties.getBoolean(

                    "persist.device_config.aconfig_flags.bluetooth.com.android.bluetooth.flags."

                            + mSnakeName,

                    false);

        }



        String fmt = "\t%s: %-" + maxLen + "s %s";

        boolean isManuallyOverride() {

            return mManuallyEnabledInJava || mManuallyEnabledInNative;

        }



        boolean isPartiallyOverride() {

            return isManuallyOverride()

                    && (mDefaultValue != mManuallyEnabledInJava

                            || mDefaultValue != mManuallyEnabledInNative

                            || mManuallyEnabledInJava != mManuallyEnabledInNative);

        }



        static String toIcon(boolean flagValue) {

            return flagValue ? "[■]" : "[ ]";

        }



        for (Method m : Flags.class.getDeclaredMethods()) {

            String flagStatus = ((Boolean) m.invoke(null)) ? "[■]" : "[ ]";

            String name = m.getName();

            String snakeCaseName = name.replaceAll("([A-Z])", "_$1").toLowerCase(Locale.US);

            writer.println(String.format(fmt, flagStatus, name, snakeCaseName));

        void dump(StringBuilder sb) {

            sb.append("\t").append(toIcon(mDefaultValue)).append(": ").append(mSnakeName);

            if (isManuallyOverride()) {

                sb.append(" (Manual override)");

                if (isPartiallyOverride()) {

                    sb.append(String.format(" (%s: Java)", toIcon(mManuallyEnabledInJava)));

                    sb.append(String.format(" (%s: Native)", toIcon(mManuallyEnabledInNative)));

                    sb.append(" INCONSISTENT OVERRIDE FOR THIS FLAG.")

                            .append(" This can lead to unpredictable behavior.");

                }

            }

            sb.append("\n");

        }

    }



    private String dumpBluetoothFlags(PrintWriter writer) {

        List<FlagValue> flags =

                Arrays.stream(Flags.class.getDeclaredMethods())

                        .map(

                                (Method m) -> {

                                    try {

                                        return new FlagValue(m.getName(), (boolean) m.invoke(null));

                                    } catch (IllegalAccessException | InvocationTargetException e) {

                                        writer.println("Exception caught while dumping flag:" + e);

                                        throw new RuntimeException(e);

                                    }

                                })

                        .collect(Collectors.toList());



        StringBuilder flagOverride = new StringBuilder();

        flags.stream().filter(FlagValue::isManuallyOverride).forEach(f -> f.dump(flagOverride));

        if (flagOverride.length() > 0) {

            writer.println("🚩Some flag have a local override. Make sure this is expected");

            if (flags.stream().anyMatch(FlagValue::isPartiallyOverride)) {

                writer.println("CRITICAL WARNING:");

                writer.println("\tSome flags differ between native and java code !");

                writer.println(

                        "\tEither they are only enabled in java or only enabled in native. This can"

                                + " lead to critical failure and/or hard to debug issues.");

            }



            writer.println(flagOverride.toString());

            writer.println("---------------------------------------------------------------------");

            writer.println("");

        }

        StringBuilder flagDumpBuilder = new StringBuilder("🚩Flag dump:\n");

        flags.stream().forEach(f -> f.dump(flagDumpBuilder));

        return flagDumpBuilder.toString();

    }



    private void dumpProto(FileDescriptor fd) {

        final ProtoOutputStream proto = new ProtoOutputStream(new FileOutputStream(fd));