commit 466606f1fd74ce91bda0ed514a657f080b57c116
author Geremy Condra <gcondra@google.com> Sat Jun 22 00:41:52 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 22 00:41:53 2013 +0000
tree f79dbd68cabda59e9574239401b45714684043df
parent 142dd91583f429db43017ada2497d0ecfdc2b392
parent a2d8eae2892e215a63ec5a1261e53a8a6a57d397

Merge "Remove logging of KeySet parse errors."

services/java/com/android/server/pm/KeySetManager.java

diff --git a/services/java/com/android/server/pm/KeySetManager.java b/services/java/com/android/server/pm/KeySetManager.java
index 2acc779..ee8cc71 100644
--- a/services/java/com/android/server/pm/KeySetManager.java
+++ b/services/java/com/android/server/pm/KeySetManager.java
@@ -505,9 +505,6 @@
                 readKeysLPw(parser);
             } else if (tagName.equals("keysets")) {
                 readKeySetListLPw(parser);
-            } else {
-                PackageManagerService.reportSettingsProblem(Log.WARN,
-                        "Could not read KeySets for KeySetManager!");
             }
         }
     }
@@ -528,9 +525,6 @@
                 lastIssuedKeyId = Long.parseLong(parser.getAttributeValue(null, "value"));
             } else if (tagName.equals("lastIssuedKeySetId")) {
                 lastIssuedKeySetId = Long.parseLong(parser.getAttributeValue(null, "value"));
-            } else {
-                PackageManagerService.reportSettingsProblem(Log.WARN,
-                        "Could not read keys for KeySetManager!");
             }
         }
     }
@@ -553,9 +547,6 @@
             } else if (tagName.equals("key-id")) {
                 long id = readIdentifierLPw(parser);
                 mKeySetMapping.get(currentKeySetId).add(id);
-            } else {
-                PackageManagerService.reportSettingsProblem(Log.WARN,
-                        "Could not read KeySets for KeySetManager!");
             }
         }
     }
@@ -571,10 +562,7 @@
         long identifier = Long.parseLong(encodedID);
         String encodedPublicKey = parser.getAttributeValue(null, "value");
         PublicKey pub = PackageParser.parsePublicKey(encodedPublicKey);
-        if (pub == null) {
-            PackageManagerService.reportSettingsProblem(Log.WARN,
-                    "Could not read public key for KeySetManager!");
-        } else {
+        if (pub != null) {
             mPublicKeys.put(identifier, pub);
         }
     }