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: 0521eb758a am: 8d384c548c am: 12b1eaba8f

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

Change-Id: Ia983b250273e8f16cb1f3e76b00563633c32e95d
This commit is contained in:
Treehugger Robot
2020-08-01 00:31:29 +00:00
committed by Automerger Merge Worker
parent b4cd26b5cf 12b1eaba8f
commit eeac3d7223
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/usage/java/com/android/server/usage/AppTimeLimitController.java
View File

@@ -307,7 +307,7 @@ public class AppTimeLimitController {
} }
} else { } else {
if (mActives > mObserved.length) { 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; mActives = mObserved.length;
final UserData user = mUserRef.get(); final UserData user = mUserRef.get();
if (user == null) return; if (user == null) return;
@@ -334,7 +334,7 @@ public class AppTimeLimitController {
cancelCheckTimeoutLocked(this); cancelCheckTimeoutLocked(this);
} else { } else {
if (mActives < 0) { 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; mActives = 0;
final UserData user = mUserRef.get(); final UserData user = mUserRef.get();
if (user == null) return; if (user == null) return;