summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/ContextWrapper.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-06-16 17:18:23 -0700
committerDianne Hackborn <hackbod@google.com>2015-06-17 11:41:45 -0700
commita750a63d639f6936af456df904fa6b9ba941885e (patch)
tree41cd79aec0dedbf162eab2749bd6dec45bb7509d /core/java/android/content/ContextWrapper.java
parentf5820276635a2d3d2e3c694eddba7e6a02093a20 (diff)
downloadframeworks_base-a750a63d639f6936af456df904fa6b9ba941885e.zip
frameworks_base-a750a63d639f6936af456df904fa6b9ba941885e.tar.gz
frameworks_base-a750a63d639f6936af456df904fa6b9ba941885e.tar.bz2
Fix issue #21814207 and issue #21814212 (alarm manager)
Issue #21814207: AlarmManager.setAndAllowWhileIdle should also allow wake locks. Introduce a whole new infrastructure for providing options when sending broadcasts, much like ActivityOptions. There is a single option right now, asking the activity manager to apply a tempory whitelist to each receiver of the broadcast. Issue #21814212: Need to allow configuration of alarm manager parameters The various alarm manager timing configurations are not modifiable through settings, much like DeviceIdleController. Also did a few tweaks in the existing DeviceIdleController impl. Change-Id: Ifd01013185acc4de668617b1e46e78e30ebed041
Diffstat (limited to 'core/java/android/content/ContextWrapper.java')
-rw-r--r--core/java/android/content/ContextWrapper.java20
1 files changed, 20 insertions, 0 deletions
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index fb9e194..4e7c832 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -16,6 +16,7 @@
package android.content;
+import android.annotation.SystemApi;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.res.AssetManager;
@@ -401,6 +402,13 @@ public class ContextWrapper extends Context {
}
/** @hide */
+ @SystemApi
+ @Override
+ public void sendBroadcast(Intent intent, String receiverPermission, Bundle options) {
+ mBase.sendBroadcast(intent, receiverPermission, options);
+ }
+
+ /** @hide */
@Override
public void sendBroadcast(Intent intent, String receiverPermission, int appOp) {
mBase.sendBroadcast(intent, receiverPermission, appOp);
@@ -423,6 +431,18 @@ public class ContextWrapper extends Context {
}
/** @hide */
+ @SystemApi
+ @Override
+ public void sendOrderedBroadcast(
+ Intent intent, String receiverPermission, Bundle options, BroadcastReceiver resultReceiver,
+ Handler scheduler, int initialCode, String initialData,
+ Bundle initialExtras) {
+ mBase.sendOrderedBroadcast(intent, receiverPermission,
+ options, resultReceiver, scheduler, initialCode,
+ initialData, initialExtras);
+ }
+
+ /** @hide */
@Override
public void sendOrderedBroadcast(
Intent intent, String receiverPermission, int appOp, BroadcastReceiver resultReceiver,