17688 Commits

Author SHA1 Message Date
Prashant Malani
31363809b8 Merge "Change display state modification during dozing" 2014-06-05 23:02:42 +00:00
Matthew Williams
5ca8f2f005 Include forgotten file to fix build.
Change-Id: I4a5ddb6063e5feb18d95ee5c7fe7a126ca59d3b9
2014-06-05 14:34:53 -07:00
Justin Koh
92e49599e9 am c7a5d4a9: am 8200b667: Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev
* commit 'c7a5d4a920a7cd865da93ba56c35403c43c69971':
  Revert "Add check to allow notification listener packages to post >50 notifications"
2014-06-05 20:09:56 +00:00
Matthew Williams
38b200fe6c am 1a2f47d4: Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev
* commit '1a2f47d4cdc0ea40dff1b88f7976d64c19d687b1':
  Add persistence of tasks for TaskManager & BatteryController
2014-06-05 20:08:54 +00:00
Justin Koh
c7a5d4a920 am 8200b667: Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev
* commit '8200b667ea75b7d5353343f9e2f22e33b373077e':
  Revert "Add check to allow notification listener packages to post >50 notifications"
2014-06-05 20:05:08 +00:00
Justin Koh
8200b667ea Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev 2014-06-05 19:03:33 +00:00
Justin Koh
500a6b0ca6 Revert "Add check to allow notification listener packages to post >50 notifications"
Broke build.

This reverts commit 2dbd36fc7f9341ecef51c2ed96a0f21b046f5a8d.

Change-Id: I2fdf1de21b6598f85bbd94acef44e771b2df9f42
2014-06-05 19:02:47 +00:00
Matthew Williams
3d86fd2bb9 Add persistence of tasks for TaskManager & BatteryController
Tasks are persisted only if the client has the RECEIVE_BOOT_COMPLETED
permission. This applies to both periodic and one-off tasks.
Write out task as xml, using PersistableBundle for the extras data.
Todo: Add persistable bundle to xml when ag/468207 is merged.

Also added BatteryController logic.

Change-Id: I23eeeb8b3bc6ba155e7fa4ec25857a68ee8b1567
2014-06-05 18:28:43 +00:00
Justin Koh
29dee1bbba am 2304bf4c: am 2be3d6f9: Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev
* commit '2304bf4cd4e377994d80f55871fd31f82bb4f646':
  Add check to allow notification listener packages to post >50 notifications
2014-06-05 18:14:01 +00:00
Justin Koh
2304bf4cd4 am 2be3d6f9: Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev
* commit '2be3d6f9361311c1d272965afcd602ae12c769af':
  Add check to allow notification listener packages to post >50 notifications
2014-06-05 18:10:01 +00:00
Justin Koh
2be3d6f936 Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev 2014-06-05 18:06:46 +00:00
Chris Wren
38f650818a am 413edd50: Merge "Disable the attention light on devices that do not have it." into lmp-preview-dev
* commit '413edd50540a7890949c5370d18f293f2e6f8841':
  Disable the attention light on devices that do not have it.
2014-06-05 18:00:02 +00:00
Kenny Guy
8a4a1f2d80 Merge "Fix bug with sending intents to correct user for device admin." 2014-06-05 17:29:40 +00:00
Kenny Guy
73a41d2c4e Fix bug with sending intents to correct user for device admin.
Password change intents etc. were always being sent to
owner rather than user the device admin was installed for.
Also add TODO to not assume profile parent is OWNER.

Bug: 15442331
Change-Id: I7e58069bc4a6ab94f038ae1b80c044d666986318
2014-06-05 18:10:43 +01:00
Chris Wren
b5acfc6c4a am 89dcfe66: Merge "A notification that emerges from Zen Mode interception should beep." into lmp-preview-dev
* commit '89dcfe66c9101a4124d121d1c8df98e5cd8b7798':
  A notification that emerges from Zen Mode interception should beep.
2014-06-05 16:51:29 +00:00
Chris Wren
5116a821b9 Disable the attention light on devices that do not have it.
If the attention and notificaiton light are mapped to the same
physical LED, then pulsing the attention light can turn off the
notification light. See bug for detailed discussion.

Bug: 12900389
Change-Id: I2703af23f50ecc3e92140b9843aaf340d520bce5
2014-06-05 12:38:13 -04:00
Chris Wren
a344656a01 A notification that emerges from Zen Mode interception should beep.
If a notificaiton emerges from Zen Mode due to a ranking
reconsideration (possibly because a long-running query resolved an
important person) then it should get the oportunity buzz, beep, blink,
and send accessibility events.

