diff options
| author | 2023-08-22 18:07:58 +0000 | |
|---|---|---|
| committer | 2023-08-22 18:07:58 +0000 | |
| commit | 6befa78b57f76658b3920a3c734f0d3c5c91b8dd (patch) | |
| tree | 483586c0ac815bb92c7e359a184976f9369bef19 | |
| parent | 16d021e3eda904adf6e57bda697e9aaaf45a4236 (diff) | |
| parent | fe272cf1a6f68dfc55f4d12a478bb2e84d902243 (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" into main am: d259fb38fc am: 2322810754 am: b22aa3f72b am: c4df6cab69 am: fe272cf1a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2719957
Change-Id: Ief7bc611a2e964e83b7c3aa1099486bda255bf63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java index b6dc32a29f04..9dedf7025143 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 @@ public class Bmgr { } if ("whitelist".equals(op)) { - doPrintWhitelist(); + doPrintAllowlist(); return; } @@ -911,7 +911,7 @@ public class Bmgr { } } - private void doPrintWhitelist() { + private void doPrintAllowlist() { try { final String[] whitelist = mBmgr.getTransportWhitelist(); if (whitelist != null) { |