AppRestriction: Remove bundle restriction

Bundle restrictions are no longer allowed in app restrictions schema.
This removes the bundle restriction "profile" from both
AppRestrictionSchema and AppRestrictionEnforcer.

Bug: 31361481
Change-Id: I9bc20ad24891127a00728d8af0edadacfec79d37
(cherry picked from commit ceda4554de5c10ea45018f8b3d00941cabf875c2)

13 files changed, 40 insertions, 206 deletions

diff --git a/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/AppRestrictionEnforcerFragment.java b/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/AppRestrictionEnforcerFragment.java
index 361c4ac3..908f9046 100644
--- a/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/AppRestrictionEnforcerFragment.java
+++ b/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/AppRestrictionEnforcerFragment.java
@@ -90,13 +90,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
     private static final String RESTRICTION_KEY_APPROVALS = "approvals";
 
     /**
-     * Key for the bundle restriction in AppRestrictionSchema.
-     */
-    private static final String RESTRICTION_KEY_PROFILE = "profile";
-    private static final String RESTRICTION_KEY_PROFILE_NAME = "name";
-    private static final String RESTRICTION_KEY_PROFILE_AGE = "age";
-
-    /**
      * Key for the bundle array restriction in AppRestrictionSchema.
      */
     private static final String RESTRICTION_KEY_ITEMS = "items";
@@ -119,8 +112,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
     private EditText mEditNumber;
     private Spinner mSpinnerRank;
     private LinearLayout mLayoutApprovals;
-    private EditText mEditProfileName;
-    private EditText mEditProfileAge;
     private LinearLayout mLayoutItems;
 
     @Override
@@ -137,17 +128,12 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
         mEditNumber = (EditText) view.findViewById(R.id.number);
         mSpinnerRank = (Spinner) view.findViewById(R.id.rank);
         mLayoutApprovals = (LinearLayout) view.findViewById(R.id.approvals);
-        mEditProfileName = (EditText) view.findViewById(R.id.profile_name);
-        mEditProfileAge = (EditText) view.findViewById(R.id.profile_age);
         mLayoutItems = (LinearLayout) view.findViewById(R.id.items);
         view.findViewById(R.id.item_add).setOnClickListener(this);
-        View bundleLayout = view.findViewById(R.id.bundle_layout);
         View bundleArrayLayout = view.findViewById(R.id.bundle_array_layout);
         if (BUNDLE_SUPPORTED) {
-            bundleLayout.setVisibility(View.VISIBLE);
             bundleArrayLayout.setVisibility(View.VISIBLE);
         } else {
-            bundleLayout.setVisibility(View.GONE);
             bundleArrayLayout.setVisibility(View.GONE);
         }
     }
@@ -197,21 +183,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
         }
     };
 
-    private TextWatcher mWatcherProfile = new EasyTextWatcher() {
-        @Override
-        public void afterTextChanged(Editable s) {
-            try {
-                String name = mEditProfileName.getText().toString();
-                String ageString = mEditProfileAge.getText().toString();
-                if (!TextUtils.isEmpty(ageString)) {
-                    saveProfile(getActivity(), name, Integer.parseInt(ageString));
-                }
-            } catch (NumberFormatException e) {
-                Toast.makeText(getActivity(), "Not an integer!", Toast.LENGTH_SHORT).show();
-            }
-        }
-    };
-
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
         switch (parent.getId()) {
@@ -292,20 +263,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
                                         TextUtils.join(DELIMETER,
                                                 restriction.getAllSelectedStrings())),
                                 DELIMETER));
-            } else if (BUNDLE_SUPPORTED && RESTRICTION_KEY_PROFILE.equals(key)) {
-                String name = null;
-                int age = 0;
-                for (RestrictionEntry entry : restriction.getRestrictions()) {
-                    String profileKey = entry.getKey();
-                    if (RESTRICTION_KEY_PROFILE_NAME.equals(profileKey)) {
-                        name = entry.getSelectedString();
-                    } else if (RESTRICTION_KEY_PROFILE_AGE.equals(profileKey)) {
-                        age = entry.getIntValue();
-                    }
-                }
-                name = prefs.getString(RESTRICTION_KEY_PROFILE_NAME, name);
-                age = prefs.getInt(RESTRICTION_KEY_PROFILE_AGE, age);
-                updateProfile(name, age);
             } else if (BUNDLE_SUPPORTED && RESTRICTION_KEY_ITEMS.equals(key)) {
                 String itemsString = prefs.getString(RESTRICTION_KEY_ITEMS, "");
                 HashMap<String, String> items = new HashMap<>();
@@ -362,22 +319,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
         }
     }
 
