diff options
| author | 2020-09-28 14:46:39 +0000 | |
|---|---|---|
| committer | 2020-09-28 14:46:39 +0000 | |
| commit | 21e5a00fb35a36d107f2212960c86acec874f063 (patch) | |
| tree | f172dfe20e4d7093884af69aed2343b1b0dcf8db | |
| parent | 3b5d49b7bb308688ab6781693c01f16dbff53598 (diff) | |
| parent | 986e49df72e615fb6a04af591452c90f264b9aeb (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" am: 986e49df72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382481
Change-Id: Iefde894b6c5a39f775001d78e1d6909033926b31
| -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 f6c2ee264cb5..02815a571db8 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -503,14 +503,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 b95092a9384c..b8cfa1e80043 100644 --- a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java +++ b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java @@ -561,7 +561,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 { |