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

Commit 17c8224c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't time out startForegroundService when debugging the app" into pi-dev

parents 61683747 54f51b0a

services/core/java/com/android/server/am/ActiveServices.java

+6 −1
Original line number Diff line number Diff line
@@ -3390,10 +3390,15 @@ public final class ActiveServices { 
                return;

            }



            app = r.app;

            if (app != null && app.debugging) {

                // The app's being debugged; let it ride

                return;

            }



            if (DEBUG_BACKGROUND_CHECK) {

                Slog.i(TAG, "Service foreground-required timeout for " + r);

            }

            app = r.app;

            r.fgWaiting = false;

            stopServiceLocked(r);

        }