Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc3cef1d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 986e49df am: 21e5a00f

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

Change-Id: Ia71942419b1b736f06875ff87a348d952f74dd7b
parents 4ac111af 21e5a00f

packages/Shell/src/com/android/shell/BugreportProgressService.java

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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 {