Merge "Test: parcel marshalling for user credentials page"

2016-01-25 12:42:30 +00:00
parent 090e37b5f2 e26804208c
commit 7b8f2354f4
2 changed files with 54 additions and 2 deletions
--- a/src/com/android/settings/UserCredentialsSettings.java
+++ b/src/com/android/settings/UserCredentialsSettings.java
@@ -194,8 +194,8 @@ public class UserCredentialsSettings extends InstrumentedFragment implements OnI
        }
    }

-    private static class Credential implements Parcelable {
-        private static enum Type {
+    static class Credential implements Parcelable {
+        static enum Type {
            CA_CERTIFICATE (Credentials.CA_CERTIFICATE),
            USER_CERTIFICATE (Credentials.USER_CERTIFICATE),
            USER_PRIVATE_KEY (Credentials.USER_PRIVATE_KEY),