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

Commit c62d355b authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am b523c55d: am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 

* commit 'b523c55d':
  Debug for bug 18201239.
parents d5049e2f b523c55d

core/java/android/app/ActivityThread.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -2954,6 +2954,8 @@ public final class ActivityThread { 
                            + ": " + e.toString(), e);

                            + ": " + e.toString(), e);

                }

                }

            }

            }

        } else {

            Slog.i(TAG, "handleStopService: token=" + token + " not found.");

        }

        }

        //Slog.i(TAG, "Running services: " + mServices);

        //Slog.i(TAG, "Running services: " + mServices);

    }

    }

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ public final class ActiveServices { 
    static final boolean DEBUG_DELAYED_SERVICE = ActivityManagerService.DEBUG_SERVICE;

    static final boolean DEBUG_DELAYED_SERVICE = ActivityManagerService.DEBUG_SERVICE;

    static final boolean DEBUG_DELAYED_STARTS = DEBUG_DELAYED_SERVICE;

    static final boolean DEBUG_DELAYED_STARTS = DEBUG_DELAYED_SERVICE;

    static final boolean DEBUG_MU = ActivityManagerService.DEBUG_MU;

    static final boolean DEBUG_MU = ActivityManagerService.DEBUG_MU;

    static final boolean LOG_SERVICE_START_STOP = false;

    static final boolean LOG_SERVICE_START_STOP = true;

    static final String TAG = ActivityManagerService.TAG;

    static final String TAG = ActivityManagerService.TAG;

    static final String TAG_MU = ActivityManagerService.TAG_MU;

    static final String TAG_MU = ActivityManagerService.TAG_MU;
@@ -1870,7 +1870,7 @@ public final class ActiveServices { 




    private void serviceDoneExecutingLocked(ServiceRecord r, boolean inDestroying,

    private void serviceDoneExecutingLocked(ServiceRecord r, boolean inDestroying,

            boolean finishing) {

            boolean finishing) {

        if (DEBUG_SERVICE) Slog.v(TAG, "<<< DONE EXECUTING " + r

        if (true || DEBUG_SERVICE) Slog.v(TAG, "<<< DONE EXECUTING " + r

                + ": nesting=" + r.executeNesting

                + ": nesting=" + r.executeNesting

                + ", inDestroying=" + inDestroying + ", app=" + r.app);

                + ", inDestroying=" + inDestroying + ", app=" + r.app);

        else if (DEBUG_SERVICE_EXECUTING) Slog.v(TAG, "<<< DONE EXECUTING " + r.shortName);

        else if (DEBUG_SERVICE_EXECUTING) Slog.v(TAG, "<<< DONE EXECUTING " + r.shortName);