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

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

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

Change-Id: I706670b4342df343b0a4ec49260b3601d37aa95e
parents adb2c1f5 8d384c54

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;