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

Commit 11cc1422 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

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

am: 17c8224c

Change-Id: Id14c2392d8f792addab046e86b9c82396ca2cbe0
parents 6eebec68 17c8224c

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);

        }