John Spurlock
97e9a034b9
am 2c52c443: am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev
...
* commit '2c52c443dcca748279e386160143ae388b19bb66':
Doze: Avoid pulsing in pockets.
2014-10-07 17:43:03 +00:00
Jean-Michel Trivi
63b6d3ed1d
am 986468a8: am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev
...
* commit '986468a8ab77ce1e89247078d4e93a3aaa5d294b':
Full volume on remote submix for apps that need it
2014-10-07 17:42:58 +00:00
PauloftheWest
0c58307868
am f7b7b758: am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
...
* commit 'f7b7b7585acb0bec5c8ccfd646981a1b9f906f60':
Fixed a Bluetooth Quick Settings update bug.
2014-10-07 17:42:52 +00:00
Yorke Lee
a64c571454
am 84e9479a: am 7f22eb98: Merge "Fix build break" into lmp-dev
...
* commit '84e9479a09ce7dd9bb0a153ba75fe78554a0c114':
Fix build break
2014-10-07 17:42:48 +00:00
John Spurlock
2c52c443dc
am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev
...
* commit '0d334365c6123388a0df81438b82122be29d19ab':
Doze: Avoid pulsing in pockets.
2014-10-07 17:33:10 +00:00
Jean-Michel Trivi
986468a8ab
am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev
...
* commit 'dce7a427593c6e11277d9e3075ab027512923276':
Full volume on remote submix for apps that need it
2014-10-07 17:33:05 +00:00
PauloftheWest
f7b7b7585a
am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
...
* commit '53c84002911362c913bc72cd28d186718a33149d':
Fixed a Bluetooth Quick Settings update bug.
2014-10-07 17:31:39 +00:00
Yorke Lee
84e9479a09
am 7f22eb98: Merge "Fix build break" into lmp-dev
...
* commit '7f22eb981812309a1e751a891428dffe6b1da175':
Fix build break
2014-10-07 17:31:19 +00:00
John Spurlock
0d334365c6
Merge "Doze: Avoid pulsing in pockets." into lmp-dev
2014-10-07 16:17:46 +00:00
Jean-Michel Trivi
dce7a42759
Merge "Full volume on remote submix for apps that need it" into lmp-dev
2014-10-07 16:12:08 +00:00
Jean-Michel Trivi
ba5270b887
Full volume on remote submix for apps that need it
...
If an AudioRecord is created with the "fixedVolume" tag
when recording from REMOTE_SUBMIX, treat the
device DEVICE_OUT_REMOTE_SUBMIX as a fixed full volume
device during the recording. Also register a death
handler during the recording.
Otherwise this is a no-op.
Bug 17635294
Change-Id: I8d26fe777047126f34308e1e1b7ac28ba269ad89
2014-10-07 09:09:41 -07:00
John Spurlock
92b8d41096
Doze: Avoid pulsing in pockets.
...
Query for the current proximity value before starting a pulse.
If a "near" value is returned, skip the entire pulse.
Bug: 17350239
Change-Id: Ib930d84b163c8e54b7be5d1c975e547692f8529f
2014-10-07 12:01:56 -04:00
PauloftheWest
53c8400291
Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
2014-10-07 13:01:28 +00:00
Amit Mahajan
dbbf493220
am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3
...
* commit 'd9a3f89a0727590a069c563a8b97fe99b866d67c':
Sms7BitEncodingTranslator
2014-10-07 05:12:44 +00:00
Amit Mahajan
d9a3f89a07
Merge commit '69555fc2' into fix-merge-conflict3
...
Conflicts:
core/res/res/values/symbols.xml
Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
2014-10-06 21:57:42 -07:00
Yorke Lee
7a394311ad
am 770ed6ec: Fix build break
...
* commit '770ed6ec920ec10798c5b7a7b4850ccc0b2a531f':
Fix build break
2014-10-07 03:31:21 +00:00
Yorke Lee
770ed6ec92
Fix build break
...
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
(cherry picked from commit 9858af0ec68ad28db60047587c8eb6232b4a6591)
2014-10-07 03:13:12 +00:00
Yorke Lee
7f22eb9818
Merge "Fix build break" into lmp-dev
2014-10-07 02:12:02 +00:00
Yorke Lee
9858af0ec6
Fix build break
...
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
2014-10-06 18:58:52 -07:00
Amit Mahajan
69555fc2c8
Merge "Sms7BitEncodingTranslator" into lmp-dev
2014-10-07 01:20:27 +00:00
Yorke Lee
0b27c28377
am 7e552595: am 4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
...
* commit '7e552595bda0825787820e3d9bb58b5fad32cd01':
Add ability to add sim-initiated MO call to UI (2/4)
2014-10-07 01:04:30 +00:00
Xia Ying
43eb8a97e7
Sms7BitEncodingTranslator
...
Bug: 16197894
Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
2014-10-07 01:02:04 +00:00
Yorke Lee
7e552595bd
am 4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
...
* commit '4c334f3def076d2940b53641c932050b1e4ce286':
Add ability to add sim-initiated MO call to UI (2/4)
2014-10-07 00:58:47 +00:00
Yorke Lee
4c334f3def
Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
2014-10-07 00:54:52 +00:00
Jeff Sharkey
fcc059dcf0
am 1d5ef81e: am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
...
* commit '1d5ef81e29279f769d79315f2a38e747ea92e10f':
Reduce PackageInstaller I/O pressure.
2014-10-07 00:32:19 +00:00
Geoff Mendal
17cef23480
am 6a6369b6: (-s ours) am fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '6a6369b61a51ebf415a37d19e5b2aba789bc9ce7':
Import translations. DO NOT MERGE
2014-10-07 00:32:15 +00:00
Raluca Sauciuc
1cb156bb01
am f35c305f: am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
...
* commit 'f35c305f45db60394c3c7fec2e41b38963da70ca':
Fix test framework to allow Mockito tests to run successfully on ART.
2014-10-07 00:32:10 +00:00
Paul Jensen
84527eca75
am 69c489ed: am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
...
* commit '69c489ed6f28cb3c79f13b2f7b6cffc6d3b49627':
Use network-specific HTTP proxy settings in captive portal login app.
2014-10-07 00:32:00 +00:00
Geoff Mendal
f2bef9cd19
am 1d593ad4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '1d593ad47470150f751cc573eb56dae97470cf41':
Import translations. DO NOT MERGE
2014-10-07 00:31:51 +00:00
Yuncheol Heo
d534b936d7
Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
2014-10-07 00:29:06 +00:00
Selim Cinek
79934acb40
Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev
2014-10-07 00:22:34 +00:00
Jeff Sharkey
1d5ef81e29
am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
...
* commit '99586dc0108d0f4311c8af4d06ed113bbf40a6ee':
Reduce PackageInstaller I/O pressure.
2014-10-06 23:59:43 +00:00
Selim Cinek
face7c1795
Fixed a crash when the detail panel got very big
...
An example was when we have many casting devices or users,
it was simply crashing. Also fixed a bug where the background
would not be drawn anymore.
Bug: 17699850
Change-Id: Ibdb8f75f53da2806dcd7dd1386ebcc345b012f47
2014-10-06 16:54:46 -07:00
Geoff Mendal
6a6369b61a
am fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'fc8d65197a6404a93f1230ac5ebc635438a5c094':
Import translations. DO NOT MERGE
2014-10-06 23:52:31 +00:00
Raluca Sauciuc
f35c305f45
am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
...
* commit '6a3faf5a8b182d20dea47fb76cf33456321ddf7a':
Fix test framework to allow Mockito tests to run successfully on ART.
2014-10-06 23:52:19 +00:00
Paul Jensen
69c489ed6f
am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
...
* commit '7627d2cd5cd93ebf8e683392edbef961dbc20d31':
Use network-specific HTTP proxy settings in captive portal login app.
2014-10-06 23:52:12 +00:00
Jeff Sharkey
99586dc010
Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
2014-10-06 23:51:56 +00:00
Chris Craik
0aa69ff2ff
am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '1a6c41fbad9c1c6725d189fdcf7dae2fe3f00b4d':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-06 23:51:05 +00:00
Mike Lockwood
bb68c26362
am 3df6b76c: am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
...
* commit '3df6b76c5f6ca38f986305c805c9d90e0b861a41':
Add support for playing audio during bootanimation
2014-10-06 23:51:00 +00:00
Mathieu Chartier
5ade30e82e
am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
...
* commit '405a934ec46fccf7d2e6e573bb65a5be4b51665a':
Fix incorrect JNI_ABORT
2014-10-06 23:50:55 +00:00
Jinsuk Kim
84659edd41
Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev
2014-10-06 23:48:20 +00:00
Jinsuk Kim
ad515e88ee
CEC: Send <Device Vendor ID> after address allocation
...
This is required to pass CTS 11.2.9-2.
Bug: 17882288
Change-Id: Ie2823be8635a458a63a95abd44135035667d5836
2014-10-06 23:47:52 +00:00
Geoff Mendal
1d593ad474
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-06 23:39:12 +00:00
Jeff Sharkey
02bd78490d
Reduce PackageInstaller I/O pressure.
...
When performing a restore during initial device setup, we could be
installing hundreds of packages. Currently, we're writing all
metadata (including heavy icons) for every session mutation! Because
we're holding the mSessions lock while writing all this heavy data,
we end up causing ANRs when apps call other PackageInstaller APIs.
This patch mitigates by moving the heavy icon data into separate
per-session PNG files, which we only persist when changed.
Bug: 17881962, 17567794
Change-Id: I4dee15d4a65a8eb65c381e6bb7477728b6cc30d2
2014-10-06 16:38:15 -07:00
Geoff Mendal
a6b027084c
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-06 23:29:52 +00:00
Geoff Mendal
fc8d65197a
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-06 23:28:23 +00:00
Raluca Sauciuc
6a3faf5a8b
Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
2014-10-06 23:19:12 +00:00
Jinsuk Kim
85c927cfc2
Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
2014-10-06 23:15:35 +00:00
Paul Jensen
7627d2cd5c
Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
2014-10-06 23:01:27 +00:00
Chris Craik
1a6c41fbad
am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '6c9f0a01602697aaed99f54c4db0d6296701ed43':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-06 22:35:19 +00:00