418017e5f9
This change adds a new VPN user consent flow (using the same text) for granting the lesser OP_ACTIVATE_PLATFORM_VPN. A new PlatformVpnConfirmDialog is created as a subclass to preserve all logic, but ensure the right appop is granted for the relevant dialog. Intent extras were considered, but are inherently unsafe, since the caller may add any extras that they would want. Bug: 144246835 Test: FrameworksNetTests passing Change-Id: Ia6f36207d43c3748f938430c2780dcf29e5623f3
63 lines
2.6 KiB
XML
63 lines
2.6 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
/*
|
|
* Copyright (c) 2014 Google Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
-->
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
package="com.android.vpndialogs">
|
|
|
|
<uses-permission android:name="android.permission.CONTROL_VPN" />
|
|
<uses-permission android:name="android.permission.CONTROL_ALWAYS_ON_VPN" />
|
|
<uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
|
|
|
|
<application android:label="VpnDialogs"
|
|
android:allowBackup="false">
|
|
|
|
<activity android:name=".ConfirmDialog"
|
|
android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
|
|
<intent-filter>
|
|
<action android:name="android.intent.action.MAIN"/>
|
|
<category android:name="android.intent.category.DEFAULT"/>
|
|
</intent-filter>
|
|
</activity>
|
|
|
|
<activity android:name=".PlatformVpnConfirmDialog"
|
|
android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
|
|
android:noHistory="true"
|
|
android:excludeFromRecents="true"
|
|
android:exported="true">
|
|
</activity>
|
|
|
|
<activity android:name=".ManageDialog"
|
|
android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
|
|
android:noHistory="true"
|
|
android:excludeFromRecents="true"
|
|
android:permission="android.permission.NETWORK_SETTINGS"
|
|
android:exported="true">
|
|
</activity>
|
|
|
|
<activity android:name=".AlwaysOnDisconnectedDialog"
|
|
android:label="@string/always_on_disconnected_title"
|
|
android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
|
|
android:noHistory="true"
|
|
android:excludeFromRecents="true"
|
|
android:permission="android.permission.NETWORK_SETTINGS"
|
|
android:exported="true">
|
|
</activity>
|
|
|
|
</application>
|
|
</manifest>
|