Merge branch '909-restrict-access-to-settings-activity' into 'master'

Require a system permission to open the settings activity

See merge request !501
This commit is contained in:
Torsten Grote
2017-03-30 12:58:07 +00:00

View File

@@ -333,7 +333,8 @@
<activity <activity
android:name=".android.settings.SettingsActivity" android:name=".android.settings.SettingsActivity"
android:label="@string/settings_button" android:label="@string/settings_button"
android:parentActivityName=".android.navdrawer.NavDrawerActivity"> android:parentActivityName=".android.navdrawer.NavDrawerActivity"
android:permission="android.permission.READ_NETWORK_USAGE_HISTORY">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value=".android.navdrawer.NavDrawerActivity" android:value=".android.navdrawer.NavDrawerActivity"