Save what we need to know about the old notificaiton record on the new
record so we don't have to hold onto it.

Bug: 15383458
Change-Id: I15c7834fef03ff6a676e78e9d2caae24f00720ef
2014-06-05 12:38:13 -04:00
Mike Lockwood
585fc71ea7 Merge "UsbDebuggingManager: remove log spam when disconnecting USB" 2014-06-05 15:34:48 +00:00
Mike Lockwood
2471e02c19 UsbDebuggingManager: remove log spam when disconnecting USB
Bug: 15112047
Change-Id: Ia07895ee166fa87c88d0443f0745bc9384dac10c
2014-06-05 08:24:16 -07:00
Yohei Yukawa
bd12056154 Merge "Trivial method renaming for notifyTextCommitted" 2014-06-05 15:20:53 +00:00
Yohei Yukawa
0297051162 Trivial method renaming for notifyTextCommitted
This CL does not change existing behavior but only renames
notifyTextCommitted with notifyUserAction so that we can use
not only text commit but also other actions such as just typing
a character will be used as a trigger to update the IME
rotation order for better IME switching experience.

BUG: 7043015
Change-Id: I7f3e13a7226ef0dceee82b67e8a0d8536f7e9807
2014-06-05 23:07:05 +09:00
Adam Connors
d5259c8ea5 Merge "Allow system process to call getApplicationBlockedAsUser" 2014-06-05 11:20:16 +00:00
Adam Connors
1a910ef2b4 Allow system process to call getApplicationBlockedAsUser
MDMs in the managed profile needs to be able to call
DPM.isApplicationBlocked without the INTERACT_ACROSS_USERS
permission. DevicePolicyManager checks for appropriate
PROFILE_OWNER permission and then removes callerId, so this
change is needed to prevent a spurious security exception.

Change-Id: Idd1bda6bb234f6cb7cb78a885ae2d7cc5cca4890
2014-06-05 12:02:04 +01:00
Justin Koh
2dbd36fc7f Add check to allow notification listener packages to post >50 notifications
Bug: 13433398
Change-Id: I77abf19982add240e1bbe8196fbe148d32884f68
2014-06-04 21:14:26 -07:00
Craig Mautner
b6011c1c2a Merge commit '21483b9f' into manualmerge
Change-Id: If9261cc1625f9f492697fe16c21d2b71c0cc0e11
2014-06-04 20:59:13 -07:00
Craig Mautner
21483b9f0b am e34fcf8f: Merge "Add callback when ActivityView activities complete" into klp-modular-dev
* commit 'e34fcf8ff9a023641505a8decdeb1b77232d8a16':
  Add callback when ActivityView activities complete
