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

Commit 12c7bc3e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop showing RESTRICTED toast for new restriction." into tm-dev am: 837902ab 

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

Change-Id: I414773aa4d2f5197229082f3ccb578da2ee4f585
parents 01b7e898 837902ab

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+6 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static android.app.usage.UsageStatsManager.REASON_MAIN_TIMEOUT; 
import static android.app.usage.UsageStatsManager.REASON_MAIN_USAGE;

import static android.app.usage.UsageStatsManager.REASON_SUB_DEFAULT_APP_UPDATE;

import static android.app.usage.UsageStatsManager.REASON_SUB_FORCED_SYSTEM_FLAG_BUGGY;

import static android.app.usage.UsageStatsManager.REASON_SUB_FORCED_USER_FLAG_INTERACTION;

import static android.app.usage.UsageStatsManager.REASON_SUB_MASK;

import static android.app.usage.UsageStatsManager.REASON_SUB_PREDICTED_RESTORED;

import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_ACTIVE_TIMEOUT;
@@ -1581,7 +1582,11 @@ public class AppStandbyController 
                    // Only user force can bypass the delay restriction. If the user forced the

                    // app into the RESTRICTED bucket, then a toast confirming the action

                    // shouldn't be surprising.

                    if (Build.IS_DEBUGGABLE) {

                    // Exclude REASON_SUB_FORCED_USER_FLAG_INTERACTION since the RESTRICTED bucket

                    // isn't directly visible in that flow.

                    if (Build.IS_DEBUGGABLE

                            && (reason & REASON_SUB_MASK)

                            != REASON_SUB_FORCED_USER_FLAG_INTERACTION) {

                        Toast.makeText(mContext,

                                // Since AppStandbyController sits low in the lock hierarchy,

                                // make sure not to call out with the lock held.