Jim Miller
db2fb70b19
am 752889a9: am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev
...
* commit '752889a944402983874e04da6f613872275aa3d0':
Update TrustAgentService API after review.
2014-08-22 23:28:08 +00:00
Jim Miller
d4efaac5d5
Update TrustAgentService API after review.
...
Also documents timebase on related DevicePolicyManager API.
Fixes bugs 16401527 and 17046034
Change-Id: I8ee6d0055ab6f52ec71630344d3232f7875d9c1d
2014-08-22 22:43:30 +00:00
John Spurlock
48b9ca16f6
am c7d47057: am fa0f8288: Merge "Display notification effects suppressor in the volume panel." into lmp-dev
...
* commit 'c7d47057359ba66ce7ca56a20b7bcdf9af522042':
Display notification effects suppressor in the volume panel.
2014-08-22 22:23:15 +00:00
John Spurlock
7653a30ea0
Merge "Display notification effects suppressor in the volume panel." into lmp-dev
2014-08-22 22:09:35 +00:00
John Spurlock
b4782526f5
Display notification effects suppressor in the volume panel.
...
Bug:16958514
Change-Id: I0eac173875e8af62e3c6b39001722c3fda4517de
2014-08-22 18:08:17 -04:00
Christopher Tate
21daafd4fc
am 63651110: am 887ad9b6: Merge "Automatically bind to newly-installed backup transports" into lmp-dev
...
* commit '636511108ad45da699eaaa98a2d337897737cce8':
Automatically bind to newly-installed backup transports
2014-08-22 21:24:29 +00:00
Amith Yamasani
61b7dff862
am 0c581229: am 654d72fd: Merge "Show a user switching dialog before starting the user switch" into lmp-dev
...
* commit '0c581229cd4986c07bb877f8211a8c5471633efb':
Show a user switching dialog before starting the user switch
2014-08-22 21:24:20 +00:00
Matthew Williams
e94569636f
am 74d65044: am d95fb7b3: Merge "JobScheduler only run jobs for started users." into lmp-dev
...
* commit '74d65044fda9dedd72a7e80ec9a607bebdf5f484':
JobScheduler only run jobs for started users.
2014-08-22 21:24:15 +00:00
Svetoslav
4fbc63eee1
am ddbf2a1f: am dafdc643: Merge "Fix jank in when drawing magnification bounds" into lmp-dev
...
* commit 'ddbf2a1f2a03e1818324144df653e60d1e005eaa':
Fix jank in when drawing magnification bounds
2014-08-22 21:24:10 +00:00
Christopher Tate
e7bbe47833
Merge "Automatically bind to newly-installed backup transports" into lmp-dev
2014-08-22 21:11:41 +00:00
Amith Yamasani
6dd08fdd91
Merge "Show a user switching dialog before starting the user switch" into lmp-dev
2014-08-22 21:08:15 +00:00
Matthew Williams
12eec2341d
Merge "JobScheduler only run jobs for started users." into lmp-dev
2014-08-22 21:08:06 +00:00
Svetoslav
d9a218d499
Merge "Fix jank in when drawing magnification bounds" into lmp-dev
2014-08-22 21:07:09 +00:00
Christopher Tate
5684dae9cc
Automatically bind to newly-installed backup transports
...
They'll be rebound automatically at boot, but need to be brought
up immediately. As always they can only be provided by privileged
apps.
Bug 16542048
Change-Id: I9f121a5c111a772deb3f0c44166002a2cbb16ad5
2014-08-22 13:29:46 -07:00
Dianne Hackborn
9986e64643
am ceb86f91: am f5b988b8: Merge "Work on issue #17011123 : Hit Back/Recents button when in Recents..." into lmp-dev
...
* commit 'ceb86f912d9cc0cc0fa62f712b0105a5d239a973':
Work on issue #17011123 : Hit Back/Recents button when in Recents...
2014-08-22 20:22:53 +00:00
Dianne Hackborn
250bf41b8e
Merge "Work on issue #17011123 : Hit Back/Recents button when in Recents..." into lmp-dev
2014-08-22 20:05:39 +00:00
Amith Yamasani
7805a10c86
Show a user switching dialog before starting the user switch
...
switchUser() now first shows a dialog and the dialog calls
startUserInForeground to do the actual switch.
Bug: 16661752
Change-Id: Ie4e2e9eec8bf7c2116694072ea8555b8254a0e13
2014-08-22 13:00:22 -07:00
Christoph Studer
9141da0b95
am e8f03cdc: am 1352aa38: Merge "NoMan: Turn off aggregated stats" into lmp-dev
...
* commit 'e8f03cdcef827b300e15303ae49a9728da359172':
NoMan: Turn off aggregated stats
2014-08-22 19:58:02 +00:00
Christoph Studer
5a050ce64b
am c5a13a6f: am 55c7c687: Merge "NoMan: Add flag to turn off aggregated in-mem stats" into lmp-dev
...
* commit 'c5a13a6f278f65399a116f5b1a91bf5d93b1271a':
NoMan: Add flag to turn off aggregated in-mem stats
2014-08-22 19:57:57 +00:00
Christoph Studer
28d6247b3d
Merge "NoMan: Turn off aggregated stats" into lmp-dev
2014-08-22 19:40:57 +00:00
Christoph Studer
9e3618c28f
Merge "NoMan: Add flag to turn off aggregated in-mem stats" into lmp-dev
2014-08-22 19:40:17 +00:00
Svetoslav
7505e3315c
Fix jank in when drawing magnification bounds
...
There was an off-by-one error in computing the invalidated
rectangle when drawing the magnified region border.
bug:17199352
Change-Id: Id0a1af092b7124bbdca316534c035ed9af829326
2014-08-22 12:14:47 -07:00
Christoph Studer
0a31453864
NoMan: Turn off aggregated stats
...
Aggregated stats can grow unboundedly and shouldn't be enabled
for prod builds.
Bug: 16777910
Change-Id: I1c9303fc3aab93fd75f4dfbbf2e3de467a72f99e
2014-08-22 21:03:48 +02:00
Christoph Studer
856b2b8135
NoMan: Add flag to turn off aggregated in-mem stats
...
Bug: 16777910
Change-Id: Ic5baa910988f027c82ba16d713a44cc5d55b8333
2014-08-22 21:03:37 +02:00
Brian Carlstrom
73ee206745
am 5b19e7f4: am 0830d164: Merge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev
...
* commit '5b19e7f4153cb4af303eac79628ac96c500efc58':
Move SystemBackupAgent from services.jar to frameworks.jar
2014-08-22 17:16:14 +00:00
Jeff Davidson
66b873c4fb
am fc44e822: am 3277eb42: Merge "Allow NetworkRequest release from the system process." into lmp-dev
...
* commit 'fc44e82284d3d6806b896792865ff919105055ce':
Allow NetworkRequest release from the system process.
2014-08-22 17:16:04 +00:00
Brian Carlstrom
9a434ae00f
Merge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev
2014-08-22 17:03:49 +00:00
Jeff Davidson
717d95161a
Merge "Allow NetworkRequest release from the system process." into lmp-dev
2014-08-22 16:52:33 +00:00
Adrian Roos
060b15a058
am 0fd731bd: am d7efee2a: Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev
...
* commit '0fd731bd1c1572a11d119172c6b3e13e3719b568':
Only run TrustAgentServices for users with secure keyguards
2014-08-22 14:37:35 +00:00
Adrian Roos
076e72554d
Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev
2014-08-22 14:17:32 +00:00
Narayan Kamath
433f783259
am 3a5f2493: am 00e947b5: Remove a line that was accidentally committed.
...
* commit '3a5f24936a9115203ba2661ce8be2a6ba49fd1e1':
Remove a line that was accidentally committed.
2014-08-22 11:56:53 +00:00
Narayan Kamath
31fe102d57
Remove a line that was accidentally committed.
...
Prevents the APK from being installed.
bug: 17153971
Change-Id: Ic53c94dc6f0583371965d5edb0b12248c915214e
2014-08-22 11:37:20 +00:00
Narayan Kamath
c5b929a94d
am 219e4501: am 089f9feb: Merge "Fix service tests." into lmp-dev
...
* commit '219e45010ecc695df42a13d76192afb714a8656b':
Fix service tests.
2014-08-22 08:03:34 +00:00
Narayan Kamath
97a50adde5
Merge "Fix service tests." into lmp-dev
2014-08-22 07:47:38 +00:00
Jungshik Jang
132de2d573
am 32c63a97: am b66b5991: Add spam-safe logger.
...
* commit '32c63a97fcd1c96533b9e6198eb4f69b62249607':
Add spam-safe logger.
2014-08-22 06:57:55 +00:00
Jungshik Jang
dbe6b45545
Add spam-safe logger.
...
This change introduces a new helper class, HdmiLogger,
which prevents spammy log for same error message.
Bug: 17179667
Change-Id: Ia55808408e0a92b0370cd627361f80754b2f1018
2014-08-22 15:30:04 +09:00
Brian Carlstrom
8def5cbb3a
Move SystemBackupAgent from services.jar to frameworks.jar
...
Bug: 17168017
Change-Id: I89b98ca839a78eeb7fb43930e0699ee235deafad
2014-08-21 23:15:13 -07:00
Jungshik Jang
304eaeed8b
am ebe59a04: am 952e276a: Merge "Implement interfaces for MHL scratchpad command" into lmp-dev
...
* commit 'ebe59a04fb308713eeb5a546aa8568c7b2177937':
Implement interfaces for MHL scratchpad command
2014-08-22 05:38:01 +00:00
Jungshik Jang
6385953604
Merge "Implement interfaces for MHL scratchpad command" into lmp-dev
2014-08-22 05:22:47 +00:00
Lorenzo Colitti
18bcd9561d
am f325858e: am fa79cdb6: Merge "Rework the per-network URL API." into lmp-dev
...
* commit 'f325858e128c77791d245a9a54aec0dbfc8665f0':
Rework the per-network URL API.
2014-08-22 03:35:06 +00:00
Jinsuk Kim
ee74abd1d6
am 5cba826f: am d71ce526: Merge "CEC: Skip routing control/internal source selection conditionally" into lmp-dev
...
* commit '5cba826f3ee994c2439259e43d7130f487b5174a':
CEC: Skip routing control/internal source selection conditionally
2014-08-22 03:28:58 +00:00
Matthew Williams
9ae3dbeefc
JobScheduler only run jobs for started users.
...
BUG: 12876556
Minor changes to test app to make persisting an option.
Change-Id: I1b40347878ec5ca44cd717ebfeb544f6c58473b5
2014-08-21 20:28:12 -07:00
Lorenzo Colitti
e258de6f9e
Merge "Rework the per-network URL API." into lmp-dev
2014-08-22 03:07:28 +00:00
Winson Chung
1855156bd8
am 2a5db3ba: am 6181cbf5: Minor tweaks to recents thumbnails.
...
* commit '2a5db3bac9b1d716dc051d2e15333885b32e0953':
Minor tweaks to recents thumbnails.
2014-08-22 02:59:31 +00:00
Jungshik Jang
f424932cfb
Implement interfaces for MHL scratchpad command
...
1. Add sendScratchpadCommand to IHdmiControlService interface,
which is used to send scratchpad command.
2. Add IHdmiMhlScratchpadCommandListener to handle incoming
MHL scratchpad command.
Bug: 17146522
Change-Id: I8e8e743dc08a18c80867be470997ce79d3292c15
2014-08-22 11:45:50 +09:00
Jinsuk Kim
1bfc75fc04
Merge "CEC: Skip routing control/internal source selection conditionally" into lmp-dev
2014-08-22 02:14:06 +00:00
Lorenzo Colitti
9f1274b7e4
Rework the per-network URL API.
...
This addresses API council comments.
Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0
2014-08-21 19:09:27 -07:00
Winson Chung
096f36b8db
Minor tweaks to recents thumbnails.
...
- Reducing the size of the recents thumbnails
- Skip persisting if we never update the last thumbnail
- Don't bother loading the last thumbnail file descriptor if we have it in memory
- Fixing warning in getting drawable from resource
Change-Id: Ieddaeac75a5e5d80876a9b6b1d50f7cc84c7d6fd
2014-08-22 01:03:21 +00:00
Dianne Hackborn
6f4d61ff2e
Work on issue #17011123 : Hit Back/Recents button when in Recents...
...
...without interacting with any of the Recents items should not bring
Home back to top
Up navigation needs to be smarter about multi-document and in the case
of being at the root of a document know to re-construct a task for
the app.
Change-Id: Ief874e46e9a9897379dda1010bcce4c5b03d82f1
2014-08-21 17:50:42 -07:00
Jinsuk Kim
d530719b16
CEC: Skip routing control/internal source selection conditionally
...
This is necessary for TV woken up by <Text/Image View On> to override
initial TV source selection/routing control, since the input change
will immediately come from external device.
Bug: 17189114
Change-Id: I4aa1ac31bc7f6ab554e29a9e6065e534e15abd58
2014-08-22 09:46:37 +09:00