summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-08-01 00:01:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-01 00:01:23 +0000
commit12b1eaba8f8a0836a104eb0020288f2961dd366a (patch)
tree5760b481a9bff5ccc290ce754022a60f768075d7
parentadb2c1f51b8ebc199c64c542a218ddfdf2b55216 (diff)
parent8d384c548c6b0a38ad5b0b3390b30fd5772c309e (diff)
Merge "Update language to comply with Android's inclusive language guidance" am: 0521eb758a am: 8d384c548c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384138 Change-Id: I706670b4342df343b0a4ec49260b3601d37aa95e
-rw-r--r--services/usage/java/com/android/server/usage/AppTimeLimitController.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/usage/java/com/android/server/usage/AppTimeLimitController.java b/services/usage/java/com/android/server/usage/AppTimeLimitController.java
index 6861ad1b2e2d..4986d1883307 100644
--- a/services/usage/java/com/android/server/usage/AppTimeLimitController.java
+++ b/services/usage/java/com/android/server/usage/AppTimeLimitController.java
@@ -307,7 +307,7 @@ public class AppTimeLimitController {
}
} else {
if (mActives > mObserved.length) {
- // Try to get to a sane state and log the issue
+ // Try to get to a valid state and log the issue
mActives = mObserved.length;
final UserData user = mUserRef.get();
if (user == null) return;
@@ -334,7 +334,7 @@ public class AppTimeLimitController {
cancelCheckTimeoutLocked(this);
} else {
if (mActives < 0) {
- // Try to get to a sane state and log the issue
+ // Try to get to a valid state and log the issue
mActives = 0;
final UserData user = mUserRef.get();
if (user == null) return;