diff options
author | Dianne Hackborn <hackbod@google.com> | 2015-06-16 17:18:23 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2015-06-17 11:41:45 -0700 |
commit | a750a63d639f6936af456df904fa6b9ba941885e (patch) | |
tree | 41cd79aec0dedbf162eab2749bd6dec45bb7509d /cmds/am | |
parent | f5820276635a2d3d2e3c694eddba7e6a02093a20 (diff) | |
download | frameworks_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 'cmds/am')
-rw-r--r-- | cmds/am/src/com/android/commands/am/Am.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index bf3b455..69ba27c 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -1002,7 +1002,7 @@ public class Am extends BaseCommand { IntentReceiver receiver = new IntentReceiver(); System.out.println("Broadcasting: " + intent); mAm.broadcastIntent(null, intent, null, receiver, 0, null, null, mReceiverPermission, - android.app.AppOpsManager.OP_NONE, true, false, mUserId); + android.app.AppOpsManager.OP_NONE, null, true, false, mUserId); receiver.waitForFinish(); } @@ -1658,7 +1658,7 @@ public class Am extends BaseCommand { Intent intent = new Intent( "com.android.server.task.controllers.IdleController.ACTION_TRIGGER_IDLE"); mAm.broadcastIntent(null, intent, null, null, 0, null, null, null, - android.app.AppOpsManager.OP_NONE, true, false, UserHandle.USER_ALL); + android.app.AppOpsManager.OP_NONE, null, true, false, UserHandle.USER_ALL); } private void runScreenCompat() throws Exception { |