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

Commit 0ace4de5 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am f838eb40: am fa0fb7c5: am f6ba84b4: Merge "Reduce verbosity of service... 

am f838eb40: am fa0fb7c5: am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev

* commit 'f838eb40':
  Reduce verbosity of service event logging.
parents 8bce2984 f838eb40

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

+4 −8
Original line number Original line Diff line number Diff line
@@ -1090,11 +1090,8 @@ public class ActiveServices { 




        boolean created = false;

        boolean created = false;

        try {

        try {

            mAm.mStringBuilder.setLength(0);

            EventLogTags.writeAmCreateService(

            r.intent.getIntent().toShortString(mAm.mStringBuilder, true, false, true, false);

                    r.userId, System.identityHashCode(r), r.shortName, r.app.pid);

            EventLog.writeEvent(EventLogTags.AM_CREATE_SERVICE,

                    r.userId, System.identityHashCode(r), r.shortName,

                    mAm.mStringBuilder.toString(), r.app.pid);

            synchronized (r.stats.getBatteryStats()) {

            synchronized (r.stats.getBatteryStats()) {

                r.stats.startLaunchedLocked();

                r.stats.startLaunchedLocked();

            }

            }
@@ -1242,9 +1239,8 @@ public class ActiveServices { 
        }

        }





        if (DEBUG_SERVICE) Slog.v(TAG, "Bringing down " + r + " " + r.intent);

        if (DEBUG_SERVICE) Slog.v(TAG, "Bringing down " + r + " " + r.intent);

        EventLog.writeEvent(EventLogTags.AM_DESTROY_SERVICE,

        EventLogTags.writeAmDestroyService(

                r.userId, System.identityHashCode(r), r.shortName,

                r.userId, System.identityHashCode(r), (r.app != null) ? r.app.pid : -1);

                (r.app != null) ? r.app.pid : -1);





        mServiceMap.removeServiceByName(r.name, r.userId);

        mServiceMap.removeServiceByName(r.name, r.userId);

        mServiceMap.removeServiceByIntent(r.intent, r.userId);

        mServiceMap.removeServiceByIntent(r.intent, r.userId);

services/java/com/android/server/am/EventLogTags.logtags

+2 −2
Original line number Original line Diff line number Diff line
@@ -63,9 +63,9 @@ option java_package com.android.server.am 
30024 am_broadcast_discard_filter (User|1|5),(Broadcast|1|5),(Action|3),(Receiver Number|1|1),(BroadcastFilter|1|5)

30024 am_broadcast_discard_filter (User|1|5),(Broadcast|1|5),(Action|3),(Receiver Number|1|1),(BroadcastFilter|1|5)

30025 am_broadcast_discard_app (User|1|5),(Broadcast|1|5),(Action|3),(Receiver Number|1|1),(App|3)

30025 am_broadcast_discard_app (User|1|5),(Broadcast|1|5),(Action|3),(Receiver Number|1|1),(App|3)

# A service is being created

# A service is being created

30030 am_create_service (User|1|5),(Service Record|1|5),(Name|3),(Intent|3),(PID|1|5)

30030 am_create_service (User|1|5),(Service Record|1|5),(Name|3),(PID|1|5)

# A service is being destroyed

# A service is being destroyed

30031 am_destroy_service (User|1|5),(Service Record|1|5),(Name|3),(PID|1|5)

30031 am_destroy_service (User|1|5),(Service Record|1|5),(PID|1|5)

# A process has crashed too many times, it is being cleared

# A process has crashed too many times, it is being cleared

30032 am_process_crashed_too_much (User|1|5),(Name|3),(PID|1|5)

30032 am_process_crashed_too_much (User|1|5),(Name|3),(PID|1|5)

# An unknown process is trying to attach to the activity manager

# An unknown process is trying to attach to the activity manager