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

am 6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev

Browse Source 
* commit '6b7a07848b21001a41aea1b6426ec2f75ea652ec':
  Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network.
This commit is contained in:
Jack Yu
2015-07-09 00:37:41 +00:00
committed by Android Git Automerger
parent 370c27c7fe 6b7a07848b
commit 379aa4389a
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
View File

@@ -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;
@@ -340,6 +341,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);