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

Bugreport: Fix SystemUI service from being dumped twice 1/2

Browse Source 
Bug: 110490179
Fix: 110490179

Test: Manual test dumpsys activity
  adb shell dumpsys activity service all-platform-non-critical
  adb shell dumpsys activity service all-platform
  adb shell dumpsys activity service
  Take bugreport and check contents

Test: atest FrameworksCoreTests:DumpUtilsTest

Change-Id: I9173d3fa0cc3aaf42e3ab03e7e2892cf4188b13b
This commit is contained in:
Vishnu Nair
2018-07-02 14:29:31 -07:00
parent af57538369
commit c69cd4480e
3 changed files with 103 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
core/java/com/android/internal/util/DumpUtils.java
View File

@@ -34,9 +34,18 @@ import java.util.function.Predicate;
/**
* Helper functions for dumping the state of system services.
* Test:
atest /android/pi-dev/frameworks/base/core/tests/coretests/src/com/android/internal/util/DumpUtilsTest.java
atest FrameworksCoreTests:DumpUtilsTest
*/
public final class DumpUtils {
/**
* List of component names that should be dumped in the bug report critical section.
*
* @hide
*/
public static final ComponentName[] CRITICAL_SECTION_COMPONENTS = {
new ComponentName("com.android.systemui", "com.android.systemui.SystemUIService")
};
private static final String TAG = "DumpUtils";
private static final boolean DEBUG = false;
@@ -212,6 +221,45 @@ public final class DumpUtils {
return (wcn != null) && !isPlatformPackage(wcn.getComponentName());
}
/**
* Return whether a package should be dumped in the critical section.
*/
private static boolean isCriticalPackage(@Nullable ComponentName cname) {
if (cname == null) {
return false;
}
for (int i = 0; i < CRITICAL_SECTION_COMPONENTS.length; i++) {
if (cname.equals(CRITICAL_SECTION_COMPONENTS[i])) {
return true;
}
}
return false;
}
/**
* Return whether a package name is considered to be part of the platform and in the critical
* section.
*
* @hide
*/
public static boolean isPlatformCriticalPackage(@Nullable ComponentName.WithComponentName wcn) {
return (wcn != null) && isPlatformPackage(wcn.getComponentName()) &&
isCriticalPackage(wcn.getComponentName());
}
/**
* Return whether a package name is considered to be part of the platform but not in the the
* critical section.
*
* @hide
*/
public static boolean isPlatformNonCriticalPackage(
@Nullable ComponentName.WithComponentName wcn) {
return (wcn != null) && isPlatformPackage(wcn.getComponentName()) &&
!isCriticalPackage(wcn.getComponentName());
}
/**
* Used for dumping providers and services. Return a predicate for a given filter string.
* @hide
@@ -238,6 +286,16 @@ public final class DumpUtils {
return DumpUtils::isNonPlatformPackage;
}
// Dump all platform-critical?
if ("all-platform-critical".equals(filterString)) {
return DumpUtils::isPlatformCriticalPackage;
}
// Dump all platform-non-critical?
if ("all-platform-non-critical".equals(filterString)) {
return DumpUtils::isPlatformNonCriticalPackage;
}
// Is the filter a component name? If so, do an exact match.
final ComponentName filterCname = ComponentName.unflattenFromString(filterString);
if (filterCname != null) {