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

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

Merge "fix uid for ForegroundServiceStateChanged"

parents 736d690a 1b9b21ce

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

+3 −3
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ public final class ActiveServices { 
                    active.mNumActive++;

                }

                r.isForeground = true;

                StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.userId, r.shortName,

                StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.appInfo.uid, r.shortName,

                        StatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER);

            }

            r.postNotification();
@@ -1112,7 +1112,7 @@ public final class ActiveServices { 
                    decActiveForegroundAppLocked(smap, r);

                }

                r.isForeground = false;

                StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.userId, r.shortName,

                StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.appInfo.uid, r.shortName,

                        StatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT);

                if (r.app != null) {

                    mAm.updateLruProcessLocked(r.app, false, null);
@@ -2538,7 +2538,7 @@ public final class ActiveServices { 
        cancelForegroundNotificationLocked(r);

        if (r.isForeground) {

            decActiveForegroundAppLocked(smap, r);

            StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.userId, r.shortName,

            StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.appInfo.uid, r.shortName,

                    StatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT);

        }