commit fe272cf1a6f68dfc55f4d12a478bb2e84d902243
author Chan Kim <kimchan@google.com> Tue Aug 22 17:22:00 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 22 17:22:00 2023 +0000
tree 665a81f47f707021f949b83b2a9bd37e4459459d
parent 0b822b8ba35b04fe17e29cae0e10d6e8fe777258
parent c4df6cab690aa72523e05b183cdcbaa3ef7cc2ce

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

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

Change-Id: I614184cf74737ee617ca26d6beafdaa2ef9eede7
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) {