diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-28 15:15:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-28 15:15:40 +0000 |
| commit | bc3cef1dce2f90c42cade426ae9d015866271ee2 (patch) | |
| tree | c4150b9423cff744f3e726a7b0616b8cc690afee /packages/Shell | |
| parent | 4ac111af720a3d82aa52c968e419ff0115e8f436 (diff) | |
| parent | 21e5a00fb35a36d107f2212960c86acec874f063 (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" am: 986e49df72 am: 21e5a00fb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382481
Change-Id: Ia71942419b1b736f06875ff87a348d952f74dd7b
Diffstat (limited to 'packages/Shell')
| -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 { |