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

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

Merge "ServiceInfo: Add a new foreground service type for MediaProjection."

parents 4ef578f3 06265a3b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11945,6 +11945,7 @@ package android.content.pm { 
    field public static final int FOREGROUND_SERVICE_TYPE_LOCATION = 8; // 0x8

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

    field public static final int FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK = 2; // 0x2

    field public static final int FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION = 32; // 0x20

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

    field public static final int FOREGROUND_SERVICE_TYPE_PHONE_CALL = 4; // 0x4

    field public int flags;

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

+8 −0
Original line number Diff line number Diff line
@@ -139,6 +139,13 @@ public class ServiceInfo extends ComponentInfo 
     */

    public static final int FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE = 1 << 4;



    /**

     * Constant corresponding to {@code mediaProjection} in

     * the {@link android.R.attr#foregroundServiceType} attribute.

     * Managing a media projection session, e.g for screen recording or taking screenshots.

     */

    public static final int FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION = 1 << 5;



    /**

     * A special value indicates to use all types set in manifest file.

     */
@@ -158,6 +165,7 @@ public class ServiceInfo extends ComponentInfo 
            FOREGROUND_SERVICE_TYPE_PHONE_CALL,

            FOREGROUND_SERVICE_TYPE_LOCATION,

            FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE,

            FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ForegroundServiceType {}

core/res/res/values/attrs_manifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -1473,6 +1473,9 @@ 
        <flag name="location" value="0x08" />

        <!-- Auto, bluetooth, TV or other devices connection, monitoring and interaction. -->

        <flag name="connectedDevice" value="0x10" />

        <!-- Managing a media projection session, e.g, for screen recording or taking

             screenshots.-->

        <flag name="mediaProjection" value="0x20" />

    </attr>