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

Merge "Remove icon name from NR dump" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-27 02:25:16 +00:00
committed by Android (Google) Code Review
parent 9ffc163495 e3a699976e
commit cbb195142a
1 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
services/core/java/com/android/server/notification/NotificationRecord.java
View File

@@ -34,11 +34,8 @@ import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PackageManagerInternal; import android.content.pm.PackageManagerInternal;
import android.content.res.Resources;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.drawable.Icon;
import android.media.AudioAttributes; import android.media.AudioAttributes;
import android.media.AudioSystem; import android.media.AudioSystem;
import android.metrics.LogMaker; import android.metrics.LogMaker;
@@ -453,16 +450,11 @@ public final class NotificationRecord {
void dump(PrintWriter pw, String prefix, Context baseContext, boolean redact) { void dump(PrintWriter pw, String prefix, Context baseContext, boolean redact) {
final Notification notification = sbn.getNotification(); final Notification notification = sbn.getNotification();
final Icon icon = notification.getSmallIcon();
String iconStr = String.valueOf(icon);
if (icon != null && icon.getType() == Icon.TYPE_RESOURCE) {
iconStr += " / " + idDebugString(baseContext, icon.getResPackage(), icon.getResId());
}
pw.println(prefix + this); pw.println(prefix + this);
prefix = prefix + " "; prefix = prefix + " ";
pw.println(prefix + "uid=" + sbn.getUid() + " userId=" + sbn.getUserId()); pw.println(prefix + "uid=" + sbn.getUid() + " userId=" + sbn.getUserId());
pw.println(prefix + "opPkg=" + sbn.getOpPkg()); pw.println(prefix + "opPkg=" + sbn.getOpPkg());
pw.println(prefix + "icon=" + iconStr); pw.println(prefix + "icon=" + notification.getSmallIcon());
pw.println(prefix + "flags=0x" + Integer.toHexString(notification.flags)); pw.println(prefix + "flags=0x" + Integer.toHexString(notification.flags));
pw.println(prefix + "pri=" + notification.priority); pw.println(prefix + "pri=" + notification.priority);
pw.println(prefix + "key=" + sbn.getKey()); pw.println(prefix + "key=" + sbn.getKey());
@@ -592,28 +584,6 @@ public final class NotificationRecord {
pw.println(prefix + "mAdjustments=" + mAdjustments); pw.println(prefix + "mAdjustments=" + mAdjustments);
} }
static String idDebugString(Context baseContext, String packageName, int id) {
Context c;
if (packageName != null) {
try {
c = baseContext.createPackageContext(packageName, 0);
} catch (NameNotFoundException e) {
c = baseContext;
}
} else {
c = baseContext;
}
Resources r = c.getResources();
try {
return r.getResourceName(id);
} catch (Resources.NotFoundException e) {
return "<name unknown>";
}
}
@Override @Override
public final String toString() { public final String toString() {
return String.format( return String.format(