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

Commit 61e40ee7 authored by Varun Shah's avatar Varun Shah Committed by Android (Google) Code Review
Browse files

Merge "Remove flag usages of media processing fgs type." into main

parents 598f56e0 a7b12166

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ package android { 
    field public static final String FOREGROUND_SERVICE_HEALTH = "android.permission.FOREGROUND_SERVICE_HEALTH";

    field public static final String FOREGROUND_SERVICE_LOCATION = "android.permission.FOREGROUND_SERVICE_LOCATION";

    field public static final String FOREGROUND_SERVICE_MEDIA_PLAYBACK = "android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK";

    field @FlaggedApi("android.content.pm.introduce_media_processing_type") public static final String FOREGROUND_SERVICE_MEDIA_PROCESSING = "android.permission.FOREGROUND_SERVICE_MEDIA_PROCESSING";

    field public static final String FOREGROUND_SERVICE_MEDIA_PROCESSING = "android.permission.FOREGROUND_SERVICE_MEDIA_PROCESSING";

    field public static final String FOREGROUND_SERVICE_MEDIA_PROJECTION = "android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION";

    field public static final String FOREGROUND_SERVICE_MICROPHONE = "android.permission.FOREGROUND_SERVICE_MICROPHONE";

    field public static final String FOREGROUND_SERVICE_PHONE_CALL = "android.permission.FOREGROUND_SERVICE_PHONE_CALL";
@@ -14141,7 +14141,7 @@ package android.content.pm { 
    field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_LOCATION}, anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_LOCATION = 8; // 0x8

    field public static final int FOREGROUND_SERVICE_TYPE_MANIFEST = -1; // 0xffffffff

    field @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK = 2; // 0x2

    field @FlaggedApi("android.content.pm.introduce_media_processing_type") @RequiresPermission(android.Manifest.permission.FOREGROUND_SERVICE_MEDIA_PROCESSING) public static final int FOREGROUND_SERVICE_TYPE_MEDIA_PROCESSING = 8192; // 0x2000

    field @RequiresPermission(android.Manifest.permission.FOREGROUND_SERVICE_MEDIA_PROCESSING) public static final int FOREGROUND_SERVICE_TYPE_MEDIA_PROCESSING = 8192; // 0x2000

    field @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION = 32; // 0x20

    field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_MICROPHONE}, anyOf={android.Manifest.permission.CAPTURE_AUDIO_OUTPUT, android.Manifest.permission.RECORD_AUDIO}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_MICROPHONE = 128; // 0x80

    field @Deprecated public static final int FOREGROUND_SERVICE_TYPE_NONE = 0; // 0x0

core/java/android/content/pm/ServiceInfo.java

+0 −1
Original line number Diff line number Diff line
@@ -538,7 +538,6 @@ public class ServiceInfo extends ComponentInfo 
    @RequiresPermission(

            value = Manifest.permission.FOREGROUND_SERVICE_MEDIA_PROCESSING

    )

    @FlaggedApi(Flags.FLAG_INTRODUCE_MEDIA_PROCESSING_TYPE)

    public static final int FOREGROUND_SERVICE_TYPE_MEDIA_PROCESSING = 1 << 13;



    /**

core/res/AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -8133,8 +8133,7 @@ 
        android:label="@string/permlab_foregroundServiceFileManagement"

        android:protectionLevel="normal|instant" />













    <!-- @FlaggedApi("android.content.pm.introduce_media_processing_type")













         Allows a regular application to use {@link android.app.Service#startForeground













    <!-- Allows a regular application to use {@link android.app.Service#startForeground















         Service.startForeground} with the type "mediaProcessing".















         <p>Protection level: normal|instant















    -->