Merge "Put VPN settings under primary profile control" into lmp-dev

2014-09-04 12:38:48 +00:00
parent 1e0ea45263 131b497f58
commit c91d2cd082
1 changed files with 2 additions and 0 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -406,6 +406,8 @@
                android:value="com.android.settings.vpn2.VpnSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/wireless_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
        </activity>

        <activity android:name="Settings$DateTimeSettingsActivity"