Merge "Use factory methods for RestrictionEntry" into mnc-dev

1 files changed, 24 insertions, 1 deletions

diff --git a/core/java/android/content/RestrictionEntry.java b/core/java/android/content/RestrictionEntry.java
index 342ee38..ab049ec 100644
--- a/core/java/android/content/RestrictionEntry.java
+++ b/core/java/android/content/RestrictionEntry.java
@@ -200,7 +200,7 @@ public class RestrictionEntry implements Parcelable {
      * {@link #TYPE_BUNDLE_ARRAY bundle-array} type, otherwise the type will be set to
      * {@link #TYPE_BUNDLE bundle}.
      */
-    public RestrictionEntry(String key, RestrictionEntry[] restrictionEntries,
+    private RestrictionEntry(String key, RestrictionEntry[] restrictionEntries,
             boolean isBundleArray) {
         mKey = key;
         if (isBundleArray) {
@@ -220,6 +220,29 @@ public class RestrictionEntry implements Parcelable {
     }
 
     /**
+     * Creates an entry of type {@link #TYPE_BUNDLE}.
+     * @param key the unique key for this restriction
+     * @param restrictionEntries array of nested restriction entries.
+     * @return the newly created restriction
+     */
+    public static RestrictionEntry createBundleEntry(String key,
+            RestrictionEntry[] restrictionEntries) {
+        return new RestrictionEntry(key, restrictionEntries, false);
+    }
+
+    /**
+     * Creates an entry of type {@link #TYPE_BUNDLE_ARRAY}.
+     * @param key the unique key for this restriction
+     * @param restrictionEntries array of nested restriction entries. The array may only contain
+     * elements of type {@link #TYPE_BUNDLE bundle}.
+     * @return the newly created restriction
+     */
+    public static RestrictionEntry createBundleArrayEntry(String key,
+            RestrictionEntry[] restrictionEntries) {
+        return new RestrictionEntry(key, restrictionEntries, true);
+    }
+
+    /**
      * Sets the type for this restriction.
      * @param type the type for this restriction.
      */