From ac530dd6911dc964c8e1abe7e3b0e9ed3260ab8a Mon Sep 17 00:00:00 2001 From: Hui Yu Date: Wed, 14 Dec 2022 19:17:33 +0000 Subject: [PATCH] Specify foreground service type and permissions for FGS under frameworks/base. TO meet the U requirement that apps targetSdkVersion U+ must specify foreground service type and permissions. Bug: 262580021 Test: build and run. Change-Id: I2e305c1945d3cc3dc4f0f8e4ef8b19dd2de636a5 --- .../AndroidManifest.xml | 2 ++ packages/PackageInstaller/AndroidManifest.xml | 3 +++ packages/Shell/AndroidManifest.xml | 4 ++++ packages/SystemUI/AndroidManifest.xml | 4 +++- .../test-apps/SimpleServiceTestApp/AndroidManifest.xml | 6 +++++- tests/FrameworkPerf/AndroidManifest.xml | 10 ++++++++++ tests/OneMedia/AndroidManifest.xml | 4 +++- 7 files changed, 30 insertions(+), 3 deletions(-) diff --git a/packages/DynamicSystemInstallationService/AndroidManifest.xml b/packages/DynamicSystemInstallationService/AndroidManifest.xml index 1765348292220..b194738c67b6d 100644 --- a/packages/DynamicSystemInstallationService/AndroidManifest.xml +++ b/packages/DynamicSystemInstallationService/AndroidManifest.xml @@ -3,6 +3,7 @@ android:sharedUserId="android.uid.system"> + @@ -19,6 +20,7 @@ android:enabled="true" android:exported="true" android:permission="android.permission.INSTALL_DYNAMIC_SYSTEM" + android:foregroundServiceType="systemExempted" android:process=":dynsystem"> diff --git a/packages/PackageInstaller/AndroidManifest.xml b/packages/PackageInstaller/AndroidManifest.xml index 696ea4a2c1644..9e249c4c79744 100644 --- a/packages/PackageInstaller/AndroidManifest.xml +++ b/packages/PackageInstaller/AndroidManifest.xml @@ -18,6 +18,8 @@ + + @@ -140,6 +142,7 @@ + + + diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index cefcf066d6416..2c9dad96b076b 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -170,6 +170,7 @@ + @@ -414,7 +415,8 @@ android:process=":screenshot_cross_profile" android:exported="false" /> - + diff --git a/services/tests/servicestests/test-apps/SimpleServiceTestApp/AndroidManifest.xml b/services/tests/servicestests/test-apps/SimpleServiceTestApp/AndroidManifest.xml index 1bc47759d0784..b1d0f3dee8c0b 100644 --- a/services/tests/servicestests/test-apps/SimpleServiceTestApp/AndroidManifest.xml +++ b/services/tests/servicestests/test-apps/SimpleServiceTestApp/AndroidManifest.xml @@ -18,13 +18,17 @@ package="com.android.servicestests.apps.simpleservicetestapp"> + + android:foregroundServiceType="specialUse" + android:exported="true"> + + diff --git a/tests/FrameworkPerf/AndroidManifest.xml b/tests/FrameworkPerf/AndroidManifest.xml index 07e775aeb8383..9696fc31469af 100644 --- a/tests/FrameworkPerf/AndroidManifest.xml +++ b/tests/FrameworkPerf/AndroidManifest.xml @@ -3,6 +3,16 @@ + + + + + + + + + + diff --git a/tests/OneMedia/AndroidManifest.xml b/tests/OneMedia/AndroidManifest.xml index 7fc352405212b..ddde6dbfefb04 100644 --- a/tests/OneMedia/AndroidManifest.xml +++ b/tests/OneMedia/AndroidManifest.xml @@ -7,6 +7,7 @@ + @@ -27,7 +28,8 @@ + android:process="com.android.onemedia.service" + android:foregroundServiceType="mediaPlayback"/>