Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Track Multiple Event Instances in EventReporter"

Browse Source
This commit is contained in:
Nathan Harold
2019-02-05 17:59:57 +00:00
committed by Gerrit Code Review
parent ef4110074e 821857f776
commit fcd1db63bd
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
telephony/java/android/telephony/DebugEventReporter.java
View File

@@ -24,8 +24,15 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.os.ParcelUuid; import android.os.ParcelUuid;
import com.android.internal.util.IndentingPrintWriter;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.List; import java.util.List;
import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
/** /**
* A Simple Surface for Telephony to notify a loosely-coupled debugger of particular issues. * A Simple Surface for Telephony to notify a loosely-coupled debugger of particular issues.
@@ -47,6 +54,8 @@ public final class DebugEventReporter {
private static Context sContext = null; private static Context sContext = null;
private static Map<UUID, Integer> sEvents = new ConcurrentHashMap<>();
/* /*
* Because this is only supporting system packages, once we find a package, it will be the * Because this is only supporting system packages, once we find a package, it will be the
* same package until the next system upgrade. Thus, to save time in processing debug events * same package until the next system upgrade. Thus, to save time in processing debug events
@@ -74,6 +83,12 @@ public final class DebugEventReporter {
return; return;
} }
// If this event has already occurred, skip sending intents for it; regardless log its
// invocation here.
Integer count = sEvents.containsKey(eventId) ? sEvents.get(eventId) + 1 : 1;
sEvents.put(eventId, count);
if (count > 1) return;
// Even if we are initialized, that doesn't mean that a package name has been found. // Even if we are initialized, that doesn't mean that a package name has been found.
// This is normal in many cases, such as when no debug package is installed on the system, // This is normal in many cases, such as when no debug package is installed on the system,
// so drop these events silently. // so drop these events silently.
@@ -140,4 +155,20 @@ public final class DebugEventReporter {
} }
// Initialization may only be performed once. // Initialization may only be performed once.
} }
/** Dump the contents of the DebugEventReporter */
public static void dump(FileDescriptor fd, PrintWriter printWriter, String[] args) {
if (sContext == null) return;
IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, " ");
sContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, "Requires DUMP");
pw.println("Initialized=" + (sContext != null ? "Yes" : "No"));
pw.println("Debug Package=" + sDebugPackageName);
pw.println("Event Counts:");
pw.increaseIndent();
for (UUID event : sEvents.keySet()) {
pw.println(event + ": " + sEvents.get(event));
}
pw.decreaseIndent();
pw.flush();
}
} }