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

Commit 7a13a928 authored by Becca Hughes's avatar Becca Hughes Committed by Android (Google) Code Review
Browse files

Merge "Make sure flagging for settings activity works" into main

parents be8dedce 48f202a2

core/java/android/credentials/CredentialProviderInfo.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -128,6 +128,11 @@ public final class CredentialProviderInfo implements Parcelable { 
    @TestApi

    @TestApi

    @FlaggedApi(Flags.FLAG_SETTINGS_ACTIVITY_ENABLED)

    @FlaggedApi(Flags.FLAG_SETTINGS_ACTIVITY_ENABLED)

    public CharSequence getSettingsActivity() {

    public CharSequence getSettingsActivity() {

        // Add a manual check to make sure this returns null if

        // the flag is not enabled.

        if (!Flags.settingsActivityEnabled()) {

            return null;

        }

        return mSettingsActivity;

        return mSettingsActivity;

    }

    }