commit c4df6cab690aa72523e05b183cdcbaa3ef7cc2ce
author Chan Kim <kimchan@google.com> Tue Aug 22 16:54:22 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 22 16:54:22 2023 +0000
tree 10dd0187fa8a6bbee554b6c71a9e8bb03049ea2b
parent 99048394fd8d8a41d42ce100d24642393470d084
parent b22aa3f72bf2ac7123b6d9fbd84da1d0813425f4

Merge "Update language to comply with Android's inclusive language guidance" into main am: d259fb38fc am: 2322810754 am: b22aa3f72b

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

Change-Id: I9d1562ed0db23bf7929635862572ac17755da8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
index b6dc32a..9dedf70 100644
--- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
+++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
@@ -192,7 +192,7 @@
         }
 
         if ("whitelist".equals(op)) {
-            doPrintWhitelist();
+            doPrintAllowlist();
             return;
         }
 
@@ -911,7 +911,7 @@
         }
     }
 
-    private void doPrintWhitelist() {
+    private void doPrintAllowlist() {
         try {
             final String[] whitelist = mBmgr.getTransportWhitelist();
             if (whitelist != null) {