From c49c3b993fe9a1c262686a23704fb29aed180759 Mon Sep 17 00:00:00 2001
From: Chen Xu <fionaxu@google.com>
Date: Thu, 10 Jun 2021 14:43:21 -0700
Subject: [PATCH] improvements of CBR on compainion devices

improve cbr on companion devices by display notification only when there is an active
bluetooth connections. If devices target on S+, it requires a new
runtime permission bluetooth_connect, grant those runtime permission for
default emergency alert module.

Bug: 181773113
Test: Manual test
Change-Id: Ie4d70e1d23e20015f6085db05ca8523b1f3c2ad4
---
 .../server/pm/permission/DefaultPermissionGrantPolicy.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
index bad7e5c27b7b5..dab980a9e4b28 100644
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -641,7 +641,7 @@ final class DefaultPermissionGrantPolicy {
         // Cell Broadcast Receiver
         grantSystemFixedPermissionsToSystemPackage(pm,
                 getDefaultSystemHandlerActivityPackage(pm, Intents.SMS_CB_RECEIVED_ACTION, userId),
-                userId, SMS_PERMISSIONS);
+                userId, SMS_PERMISSIONS, NEARBY_DEVICES_PERMISSIONS);
 
         // Carrier Provisioning Service
         grantPermissionsToSystemPackage(pm,