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

Commit 8aac75a7 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Clarify 'phoneCall' foreground service type" into sc-dev am: de39a2b6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14801156

Change-Id: Iebd5581e77d38c698571e268e7337257f26cd959
parents 54ef30cc de39a2b6

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

+2 −1
Original line number Diff line number Diff line
@@ -121,7 +121,8 @@ public class ServiceInfo extends ComponentInfo 
    /**

     * Constant corresponding to <code>phoneCall</code> in

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

     * Ongoing phone call or video conference.

     * Ongoing operations related to phone calls, video conferencing,

     * or similar interactive communication.

     */

    public static final int FOREGROUND_SERVICE_TYPE_PHONE_CALL = 1 << 2;

core/res/res/values/attrs_manifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -1549,7 +1549,8 @@ 
        <flag name="dataSync" value="0x01" />

        <!-- Music, video, news or other media play. -->

        <flag name="mediaPlayback" value="0x02" />

        <!-- Ongoing phone call or video conference. -->

        <!-- Ongoing operations related to phone calls, video conferencing,

             or similar interactive communication. -->

        <flag name="phoneCall" value="0x04" />

        <!-- GPS, map, navigation location update. -->

        <flag name="location" value="0x08" />