From 412e56367122834ba799c27381912ea62e579399 Mon Sep 17 00:00:00 2001
From: Hui Yu <huiyu@google.com>
Date: Mon, 19 Dec 2022 18:07:53 +0000
Subject: [PATCH] Specify foreground service type and permissions for FGS under
 development/samples

TO meet the U requirement that apps targetSdkVersion U+ must specify
foreground service type and permissions.

Bug: 262580021
Test: build and run.
Change-Id: I0e6bf918b17eee82bdb2669a8c28e17e327a728f
---
 samples/ToyVpn/AndroidManifest.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/samples/ToyVpn/AndroidManifest.xml b/samples/ToyVpn/AndroidManifest.xml
index 5f1cc2b09..3d430ab56 100644
--- a/samples/ToyVpn/AndroidManifest.xml
+++ b/samples/ToyVpn/AndroidManifest.xml
@@ -18,6 +18,7 @@
         package="com.example.android.toyvpn">
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <uses-sdk android:minSdkVersion="14"/>
@@ -33,7 +34,9 @@
         </activity>
 
         <service android:name=".ToyVpnService"
-                android:permission="android.permission.BIND_VPN_SERVICE">
+            android:permission="android.permission.BIND_VPN_SERVICE"
+            android:foregroundServiceType="specialUse">
+            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="vpn" />
             <intent-filter>
                 <action android:name="android.net.VpnService"/>
             </intent-filter>