From 962bd4a69175077a95bc04bcdcc80ee6cb1034f8 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 24 Nov 2014 13:43:45 -0800 Subject: [PATCH] Ignore spammy package logs when dumping. Bug: 18390552 Change-Id: Ie333f57d46d6ab3f4b9daa17f98b1e94a236e959 --- .../server/pm/PackageManagerService.java | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 32e9dae345c88..fa76a4d691a63 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -12744,23 +12744,17 @@ public class PackageManagerService extends IPackageManager.Stub { pw.println(); pw.println("Package warning messages:"); - final File fname = getSettingsProblemFile(); - FileInputStream in = null; + BufferedReader in = null; + String line = null; try { - in = new FileInputStream(fname); - final int avail = in.available(); - final byte[] data = new byte[avail]; - in.read(data); - pw.print(new String(data)); - } catch (FileNotFoundException e) { - } catch (IOException e) { - } finally { - if (in != null) { - try { - in.close(); - } catch (IOException e) { - } + in = new BufferedReader(new FileReader(getSettingsProblemFile())); + while ((line = in.readLine()) != null) { + if (line.contains("ignored: updated version")) continue; + pw.println(line); } + } catch (IOException ignored) { + } finally { + IoUtils.closeQuietly(in); } } @@ -12770,6 +12764,7 @@ public class PackageManagerService extends IPackageManager.Stub { try { in = new BufferedReader(new FileReader(getSettingsProblemFile())); while ((line = in.readLine()) != null) { + if (line.contains("ignored: updated version")) continue; pw.print("msg,"); pw.println(line); }