Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e58bd06 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Specify foreground service type and permissions for FGS under frameworks/base."

parents 0b6a4209 ac530dd6

packages/DynamicSystemInstallationService/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
        android:sharedUserId="android.uid.system">



    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED"/>

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.MANAGE_DYNAMIC_SYSTEM" />

    <uses-permission android:name="android.permission.REBOOT" />
@@ -19,6 +20,7 @@ 
            android:enabled="true"

            android:exported="true"

            android:permission="android.permission.INSTALL_DYNAMIC_SYSTEM"

            android:foregroundServiceType="systemExempted"

            android:process=":dynsystem">

            <intent-filter>

                <action android:name="android.os.image.action.NOTIFY_IF_IN_USE" />

packages/PackageInstaller/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />

    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />

    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />



    <uses-permission android:name="com.google.android.permission.INSTALL_WEARABLE_PACKAGES" />
@@ -140,6 +142,7 @@ 
        <!-- Wearable Components -->

        <service android:name=".wear.WearPackageInstallerService"

                 android:permission="com.google.android.permission.INSTALL_WEARABLE_PACKAGES"

                 android:foregroundServiceType="systemExempted"

                 android:exported="true"/>



        <provider android:name=".wear.WearPackageIconProvider"

packages/Shell/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -795,6 +795,9 @@ 
    <!-- Permission required for CTS test - CtsPackageInstallTestCases-->

    <uses-permission android:name="android.permission.GET_APP_METADATA" />



    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED"/>



    <application android:label="@string/app_label"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:defaultToDeviceProtectedStorage="true"
@@ -872,6 +875,7 @@ 


        <service

            android:name=".BugreportProgressService"

            android:foregroundServiceType="systemExempted"

            android:exported="false"/>

    </application>

</manifest>

packages/SystemUI/AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ 


    <!-- Screen Recording -->

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />

    <uses-permission android:name="android.permission.RECORD_AUDIO" />

    <uses-permission android:name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
@@ -414,7 +415,8 @@ 
                 android:process=":screenshot_cross_profile"

                 android:exported="false" />



        <service android:name=".screenrecord.RecordingService" />

        <service android:name=".screenrecord.RecordingService"

                 android:foregroundServiceType="systemExempted"/>



        <receiver android:name=".SysuiRestartReceiver"

            android:exported="false">

services/tests/servicestests/test-apps/SimpleServiceTestApp/AndroidManifest.xml

+5 −1
Original line number Diff line number Diff line
@@ -18,13 +18,17 @@ 
        package="com.android.servicestests.apps.simpleservicetestapp">



    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>

    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />



    <application>

        <service android:name=".SimpleService"

                 android:exported="true" />

        <service android:name=".SimpleFgService"

                 android:exported="true" />

                 android:foregroundServiceType="specialUse"

                 android:exported="true">

            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="test" />

        </service>

        <service android:name=".SimpleIsolatedService"

                 android:isolatedProcess="true"

                 android:exported="true" />