Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia71942419b1b736f06875ff87a348d952f74dd7b
This commit is contained in:
Treehugger Robot
2020-09-28 15:15:40 +00:00
committed by Automerger Merge Worker
parent 4ac111af72 21e5a00fb3
commit bc3cef1dce
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Shell/src/com/android/shell/BugreportProgressService.java
View File

@@ -503,14 +503,14 @@ public class BugreportProgressService extends Service {
} }
if (msg.what != MSG_SERVICE_COMMAND) { if (msg.what != MSG_SERVICE_COMMAND) {
// Sanity check. // Confidence check.
Log.e(TAG, "Invalid message type: " + msg.what); Log.e(TAG, "Invalid message type: " + msg.what);
return; return;
} }
// At this point it's handling onStartCommand(), with the intent passed as an Extra. // At this point it's handling onStartCommand(), with the intent passed as an Extra.
if (!(msg.obj instanceof Intent)) { if (!(msg.obj instanceof Intent)) {
// Sanity check. // Confidence check.
Log.wtf(TAG, "handleMessage(): invalid msg.obj type: " + msg.obj); Log.wtf(TAG, "handleMessage(): invalid msg.obj type: " + msg.obj);
return; return;
} }

2
packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
View File

@@ -561,7 +561,7 @@ public class BugreportReceiverTest {
// Clear properties // Clear properties
mContext.getSharedPreferences(PREFS_BUGREPORT, Context.MODE_PRIVATE) mContext.getSharedPreferences(PREFS_BUGREPORT, Context.MODE_PRIVATE)
.edit().clear().commit(); .edit().clear().commit();
// Sanity check... // Confidence check...
assertEquals("Did not reset properties", STATE_UNKNOWN, assertEquals("Did not reset properties", STATE_UNKNOWN,
getWarningState(mContext, STATE_UNKNOWN)); getWarningState(mContext, STATE_UNKNOWN));
} else { } else {