Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e201f581 authored Jun 18, 2013 by Geremy Condra Committed by Android (Google) Code Review Jun 18, 2013

Merge "Stop spewing errors into the logs."

parents d4719fcf bf7b1f47

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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) {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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");