commit 5e262e8698e15aaad1cc1bdf987444084510381a
author dcashman <dcashman@google.com> Tue Apr 28 17:32:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 28 17:32:10 2015 +0000
tree 2742e494618d82c4634cc3fda023033add06528d
parent a9943c99ddb63491ff7624810e6f3eeec9a451c9
parent f99f2e746cfcdb02230e1a9c244a7051f395d31d

am f99f2e74: am 1ea5067e: am e12f23dc: Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-dev

* commit 'f99f2e746cfcdb02230e1a9c244a7051f395d31d':
  Remove static modifier from KeySetManagerService issuedIds.

services/core/java/com/android/server/pm/KeySetManagerService.java

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
--- a/services/core/java/com/android/server/pm/KeySetManagerService.java
+++ b/services/core/java/com/android/server/pm/KeySetManagerService.java
@@ -58,9 +58,9 @@
 
     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;