summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author android-build-team Robot <android-build-team-robot@google.com> 2021-01-09 01:51:04 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 2021-01-09 01:51:04 +0000
commite57fac5e8f1fd1d4a817482076b3a7aaabea9920 (patch)
tree04e79f08d15a60c42079f02ec57f20b5eebe4766
parentb18f2f5c66b83403ca3457f7c8283489c4f0a5dd (diff)
parente39e55449455c728adcb8e528d21bee50b98c4b3 (diff)
Merge cherrypicks of [13307953, 13308437, 13309644, 13308319, 13308320, 13307954, 13307955, 13309645, 13307572, 13307573, 13307574, 13308321, 13309664] into rvc-qpr2-release
Change-Id: I18139fb3479b7ecbb74d0298f9a48ae1c7389ddf
-rw-r--r--core/java/android/provider/CalendarContract.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java
index 17fae1cafe62..5e3f852229b7 100644
--- a/core/java/android/provider/CalendarContract.java
+++ b/core/java/android/provider/CalendarContract.java
@@ -39,6 +39,7 @@ import android.database.Cursor;
import android.database.DatabaseUtils;
import android.net.Uri;
import android.os.RemoteException;
+import android.os.StrictMode;
import android.text.format.DateUtils;
import android.text.format.TimeMigrationUtils;
import android.util.Log;
@@ -2618,7 +2619,13 @@ public final class CalendarContract {
intent.setData(ContentUris.withAppendedId(CalendarContract.CONTENT_URI, alarmTime));
intent.putExtra(ALARM_TIME, alarmTime);
intent.setFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
+
+ // Disable strict mode VM policy violations temporarily for intents that contain a
+ // content URI but don't have FLAG_GRANT_READ_URI_PERMISSION.
+ StrictMode.VmPolicy oldVmPolicy = StrictMode.allowVmViolations();
PendingIntent pi = PendingIntent.getBroadcast(context, 0, intent, 0);
+ StrictMode.setVmPolicy(oldVmPolicy);
+
manager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, alarmTime, pi);
}