summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeremy Condra <gcondra@google.com>2013-06-18 18:02:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-06-18 18:02:14 +0000
commite201f581f6b535ff85f8748ce9333d895df40249 (patch)
treeb47ff06b1633360bc387c3b7ed63cfdb9ed51583
parentd4719fcffdd02a3042921f38b411c4d63d5554b1 (diff)
parentbf7b1f4744da64539ad33361fe0c0b0892790564 (diff)
downloadframeworks_base-e201f581f6b535ff85f8748ce9333d895df40249.zip
frameworks_base-e201f581f6b535ff85f8748ce9333d895df40249.tar.gz
frameworks_base-e201f581f6b535ff85f8748ce9333d895df40249.tar.bz2
Merge "Stop spewing errors into the logs."
-rw-r--r--services/java/com/android/server/pm/KeySetManager.java4
-rw-r--r--services/java/com/android/server/pm/Settings.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/services/java/com/android/server/pm/KeySetManager.java b/services/java/com/android/server/pm/KeySetManager.java
index 8272c15..2acc779 100644
--- a/services/java/com/android/server/pm/KeySetManager.java
+++ b/services/java/com/android/server/pm/KeySetManager.java
@@ -99,7 +99,7 @@ public class KeySetManager {
public void addDefinedKeySetToPackage(String packageName,
Set<PublicKey> keys, String alias) {
if ((packageName == null) || (keys == null) || (alias == null)) {
- Log.e(TAG, "Got null argument for a defined keyset, ignoring!");
+ Log.d(TAG, "Got null argument for a defined keyset, ignoring!");
return;
}
synchronized (mLockObject) {
@@ -120,7 +120,7 @@ public class KeySetManager {
public void addSigningKeySetToPackage(String packageName,
Set<PublicKey> signingKeys) {
if ((packageName == null) || (signingKeys == null)) {
- Log.e(TAG, "Got null argument for a signing keyset, ignoring!");
+ Log.d(TAG, "Got null argument for a signing keyset, ignoring!");
return;
}
synchronized (mLockObject) {
diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java
index 495e97d..0cae5d6 100644
--- a/services/java/com/android/server/pm/Settings.java
+++ b/services/java/com/android/server/pm/Settings.java
@@ -2336,7 +2336,7 @@ final class Settings {
} else if (tagName.equals("signing-keyset")) {
long id = Long.parseLong(parser.getAttributeValue(null, "identifier"));
packageSetting.keySetData.addSigningKeySet(id);
- Slog.e(TAG, "Adding signing keyset " + Long.toString(id) + " to " + name);
+ Slog.d(TAG, "Adding signing keyset " + Long.toString(id) + " to " + name);
} else if (tagName.equals("defined-keyset")) {
long id = Long.parseLong(parser.getAttributeValue(null, "identifier"));
String alias = parser.getAttributeValue(null, "alias");