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

Commit 8d384c54 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" am: 0521eb75 

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

Change-Id: If60583d39beeb643bffad3f8e86a07e480ec97cd
parents 4342d200 0521eb75

services/usage/java/com/android/server/usage/AppTimeLimitController.java

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