Remove static modifier from KeySetManagerService issuedIds.

There is no notion of shared issuedIds across instances of KeySetManagerService,
of which there should only ever be one on the system.  This is particularly
troublesome for unit tests which rely on a clean slate for each
KeySetManagerService invocation.

Bug: 19530120
Change-Id: I41fbd5424650a74426c5aa1128ddfa6a230dcfa3

diff --git a/services/core/java/com/android/server/pm/KeySetManagerService.java b/services/core/java/com/android/server/pm/KeySetManagerService.java
index c8e5c3a..7531403 100644 (file)
--- a/services/core/java/com/android/server/pm/KeySetManagerService.java
+++ b/services/core/java/com/android/server/pm/KeySetManagerService.java
@@ -58,9 +58,9 @@ public class KeySetManagerService {
 
     private final ArrayMap<String, PackageSetting> mPackages;
 
-    private static long lastIssuedKeySetId = 0;
+    private long lastIssuedKeySetId = 0;
 
-    private static long lastIssuedKeyId = 0;
+    private long lastIssuedKeyId = 0;
 
     class PublicKeyHandle {
         private final PublicKey mKey;