diff options
| author | 2020-09-28 16:12:12 +0000 | |
|---|---|---|
| committer | 2020-09-28 16:12:12 +0000 | |
| commit | ee6cd5fc5b78368e974e9ed1c977c559d9d9558d (patch) | |
| tree | 97aabd04c5adb05058e2ab88bde3dbb8851dc5ad | |
| parent | 100c35f579572933e3b85885b383c2cb555a9476 (diff) | |
| parent | 58ebc4f303d31ade4be404149f131a90f78e7935 (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" am: 986e49df72 am: 21e5a00fb3 am: bc3cef1dce am: 91d640572f am: 58ebc4f303
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382481
Change-Id: I23744e158143a09d887e0ff1de912f687ffd0ded
| -rw-r--r-- | packages/Shell/src/com/android/shell/BugreportProgressService.java | 4 | ||||
| -rw-r--r-- | packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index ce427cbe776b..0eac4add7b09 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -511,14 +511,14 @@ public class BugreportProgressService extends Service { } if (msg.what != MSG_SERVICE_COMMAND) { - // Sanity check. + // Confidence check. Log.e(TAG, "Invalid message type: " + msg.what); return; } // At this point it's handling onStartCommand(), with the intent passed as an Extra. if (!(msg.obj instanceof Intent)) { - // Sanity check. + // Confidence check. Log.wtf(TAG, "handleMessage(): invalid msg.obj type: " + msg.obj); return; } diff --git a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java index cd3cad1d6351..3b02e3b46557 100644 --- a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java +++ b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java @@ -466,7 +466,7 @@ public class BugreportReceiverTest { // Clear properties mContext.getSharedPreferences(PREFS_BUGREPORT, Context.MODE_PRIVATE) .edit().clear().commit(); - // Sanity check... + // Confidence check... assertEquals("Did not reset properties", STATE_UNKNOWN, getWarningState(mContext, STATE_UNKNOWN)); } else { |