2014-06-05 03:31:06 +00:00
Craig Mautner
e34fcf8ff9 Merge "Add callback when ActivityView activities complete" into klp-modular-dev 2014-06-05 03:28:21 +00:00
Jungshik Jang
0f8b4b770c Implement hotplug detection sequence.
Hotplug detection is periodic operation to detect new/removed device.
In case of directly connected device fires hotplug devices
but remote devices which are plugged in hdmi switch may not
report their existence.
Hotplug action polls all devices in regular base; 5s for
system audio (only when it's active) 15s for others.

Change-Id: I77c308ecfd5d6bf92f306923fa5ac9eabdad4127
2014-06-05 10:36:35 +09:00
Jungshik Jang
3ee65720e9 Refactor HdmiCecLocalDevice and logical address allocation logic.
1. Factor out logical allocation logic to HdmiControlService.
2. Contains a reference to HdmiControlService rather than
  HdmiCecController so that it enables to access service's logic
  directly.
3. Move launch device discovery logic to HdmiCecLocalDeviceTv.

Change-Id: Ic97b4d51311a3c18f6d586c2245cac410cbd370e
2014-06-05 10:19:05 +09:00
Craig Mautner
d94b47f3b6 Add callback when ActivityView activities complete
Users of ActivityViews can now be informed when there are no more
active activities in ActivityView by registering a callback.

Fixes bug 15330616.

Change-Id: I39d55bdb0db8b0a12ee751cdcb039b7fbb899c85
2014-06-04 17:25:49 -07:00
Prashant Malani
6a5cacb868 Change display state modification during dozing
Check that the BrightnessRamp animation has completed before updating
the display state to STATE_DOZING.

Bug: 13472578
Change-Id: Ib9751f7a987463e4df98571e846d829ec8e73b5e
Signed-off-by: Prashant Malani <pmalani@google.com>
2014-06-04 17:14:31 -07:00
Matthew Williams
64939ae385 DO NOT MERGE Redact SyncService stuff from master
Cherry-pick over from master.
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851

Change-Id: Ieebbbcd3324827098e88b36e45e6e82315a51e65
2014-06-04 22:46:25 +00:00
Matthew Williams
4b8bb98d63 Merge "Redact SyncService stuff from master" 2014-06-04 22:45:24 +00:00
Matthew Williams
5a9decd589 Redact SyncService stuff from master
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851
Change-Id: Ibefbb246f0e98d3159399151744279902468a23c
2014-06-04 14:55:53 -07:00
Robin Lee
7f2d5162fd am c774caff: am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes"
* commit 'c774caff86d2e5dc5ca3a0008007cb0fd384568b':
  Assign AID_EVERYONE gid to newly-created processes
2014-06-04 21:13:24 +00:00
Robin Lee
c774caff86 am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes"
* commit '4891a9f9cfee569c0d362f1781f44493f5e320c0':
  Assign AID_EVERYONE gid to newly-created processes
2014-06-04 21:09:52 +00:00
Robin Lee
e46e600412 Merge "Assign AID_EVERYONE gid to newly-created processes" 2014-06-04 20:51:55 +00:00
Adrian Roos
b4df2f586a am b2302d43: Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev
* commit 'b2302d437fd636d9973f466062cfad145cdd042d':
  Ensure trust agents are only provided by platform packages
2014-06-04 20:04:55 +00:00
Robert Greenwalt
8ae980dcef DO NOT MERGE Report new network scores back to factories.
This is a first order approx of what we want - should probably be good enough in most cases.

bug:15277751

Change-Id: I10e3b25f6ad5c7e022ba966ed514d4e6a999180d
(cherry picked from commit 94a5c61cb82401dd777d0a7ac43183d92d955323)
2014-06-04 19:15:17 +00:00
Robert Greenwalt
a995aba36f Merge "Report new network scores back to factories." 2014-06-04 18:48:44 +00:00
Robert Greenwalt
52dea94557 am cffe6d73: Merge "Fix legacy APIs." into lmp-preview-dev
* commit 'cffe6d7315bc364d913e6a7daf1b62b7d173bfb7':
  Fix legacy APIs.
2014-06-04 18:44:59 +00:00
Dianne Hackborn
ed021011dd am b96802d0: Merge "Force write battery stats after a --history-since." into lmp-preview-dev
* commit 'b96802d03cc5eb047a2be711a8d14d82498753e7':
  Force write battery stats after a --history-since.
2014-06-04 18:44:37 +00:00
Craig Mautner
f3f8a73a57 am 05cd6c39: Merge "Force all windows to redraw before unblanking screen" into lmp-preview-dev
* commit '05cd6c39824653e0f7e8641444a7134e8cac72f4':
  Force all windows to redraw before unblanking screen
2014-06-04 18:44:16 +00:00
John Spurlock
7b92af62b8 am 7e127344: Zen: Stateful condition panel.
* commit '7e12734486152ee4f6467e13e6b4cdd3a9c7bf8d':
  Zen: Stateful condition panel.
2014-06-04 18:43:37 +00:00
Robert Greenwalt
ac96c52350 Report new network scores back to factories.
This is a first order approx of what we want - should probably be good enough in most cases.

bug:15277751

Change-Id: I10e3b25f6ad5c7e022ba966ed514d4e6a999180d
2014-06-04 18:38:01 +00:00
Chris Wren
30591cc1ab am 1e58ac1d: Merge "Apply Zen Mode later, after we\'ve found the old record." into lmp-preview-dev
* commit '1e58ac1d71b630435c3e69180d9e92662c6f65dd':
  Apply Zen Mode later, after we've found the old record.
2014-06-04 18:08:48 +00:00
Dongwon Kang
450758a55c am 65d95bfa: Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application." into lmp-preview-dev
* commit '65d95bfa011fa50e50403f41e08afa2af5d9746e':
  Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.
2014-06-04 17:01:47 +00:00
Adrian Roos
1e9021aef8 Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev 2014-06-04 13:18:40 +00:00
Yohei Yukawa
a07557471e Hardening token validation in InputMethodManagerService
This CL adds missing token validations in
InputMethodManagerService#switchToNextInputMethod and
InputMethodManagerService#shouldOfferSwitchingToNextInputMethod.

This CL also fixes a possible race condition when validating
the token in InputMethodManagerService#updateStatusIcon.

BUG: 15420379
Change-Id: I043aa30a19c821f33effd57dfd6590b0e3ed817b
2014-06-04 21:15:31 +09:00
Yohei Yukawa
43eb101227 Merge "Remove code duplication in InputMethodManagerService" 2014-06-04 11:24:31 +00:00