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

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

Merge "Deflag wear_credential_manager_enabled" into main

parents 34121fc5 63841f1c

core/java/android/credentials/flags.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -53,13 +53,6 @@ flag { 
    is_exported: true

}



flag {

    namespace: "wear_frameworks"

    name: "wear_credential_manager_enabled"

    description: "Enables Credential Manager on Wear Platform"

    bug: "301168341"

}



flag {

    namespace: "credential_manager"

    name: "new_framework_metrics"

services/java/com/android/server/SystemServer.java

+3 −7
Original line number Diff line number Diff line
@@ -3014,13 +3014,9 @@ public final class SystemServer implements Dumpable { 
                    DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CREDENTIAL,

                    CredentialManager.DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER, true);

            if (credentialManagerEnabled) {

                if (isWatch && !android.credentials.flags.Flags.wearCredentialManagerEnabled()) {

                    Slog.d(TAG, "CredentialManager disabled on wear.");

                } else {

                t.traceBegin("StartCredentialManagerService");

                mSystemServiceManager.startService(CredentialManagerService.class);

                t.traceEnd();

                }

            } else {

                Slog.d(TAG, "CredentialManager disabled.");

            }