Adam Connors
fd259886cd
am 23439bb9: am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev
...
* commit '23439bb9f3edcd2191aff79d57018ddaf2d74847':
Create DPM APIs for cross profile callerId
2014-07-17 21:05:08 +00:00
Martin Kosiba
9ab6dbc624
am 6239ed0c: am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager.
...
* commit '6239ed0c67b2e981e80e9eac29d9aecd01a99cda':
Allow for appending of resources to an AssetManager.
2014-07-17 21:04:53 +00:00
Alexandra Gherghina
55144e0e21
am ea887ed3: am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager
...
* commit 'ea887ed3d19f744c83effb13347bc0a69e75f005':
Ads per-user APIs to manage accounts through the AccountManager
2014-07-17 21:04:49 +00:00
Adam Connors
f8904a2b43
am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev
...
* commit 'bab7ceaf157a81d18ee1404bb6a17c6c05549f5b':
Create DPM APIs for cross profile callerId
2014-07-17 20:57:53 +00:00
Niels Egberts
f8f3a34570
am 64b0ebfc: am a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev
...
* commit '64b0ebfcf9644c99d70e639eee14536e9f64484f':
TtsSpan builders for each TtsSpan type. DO NOT MERGE
2014-07-17 20:57:50 +00:00
Martin Kosiba
0db75fe2b0
am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager.
...
* commit 'fbb2246c6d72d98452fcda9b6a79689012eb5614':
Allow for appending of resources to an AssetManager.
2014-07-17 20:57:38 +00:00
Alexandra Gherghina
02e130fccf
am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager
...
* commit '14b5a9b452d8b47617f5d908778caaf745527fe9':
Ads per-user APIs to manage accounts through the AccountManager
2014-07-17 20:57:31 +00:00
Julia Reynolds
7a387c5dac
am 6a1230cf: am d7dd3073: am 9c9cb566: Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev
...
* commit '6a1230cfcc8f6c9920d06e6ac2ec8dcf39903cf2':
Update message on DISALLOW_REMOVE_USERS constant.
2014-07-17 18:29:16 +00:00
Torne (Richard Coles)
daa5b63ff6
am a6eb6ece: am 8829ffe0: am 07119f4a: Use the WebView\'s loader library to load the real library.
...
* commit 'a6eb6eceb0330508af47f4de697df7c7b85e5410':
Use the WebView's loader library to load the real library.
Remove WebView library preloading mechanism.
2014-07-17 18:29:12 +00:00
Przemyslaw Szczepaniak
9caab369fe
am 90d78fa4: am 95546693: Merge "Add AudioAttributes support in the TTS." into lmp-dev
...
* commit '90d78fa4ec5326d0cacfa5221c6675bc28b8c9d3':
Add AudioAttributes support in the TTS.
2014-07-17 18:23:39 +00:00
Dianne Hackborn
bf507a0cba
am 68f35ec2: am dbec91c0: Implement issue #16330060 : Inform ActivityManager about WebView...
...
* commit '68f35ec2d2f9950f57afa9900f16a3b29a8d55b0':
Implement issue #16330060 : Inform ActivityManager about WebView...
2014-07-17 18:22:17 +00:00
Sandeep Siddhartha
a25b93b226
am bb80d295: am aecd5383: Add recognition modes to the enrollment metadata
...
* commit 'bb80d295092220d204a74cca1d7d1c0fde93757b':
Add recognition modes to the enrollment metadata
2014-07-17 18:22:07 +00:00
Alan Viverette
238673f33a
am 4366255e: am bbbbb3b2: Add public attributes for TimePicker styling
...
* commit '4366255e3764c7e2db2221b58c9b438ac8fdc84d':
Add public attributes for TimePicker styling
2014-07-17 18:21:59 +00:00
Sandeep Siddhartha
177f0fd208
am a2440a17: am 43bc655b: Add code for isKeyphraseActive and some logging to help debug issues
...
* commit 'a2440a17e796d04ceb3470783d28f6080ee9c7dc':
Add code for isKeyphraseActive and some logging to help debug issues
2014-07-17 18:21:44 +00:00
Lorenzo Colitti
e1524a4896
am 84641420: am 1098531c: Disable logging in NetlinkTracker.
...
* commit '84641420220d2d11e7baa7ae6061d78f31d97c98':
Disable logging in NetlinkTracker.
2014-07-17 18:21:31 +00:00
Chris Craik
b7f22787ef
am 3e95764e: am b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
...
* commit '3e95764e68ea93918d455b8b2c08d9ff02dc36f8':
Add accessibility text contrast setting
2014-07-17 18:21:26 +00:00
Vinit Deshpande
b42cf4ea56
am ff5ceb0d: am 0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
...
* commit 'ff5ceb0d89c549682b498522f052d61c776bff03':
Introduce RTT Manager
2014-07-17 18:20:48 +00:00
Jeff Davidson
d66291503a
am 62152268: Merge "Expose network scoring APIs to /system apps." into lmp-dev
...
* commit '62152268d51b8b7726a806e48750a810e23eab40':
Expose network scoring APIs to /system apps.
2014-07-17 18:20:22 +00:00
Brian Colonna
1e97b542d9
am 6f6fcecb: Bug 16152902: Disabling FUL in keyguard and screen lock settings
...
* commit '6f6fcecb4e13e5cbfb836b66e49001e34bd0c10c':
Bug 16152902: Disabling FUL in keyguard and screen lock settings
2014-07-17 18:17:55 +00:00
Fabrice Di Meglio
fcc5aaf486
am 6bbea8cf: Fix LocalePicker background
...
* commit '6bbea8cf4252839d0c6f2a3152f506a7b2b2d753':
Fix LocalePicker background
2014-07-17 18:15:08 +00:00
Alan Viverette
6bf5ae966f
am 8e97a200: Fix software dirty region, don\'t add insets to software windows
...
* commit '8e97a200ecf1985dcf2fd3a004b53e59640b3374':
Fix software dirty region, don't add insets to software windows
2014-07-17 18:14:28 +00:00
Yigit Boyar
2c6cdd9500
am d8607b40: Merge "Change Animators to reset values when restarted if their target changes" into lmp-dev
...
* commit 'd8607b40b57332619f3be66ffa5250394acbc5f7':
Change Animators to reset values when restarted if their target changes
2014-07-17 18:14:23 +00:00
John Reck
52d2b2df9d
am c1d32f0c: Merge "Fix root RenderNode damage calculation" into lmp-dev
...
* commit 'c1d32f0c5c5832a3bbf923a92d62b2e434dfe70b':
Fix root RenderNode damage calculation
2014-07-17 18:14:18 +00:00
Sailesh Nepal
909d1b5755
resolved conflicts for merge of 03e88771 to master
...
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
2014-07-17 11:05:42 -07:00
Martin Kosiba
7df3625d5b
Allow for appending of resources to an AssetManager.
...
BUG: 11505352
Change-Id: Ifa290580a6dc63c2f471d0bbf5f066db14aed4d7
2014-07-17 18:10:02 +01:00
Alexandra Gherghina
999d394ade
Ads per-user APIs to manage accounts through the AccountManager
...
Bug: 16056552
Bug: 14642886
Change-Id: I17ff6c2515285e63c84cecf2f861d10666c393c5
2014-07-17 17:08:49 +00:00
Julia Reynolds
56447371f3
am d7dd3073: am 9c9cb566: Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev
...
* commit 'd7dd3073762c2b89dbd655aeb22602fd701d6ae3':
Update message on DISALLOW_REMOVE_USERS constant.
2014-07-17 17:07:10 +00:00
Torne (Richard Coles)
cf04fc99c2
am 8829ffe0: am 07119f4a: Use the WebView\'s loader library to load the real library.
...
* commit '8829ffe031d612248a1a02d89e923f4c6c947fb0':
Use the WebView's loader library to load the real library.
Remove WebView library preloading mechanism.
2014-07-17 17:07:04 +00:00
Przemyslaw Szczepaniak
df772272d5
am 90d78fa4: am 95546693: Merge "Add AudioAttributes support in the TTS." into lmp-dev
...
* commit '90d78fa4ec5326d0cacfa5221c6675bc28b8c9d3':
Add AudioAttributes support in the TTS.
2014-07-17 17:06:43 +00:00
Dianne Hackborn
ec18364c7b
am 68f35ec2: am dbec91c0: Implement issue #16330060 : Inform ActivityManager about WebView...
...
* commit '68f35ec2d2f9950f57afa9900f16a3b29a8d55b0':
Implement issue #16330060 : Inform ActivityManager about WebView...
2014-07-17 17:05:26 +00:00
Sandeep Siddhartha
4c4e3ce2f5
am bb80d295: am aecd5383: Add recognition modes to the enrollment metadata
...
* commit 'bb80d295092220d204a74cca1d7d1c0fde93757b':
Add recognition modes to the enrollment metadata
2014-07-17 17:05:18 +00:00
Alan Viverette
8b0d8b4b2d
am 4366255e: am bbbbb3b2: Add public attributes for TimePicker styling
...
* commit '4366255e3764c7e2db2221b58c9b438ac8fdc84d':
Add public attributes for TimePicker styling
2014-07-17 17:05:13 +00:00
Sandeep Siddhartha
470c9a9898
am a2440a17: am 43bc655b: Add code for isKeyphraseActive and some logging to help debug issues
...
* commit 'a2440a17e796d04ceb3470783d28f6080ee9c7dc':
Add code for isKeyphraseActive and some logging to help debug issues
2014-07-17 17:05:01 +00:00
Lorenzo Colitti
19718c8c19
am 84641420: am 1098531c: Disable logging in NetlinkTracker.
...
* commit '84641420220d2d11e7baa7ae6061d78f31d97c98':
Disable logging in NetlinkTracker.
2014-07-17 17:04:49 +00:00
Chris Craik
4ada26905d
am 3e95764e: am b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
...
* commit '3e95764e68ea93918d455b8b2c08d9ff02dc36f8':
Add accessibility text contrast setting
2014-07-17 17:04:46 +00:00
Vinit Deshpande
110411dbf3
am ff5ceb0d: am 0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
...
* commit 'ff5ceb0d89c549682b498522f052d61c776bff03':
Introduce RTT Manager
2014-07-17 17:04:15 +00:00
Jeff Davidson
e3b002c01e
am 62152268: Merge "Expose network scoring APIs to /system apps." into lmp-dev
...
* commit '62152268d51b8b7726a806e48750a810e23eab40':
Expose network scoring APIs to /system apps.
2014-07-17 17:03:45 +00:00
Brian Colonna
73882b58c3
am 6f6fcecb: Bug 16152902: Disabling FUL in keyguard and screen lock settings
...
* commit '6f6fcecb4e13e5cbfb836b66e49001e34bd0c10c':
Bug 16152902: Disabling FUL in keyguard and screen lock settings
2014-07-17 17:01:50 +00:00
Fabrice Di Meglio
a75a95a22a
am 6bbea8cf: Fix LocalePicker background
...
* commit '6bbea8cf4252839d0c6f2a3152f506a7b2b2d753':
Fix LocalePicker background
2014-07-17 16:59:35 +00:00
Alan Viverette
d4d40b32e6
am 8e97a200: Fix software dirty region, don\'t add insets to software windows
...
* commit '8e97a200ecf1985dcf2fd3a004b53e59640b3374':
Fix software dirty region, don't add insets to software windows
2014-07-17 16:59:07 +00:00
Yigit Boyar
8330ad22a1
am d8607b40: Merge "Change Animators to reset values when restarted if their target changes" into lmp-dev
...
* commit 'd8607b40b57332619f3be66ffa5250394acbc5f7':
Change Animators to reset values when restarted if their target changes
2014-07-17 16:59:03 +00:00
John Reck
624e910ebd
am c1d32f0c: Merge "Fix root RenderNode damage calculation" into lmp-dev
...
* commit 'c1d32f0c5c5832a3bbf923a92d62b2e434dfe70b':
Fix root RenderNode damage calculation
2014-07-17 16:58:59 +00:00
Sailesh Nepal
f980901bca
am 03e88771: TTY: frameworks/base changes
...
* commit '03e88771769c376017af281d3c23ac0e030fee52':
TTY: frameworks/base changes
2014-07-17 16:58:39 +00:00
Christopher Tate
50d11a6a9a
am c92b1dd5: Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev
...
* commit 'c92b1dd5f3e06a7e43f4086b2db418a8334aa7d2':
Always call finishBackup() if performFullBackup() succeeded
2014-07-17 16:58:34 +00:00
Fabrice Di Meglio
ab8db6d9c4
am fd6eeda0: Fix bug #16309454 Broken recent button after dismissing set time dialog
...
* commit 'fd6eeda0f7f578735a9b2b6a36fb1f130993f488':
Fix bug #16309454 Broken recent button after dismissing set time dialog
2014-07-17 16:58:13 +00:00
Jeff Davidson
e9c77be05e
am 8f406122: Remove obsolete remark from XXHDPI comment.
...
* commit '8f4061221469cde3d92b6f7dede5c8b10df1edc0':
Remove obsolete remark from XXHDPI comment.
2014-07-17 16:58:09 +00:00
Christopher Tate
e2ba7a37fc
am c92b1dd5: Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev
...
* commit 'c92b1dd5f3e06a7e43f4086b2db418a8334aa7d2':
Always call finishBackup() if performFullBackup() succeeded
2014-07-17 16:45:23 +00:00
Fabrice Di Meglio
79b834078e
am fd6eeda0: Fix bug #16309454 Broken recent button after dismissing set time dialog
...
* commit 'fd6eeda0f7f578735a9b2b6a36fb1f130993f488':
Fix bug #16309454 Broken recent button after dismissing set time dialog
2014-07-17 16:45:01 +00:00
Jeff Davidson
46b6f2a8f4
am 8f406122: Remove obsolete remark from XXHDPI comment.
...
* commit '8f4061221469cde3d92b6f7dede5c8b10df1edc0':
Remove obsolete remark from XXHDPI comment.
2014-07-17 16:44:56 +00:00
Torne (Richard Coles)
08cfaf6726
Use the WebView's loader library to load the real library.
...
Load libwebviewchromiumloader and use it to load the real WebView
library, to enable sharing of the relro segment between different
application processes without requiring that the library be preloaded in
the zygote. A system service is added to track whether the relro segment
file has been prepared, and block loading of the library until it has
been.
Bug: 13005501
Change-Id: I846b37c7b8e2a4eb8a39e4fd455bccbb2048c173
2014-07-17 09:18:43 -07:00