OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f14fa7e
)
Put VPN settings under primary profile control
author
Zoltan Szatmary-Ban
<szatmz@google.com>
Mon, 18 Aug 2014 12:48:15 +0000
(13:48 +0100)
committer
Zoltan Szatmary-Ban
<szatmz@google.com>
Mon, 18 Aug 2014 12:48:15 +0000
(13:48 +0100)
Bug:
16030111
Change-Id: If9815b8c9486e47bb860ff941ef5469ec6145ad6
AndroidManifest.xml
patch
|
blob
|
history
diff --git
a/AndroidManifest.xml
b/AndroidManifest.xml
index
27738c3
..
c667909
100644
(file)
--- a/
AndroidManifest.xml
+++ b/
AndroidManifest.xml
@@
-407,6
+407,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"