summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java25
1 files 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 32e9dae345c8..fa76a4d691a6 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);
}