Merge "Update language to comply with Android's inclusive language guidance" am: 986e49df72 am: 21e5a00fb3 am: bc3cef1dce am: 91d640572f

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

Change-Id: Iec1cd15c07a70aba0f7d34a53e3a3ee3d4df4c4c

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;
             }

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 {