From ed79bf5d74009f0589407c0289e3c7f41488a0f3 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Mon, 6 Jul 2015 17:23:52 -0700 Subject: [PATCH] Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network. bug: 22229152 Change-Id: Ide02f0c3faafd37b8205f92df8a33a0bc95dd3d7 --- .../server/pm/DefaultPermissionGrantPolicy.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java index 453f123fd6353..551fc2bf35ac1 100644 --- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java @@ -33,6 +33,7 @@ import android.os.UserHandle; import android.provider.CalendarContract; import android.provider.ContactsContract; import android.provider.MediaStore; +import android.provider.Telephony.Sms.Intents; import android.util.ArraySet; import android.util.Log; @@ -364,6 +365,15 @@ final class DefaultPermissionGrantPolicy { } } + // Cell Broadcast Receiver + Intent cbrIntent = new Intent(Intents.SMS_CB_RECEIVED_ACTION); + PackageParser.Package cbrPackage = + getDefaultSystemHandlerActivityPackageLPr(cbrIntent, userId); + + if (cbrPackage != null && doesPackageSupportRuntimePermissions(cbrPackage)) { + grantRuntimePermissionsLPw(cbrPackage, SMS_PERMISSIONS, false, userId); + } + // Calendar Intent calendarIntent = new Intent(Intent.ACTION_MAIN); calendarIntent.addCategory(Intent.CATEGORY_APP_CALENDAR);