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

Commit a780d62a authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Whitelist -> Allowlist" into tm-qpr-dev am: 954f15ac am: ff84ea2a 

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



Change-Id: If7cf05f9824646caeb98390e47de89f07d3b4798
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 015f5339 ff84ea2a

packages/SystemUI/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ 
    <integer name="watch_heap_limit">256000</integer>



    <!-- SystemUI Plugins that can be loaded on user builds. -->

    <string-array name="config_pluginWhitelist" translatable="false">

    <string-array name="config_pluginAllowlist" translatable="false">

        <item>com.android.systemui</item>

    </string-array>

packages/SystemUI/src/com/android/systemui/plugins/PluginsModule.java

+1 −1
Original line number Diff line number Diff line
@@ -121,6 +121,6 @@ public abstract class PluginsModule { 
    @Provides

    @Named(PLUGIN_PRIVILEGED)

    static List<String> providesPrivilegedPlugins(Context context) {

        return Arrays.asList(context.getResources().getStringArray(R.array.config_pluginWhitelist));

        return Arrays.asList(context.getResources().getStringArray(R.array.config_pluginAllowlist));

    }

}