Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clarify 'phoneCall' foreground service type" into sc-dev am: de39a2b610 am: 8aac75a7f9

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

Change-Id: I7b3ee2653d71e56408b7a1cfae366ca25c515d56
This commit is contained in:
Jeff Sharkey
2021-06-04 10:40:56 +00:00
committed by Automerger Merge Worker
parent 5404ef1290 8aac75a7f9
commit e6b84f1efe
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/pm/ServiceInfo.java
View File

@@ -121,7 +121,8 @@ public class ServiceInfo extends ComponentInfo
/** /**
* Constant corresponding to <code>phoneCall</code> in * Constant corresponding to <code>phoneCall</code> in
* the {@link android.R.attr#foregroundServiceType} attribute. * 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; public static final int FOREGROUND_SERVICE_TYPE_PHONE_CALL = 1 << 2;

3
core/res/res/values/attrs_manifest.xml
View File

@@ -1549,7 +1549,8 @@
<flag name="dataSync" value="0x01" /> <flag name="dataSync" value="0x01" />
<!-- Music, video, news or other media play. --> <!-- Music, video, news or other media play. -->
<flag name="mediaPlayback" value="0x02" /> <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" /> <flag name="phoneCall" value="0x04" />
<!-- GPS, map, navigation location update. --> <!-- GPS, map, navigation location update. -->
<flag name="location" value="0x08" /> <flag name="location" value="0x08" />