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

Merge "Allow apps receiving media button events to start FGS from BG." into sc-dev am: 5ac0513b61

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0cd5b1166e7c98f1ff9e5c2801aa279a244f32e
This commit is contained in:
Sudheer Shanka
2021-02-08 23:58:49 +00:00
committed by Automerger Merge Worker
parent 2cdf82e53e 5ac0513b61
commit 19883cc3a4
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/media/MediaButtonReceiverHolder.java
View File

@@ -18,6 +18,7 @@ package com.android.server.media;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.app.BroadcastOptions;
import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
@@ -62,6 +63,13 @@ final class MediaButtonReceiverHolder {
private static final int PACKAGE_MANAGER_COMMON_FLAGS =
PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
/**
* Denotes the duration during which a media button receiver will be exempted from
* FGS-from-BG restriction and so will be allowed to start an FGS even if it is in the
* background state while it receives a media key event.
*/
private static final long FGS_STARTS_TEMP_ALLOWLIST_DURATION_MS = 10_000;
private final int mUserId;
private final PendingIntent mPendingIntent;
private final ComponentName mComponentName;
@@ -186,6 +194,9 @@ final class MediaButtonReceiverHolder {
// TODO: Find a way to also send PID/UID in secure way.
mediaButtonIntent.putExtra(Intent.EXTRA_PACKAGE_NAME, callingPackageName);
final BroadcastOptions options = BroadcastOptions.makeBasic();
options.setTemporaryAppWhitelistDuration(
FGS_STARTS_TEMP_ALLOWLIST_DURATION_MS);
if (mPendingIntent != null) {
if (DEBUG_KEY_EVENT) {
Log.d(TAG, "Sending " + keyEvent + " to the last known PendingIntent "
@@ -193,7 +204,8 @@ final class MediaButtonReceiverHolder {
}
try {
mPendingIntent.send(
context, resultCode, mediaButtonIntent, onFinishedListener, handler);
context, resultCode, mediaButtonIntent, onFinishedListener, handler,
/* requiredPermission= */ null, options.toBundle());
} catch (PendingIntent.CanceledException e) {
Log.w(TAG, "Error sending key event to media button receiver " + mPendingIntent, e);
return false;
@@ -216,7 +228,8 @@ final class MediaButtonReceiverHolder {
break;
default:
// Legacy behavior for other cases.
context.sendBroadcastAsUser(mediaButtonIntent, userHandle);
context.sendBroadcastAsUser(mediaButtonIntent, userHandle,
/* receiverPermission= */ null, options.toBundle());
}
} catch (Exception e) {
Log.w(TAG, "Error sending media button to the restored intent "