-    private void updateProfile(String name, int age) {
-        if (!BUNDLE_SUPPORTED) {
-            return;
-        }
-        Bundle profile = new Bundle();
-        profile.putString(RESTRICTION_KEY_PROFILE_NAME, name);
-        profile.putInt(RESTRICTION_KEY_PROFILE_AGE, age);
-        mCurrentRestrictions.putBundle(RESTRICTION_KEY_PROFILE, profile);
-        mEditProfileName.removeTextChangedListener(mWatcherProfile);
-        mEditProfileName.setText(name);
-        mEditProfileName.addTextChangedListener(mWatcherProfile);
-        mEditProfileAge.removeTextChangedListener(mWatcherProfile);
-        mEditProfileAge.setText(String.valueOf(age));
-        mEditProfileAge.addTextChangedListener((mWatcherProfile));
-    }
-
     private void updateItems(Context context, Map<String, String> items) {
         if (!BUNDLE_SUPPORTED) {
             return;
@@ -511,25 +452,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
     }
 
     /**
-     * Saves the value for the "profile" restriction of AppRestrictionSchema.
-     *
-     * @param activity The activity
-     * @param name     The value to be set for the "name" field.
-     * @param age      The value to be set for the "age" field.
-     */
-    private void saveProfile(Activity activity, String name, int age) {
-        if (!BUNDLE_SUPPORTED) {
-            return;
-        }
-        Bundle profile = new Bundle();
-        profile.putString(RESTRICTION_KEY_PROFILE_NAME, name);
-        profile.putInt(RESTRICTION_KEY_PROFILE_AGE, age);
-        mCurrentRestrictions.putBundle(RESTRICTION_KEY_PROFILE, profile);
-        saveRestrictions(activity);
-        editPreferences(activity).putString(RESTRICTION_KEY_PROFILE_NAME, name).apply();
-    }
-
-    /**
      * Saves the value for the "items" restriction of AppRestrictionSchema.
      *
      * @param activity The activity.
diff --git a/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/ItemAddFragment.java b/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/ItemAddFragment.java
index cda2726b..091a0a88 100644
--- a/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/ItemAddFragment.java
+++ b/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/ItemAddFragment.java
@@ -17,6 +17,7 @@
 package com.example.android.apprestrictionenforcer;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
@@ -42,10 +43,10 @@ public class ItemAddFragment extends DialogFragment implements View.OnClickListe
     private EditText mEditValue;
 
     @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
+    public void onAttach(Context context) {
+        super.onAttach(context);
         Fragment parentFragment = getParentFragment();
-        mListener = (OnItemAddedListener) (parentFragment == null ? activity : parentFragment);
+        mListener = (OnItemAddedListener) (parentFragment == null ? context : parentFragment);
     }
 
     @Override
diff --git a/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/MainActivity.java b/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/MainActivity.java
index c6b012be..85eace96 100644
--- a/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/MainActivity.java
+++ b/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/MainActivity.java
@@ -62,7 +62,7 @@ public class MainActivity extends FragmentActivity implements StatusFragment.Sta
 
     private void showSetupProfile() {
         getSupportFragmentManager().beginTransaction()
-                .replace(R.id.container, new SetupProfileFragment())
+                .replace(R.id.container, SetupProfileFragment.newInstance())
                 .commit();
     }
 
diff --git a/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/SetupProfileFragment.java b/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/SetupProfileFragment.java
index 4dbd9305..29c36d41 100644
--- a/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/SetupProfileFragment.java
+++ b/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/SetupProfileFragment.java
@@ -18,6 +18,7 @@ package com.example.android.apprestrictionenforcer;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -28,6 +29,7 @@ import android.widget.Toast;
 import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE;
 import static android.app.admin.DevicePolicyManager.EXTRA_DEVICE_ADMIN;
 import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME;
 
 /**
  * This {@link Fragment} handles initiation of managed profile provisioning.
@@ -74,9 +76,14 @@ public class SetupProfileFragment extends Fragment implements View.OnClickListen
             return;
         }
         Intent intent = new Intent(ACTION_PROVISION_MANAGED_PROFILE);
-        intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME,
-                activity.getApplicationContext().getPackageName());
-        intent.putExtra(EXTRA_DEVICE_ADMIN, EnforcerDeviceAdminReceiver.getComponentName(activity));
+        if (Build.VERSION.SDK_INT >= 24) {
+            intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME,
+                    EnforcerDeviceAdminReceiver.getComponentName(activity));
+        } else {
+            intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME,
+                    activity.getApplicationContext().getPackageName());
+            intent.putExtra(EXTRA_DEVICE_ADMIN, EnforcerDeviceAdminReceiver.getComponentName(activity));
+        }
         if (intent.resolveActivity(activity.getPackageManager()) != null) {
             startActivityForResult(intent, REQUEST_PROVISION_MANAGED_PROFILE);
             activity.finish();
diff --git a/admin/AppRestrictionEnforcer/Application/src/main/res/layout/fragment_app_restriction_enforcer.xml b/admin/AppRestrictionEnforcer/Application/src/main/res/layout/fragment_app_restriction_enforcer.xml
index b6839897..95d605ce 100644
--- a/admin/AppRestrictionEnforcer/Application/src/main/res/layout/fragment_app_restriction_enforcer.xml
+++ b/admin/AppRestrictionEnforcer/Application/src/main/res/layout/fragment_app_restriction_enforcer.xml
@@ -119,34 +119,6 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/bundle_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/profile"/>
-
-            <EditText
-                android:id="@+id/profile_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.75"
-                android:hint="@string/name"/>
-
-            <EditText
-                android:id="@+id/profile_age"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.25"
-                android:hint="@string/age"
-                android:inputType="number"/>
-
-        </LinearLayout>
-
         <RelativeLayout
             android:id="@+id/bundle_array_layout"
             android:layout_width="match_parent"
diff --git a/admin/AppRestrictionEnforcer/Application/src/main/res/values/strings.xml b/admin/AppRestrictionEnforcer/Application/src/main/res/values/strings.xml
index ead41527..07e1c85c 100644
--- a/admin/AppRestrictionEnforcer/Application/src/main/res/values/strings.xml
+++ b/admin/AppRestrictionEnforcer/Application/src/main/res/values/strings.xml
@@ -29,9 +29,6 @@
     <string name="number">Number: </string>
     <string name="rank">Rank: </string>
     <string name="approvals">Approvals: </string>
-    <string name="profile">Profile: </string>
-    <string name="name">Name</string>
-    <string name="age">Age</string>
     <string name="items">Items: </string>
     <string name="add">Add</string>
     <string name="key">Key</string>
diff --git a/admin/AppRestrictionEnforcer/gradle/wrapper/gradle-wrapper.properties b/admin/AppRestrictionEnforcer/gradle/wrapper/gradle-wrapper.properties
index 2139f4b2..2d393d40 100644
--- a/admin/AppRestrictionEnforcer/gradle/wrapper/gradle-wrapper.properties
+++ b/admin/AppRestrictionEnforcer/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 01 16:00:44 JST 2014
+#Fri Sep 09 09:42:15 JST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/admin/AppRestrictionSchema/Application/src/main/java/com/example/android/apprestrictionschema/AppRestrictionSchemaFragment.java b/admin/AppRestrictionSchema/Application/src/main/java/com/example/android/apprestrictionschema/AppRestrictionSchemaFragment.java
index bbb1ef86..f15bd9d4 100644
--- a/admin/AppRestrictionSchema/Application/src/main/java/com/example/android/apprestrictionschema/AppRestrictionSchemaFragment.java
+++ b/admin/AppRestrictionSchema/Application/src/main/java/com/example/android/apprestrictionschema/AppRestrictionSchemaFragment.java
@@ -51,9 +51,6 @@ public class AppRestrictionSchemaFragment extends Fragment implements View.OnCli
     private static final String KEY_NUMBER = "number";
     private static final String KEY_RANK = "rank";
     private static final String KEY_APPROVALS = "approvals";
-    private static final String KEY_PROFILE = "profile";
-    private static final String KEY_PROFILE_NAME = "name";
-    private static final String KEY_PROFILE_AGE = "age";
     private static final String KEY_ITEMS = "items";
     private static final String KEY_ITEM_KEY = "key";
     private static final String KEY_ITEM_VALUE = "value";
@@ -69,7 +66,6 @@ public class AppRestrictionSchemaFragment extends Fragment implements View.OnCli
     private TextView mTextNumber;
     private TextView mTextRank;
     private TextView mTextApprovals;
-    private TextView mTextProfile;
     private TextView mTextItems;
 
     @Override
@@ -86,18 +82,15 @@ public class AppRestrictionSchemaFragment extends Fragment implements View.OnCli
         mTextRank = (TextView) view.findViewById(R.id.your_rank);
         mTextApprovals = (TextView) view.findViewById(R.id.approvals_you_have);
         View bundleSeparator = view.findViewById(R.id.bundle_separator);
-        mTextProfile = (TextView) view.findViewById(R.id.your_profile);
         View bundleArraySeparator = view.findViewById(R.id.bundle_array_separator);
         mTextItems = (TextView) view.findViewById(R.id.your_items);
         mButtonSayHello.setOnClickListener(this);
         if (BUNDLE_SUPPORTED) {
             bundleSeparator.setVisibility(View.VISIBLE);
-            mTextProfile.setVisibility(View.VISIBLE);
             bundleArraySeparator.setVisibility(View.VISIBLE);
             mTextItems.setVisibility(View.VISIBLE);
         } else {
             bundleSeparator.setVisibility(View.GONE);
-            mTextProfile.setVisibility(View.GONE);
             bundleArraySeparator.setVisibility(View.GONE);
             mTextItems.setVisibility(View.GONE);
         }
@@ -128,10 +121,8 @@ public class AppRestrictionSchemaFragment extends Fragment implements View.OnCli
                 updateRank(entry, restrictions);
             } else if (key.equals(KEY_APPROVALS)) {
                 updateApprovals(entry, restrictions);
-            } else if (key.equals(KEY_PROFILE)) {
-                updateProfile(entry, restrictions);
             } else if (key.equals(KEY_ITEMS)) {
-                updateItems(entry, restrictions);
+                updateItems(restrictions);
             }
         }
     }
@@ -193,33 +184,7 @@ public class AppRestrictionSchemaFragment extends Fragment implements View.OnCli
         mTextApprovals.setText(getString(R.string.approvals_you_have, text));
     }
 
-    private void updateProfile(RestrictionEntry entry, Bundle restrictions) {
-        if (!BUNDLE_SUPPORTED) {
-            return;
-        }
-        String name = null;
-        int age = 0;
-        if (restrictions == null || !restrictions.containsKey(KEY_PROFILE)) {
-            RestrictionEntry[] entries = entry.getRestrictions();
-            for (RestrictionEntry profileEntry : entries) {
-                String key = profileEntry.getKey();
-                if (key.equals(KEY_PROFILE_NAME)) {
-                    name = profileEntry.getSelectedString();
-                } else if (key.equals(KEY_PROFILE_AGE)) {
-                    age = profileEntry.getIntValue();
-                }
-            }
-        } else {
-            Bundle profile = restrictions.getBundle(KEY_PROFILE);
-            if (profile != null) {
-                name = profile.getString(KEY_PROFILE_NAME);
-                age = profile.getInt(KEY_PROFILE_AGE);
-            }
-        }
-        mTextProfile.setText(getString(R.string.your_profile, name, age));
-    }
-
-    private void updateItems(RestrictionEntry entry, Bundle restrictions) {
+    private void updateItems(Bundle restrictions) {
         if (!BUNDLE_SUPPORTED) {
             return;
         }
diff --git a/admin/AppRestrictionSchema/Application/src/main/res/layout/fragment_app_restriction_schema.xml b/admin/AppRestrictionSchema/Application/src/main/res/layout/fragment_app_restriction_schema.xml
index 02d83e61..01bda925 100644
--- a/admin/AppRestrictionSchema/Application/src/main/res/layout/fragment_app_restriction_schema.xml
+++ b/admin/AppRestrictionSchema/Application/src/main/res/layout/fragment_app_restriction_schema.xml
@@ -68,15 +68,6 @@ limitations under the License.
             android:textAppearance="?android:attr/textAppearanceMedium"
             tools:text="@string/approvals_you_have"/>
 
-        <include layout="@layout/separator"/>
-
-        <TextView
-            android:id="@+id/your_profile"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            tools:text="@string/your_profile"/>
-
         <include layout="@layout/separator" android:id="@+id/bundle_array_separator" />
 
         <TextView
diff --git a/admin/AppRestrictionSchema/Application/src/main/res/values/restriction_values.xml b/admin/AppRestrictionSchema/Application/src/main/res/values/restriction_values.xml
index 53be7466..5870d9ce 100644
--- a/admin/AppRestrictionSchema/Application/src/main/res/values/restriction_values.xml
+++ b/admin/AppRestrictionSchema/Application/src/main/res/values/restriction_values.xml
@@ -34,36 +34,36 @@ limitations under the License.
     <!-- Choice restriction -->
     <string name="title_rank">Rank</string>
     <string name="description_rank">Rank of the user</string>
+    <string name="entry_rank_apprentice">Apprentice</string>
+    <string name="entry_rank_intermediate">Intermediate</string>
+    <string name="entry_rank_master">Master</string>
     <string-array name="entries_rank">
-        <item>Apprentice</item>
-        <item>Intermediate</item>
-        <item>Master</item>
+        <item>@string/entry_rank_apprentice</item>
+        <item>@string/entry_rank_intermediate</item>
+        <item>@string/entry_rank_master</item>
     </string-array>
-    <string name="entry_value_rank_apprentice">apprentice</string>
-    <string name="entry_value_rank_intermediate">intermediate</string>
-    <string name="entry_value_rank_master">master</string>
     <string-array name="entry_values_rank">
-        <item>@string/entry_value_rank_apprentice</item>
-        <item>@string/entry_value_rank_intermediate</item>
-        <item>@string/entry_value_rank_master</item>
+        <item>apprentice</item>
+        <item>intermediate</item>
+        <item>master</item>
     </string-array>
-    <string name="default_rank">@string/entry_value_rank_apprentice</string>
+    <string name="default_rank">apprentice</string>
 
     <!-- Multi-select restriction -->
     <string name="title_approvals">Approvals</string>
     <string name="description_approvals">Approvals</string>
+    <string name="entry_approvals_read">Read</string>
+    <string name="entry_approvals_write">Write</string>
+    <string name="entry_approvals_execute">Execute</string>
     <string-array name="entries_approvals">
-        <item>Read</item>
-        <item>Write</item>
-        <item>Execute</item>
+        <item>@string/entry_approvals_read</item>
+        <item>@string/entry_approvals_write</item>
+        <item>@string/entry_approvals_execute</item>
     </string-array>
-    <string name="entry_value_approvals_read">read</string>
-    <string name="entry_value_approvals_write">write</string>
-    <string name="entry_value_approvals_execute">execute</string>
     <string-array name="entry_values_approvals">
-        <item>@string/entry_value_approvals_read</item>
-        <item>@string/entry_value_approvals_write</item>
-        <item>@string/entry_value_approvals_execute</item>
+        <item>read</item>
+        <item>write</item>
+        <item>execute</item>
     </string-array>
     <string-array name="default_approvals">
         <!-- Empty -->
diff --git a/admin/AppRestrictionSchema/Application/src/main/res/values/strings.xml b/admin/AppRestrictionSchema/Application/src/main/res/values/strings.xml
index 1ec68d54..2fe68697 100644
--- a/admin/AppRestrictionSchema/Application/src/main/res/values/strings.xml
+++ b/admin/AppRestrictionSchema/Application/src/main/res/values/strings.xml
@@ -25,7 +25,6 @@ limitations under the License.
     <string name="your_rank">Your rank: %s</string>
     <string name="approvals_you_have">Approvals you have: %s</string>
     <string name="none">none</string>
-    <string name="your_profile">Your profile: %1$s (%2$d)</string>
     <string name="your_items">Your items: %s</string>
 
 </resources>
diff --git a/admin/AppRestrictionSchema/Application/src/main/res/xml/app_restrictions.xml b/admin/AppRestrictionSchema/Application/src/main/res/xml/app_restrictions.xml
index 1e2ea457..32ec8dea 100644
--- a/admin/AppRestrictionSchema/Application/src/main/res/xml/app_restrictions.xml
+++ b/admin/AppRestrictionSchema/Application/src/main/res/xml/app_restrictions.xml
@@ -72,26 +72,6 @@ limitations under the License.
         android:restrictionType="hidden"
         android:title="@string/title_secret_code"/>
 
-    <!-- Bundle restriction; useful for grouping restrictions -->
-    <restriction
-        android:description="@string/description_profile"
-        android:key="profile"
-        android:restrictionType="bundle"
-        android:title="@string/title_profile">
-        <restriction
-            android:defaultValue="@string/default_profile_name"
-            android:description="@string/description_profile_name"
-            android:key="name"
-            android:restrictionType="string"
-            android:title="@string/title_profile_name"/>
-        <restriction
-            android:defaultValue="@integer/default_profile_age"
-            android:description="@string/description_profile_age"
-            android:key="age"
-            android:restrictionType="integer"
-            android:title="@string/title_profile_age"/>
-    </restriction>
-
     <!-- Bundle array restriction -->
     <restriction
         android:description="@string/description_items"
diff --git a/admin/AppRestrictionSchema/gradle/wrapper/gradle-wrapper.properties b/admin/AppRestrictionSchema/gradle/wrapper/gradle-wrapper.properties
index f1713faf..e03dde33 100644
--- a/admin/AppRestrictionSchema/gradle/wrapper/gradle-wrapper.properties
+++ b/admin/AppRestrictionSchema/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 01 11:44:58 JST 2014
+#Fri Sep 09 09:39:55 JST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip