Wink Saville
c57677d208
am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev
...
* commit '7491d8769bdba72b071d7589420fff0158e95bd1':
Cleanup NetworkCapabilities.
2014-09-22 22:58:41 +00:00
Wink Saville
ee21c9b7c6
am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev
...
* commit '7f969e42ad2c3b194a90e047e72998fb81e8cfa0':
Cleanup NetworkCapabilities.
2014-09-22 22:47:39 +00:00
Wink Saville
074e61569e
Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev
2014-09-22 22:41:42 +00:00
Svetoslav
1dd82882a5
am e821fc43: am 87c9fb76: am e9456781: Merge "Loosen the constraint for releasing a shared file." into lmp-dev
...
* commit 'e821fc4335549c8618ee17d1e60de0e58f6f9ff9':
Loosen the constraint for releasing a shared file.
2014-09-22 22:14:02 +00:00
Svetoslav
bf0275d2c4
am 68c883a5: am 02b80bea: am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev
...
* commit '68c883a51a544ac2164ceb17b45cc42767e51f4b':
Fix a bug in parsing app widget state XML.
2014-09-22 22:13:58 +00:00
Svetoslav
277a8686c2
am 87c9fb76: am e9456781: Merge "Loosen the constraint for releasing a shared file." into lmp-dev
...
* commit '87c9fb7613a4ee7d815a2bcc36554fd35357075e':
Loosen the constraint for releasing a shared file.
2014-09-22 22:02:32 +00:00
Svetoslav
2a3ffefede
am 02b80bea: am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev
...
* commit '02b80bea002a97162637cf85b108cf0fbe658c3d':
Fix a bug in parsing app widget state XML.
2014-09-22 22:02:29 +00:00
Wink Saville
4e2dea77dc
Cleanup NetworkCapabilities.
...
Remove unused imports and variables.
Fix misspellings.
Added @Overrides.
Change-Id: I81f4adb0504e92d01c5465a0e14bc46d5ec3987e
2014-09-22 21:51:47 +00:00
Svetoslav
b889173558
am e9456781: Merge "Loosen the constraint for releasing a shared file." into lmp-dev
...
* commit 'e9456781c0b4d6ccc70a5378ecd802fd28554796':
Loosen the constraint for releasing a shared file.
2014-09-22 21:51:24 +00:00
Svetoslav
6d0c499cc6
am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev
...
* commit '3e3bbe7adcf9721eddcd3b6baa401f53f6e6d969':
Fix a bug in parsing app widget state XML.
2014-09-22 21:51:18 +00:00
Svetoslav
a3df39cd24
Merge "Loosen the constraint for releasing a shared file." into lmp-dev
2014-09-22 21:40:00 +00:00
Svetoslav
ab4fbefe66
Merge "Fix a bug in parsing app widget state XML." into lmp-dev
2014-09-22 21:39:49 +00:00
John Spurlock
3c1cde687b
am fbe1df94: am f8580a4c: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev
...
* commit 'fbe1df945d64de300ad2425704ffcd5b3ed7c1e3':
Zen: Add events as a new config attribute.
2014-09-22 21:37:49 +00:00
Alan Viverette
8a3c9aaf24
am 171bbaad: am ebabff8d: am 39f73311: Merge "Remove trailing zeroes from vector drawable pathData" into lmp-dev
...
* commit '171bbaad8c9123d3d7b0334f714f23cd6f2eed51':
Remove trailing zeroes from vector drawable pathData
2014-09-22 21:37:45 +00:00
John Spurlock
b0fb3736ba
am f8580a4c: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev
...
* commit 'f8580a4c9240a400c89e1cc894a301070be09e89':
Zen: Add events as a new config attribute.
2014-09-22 21:26:33 +00:00
Alan Viverette
99dd6cc631
am ebabff8d: am 39f73311: Merge "Remove trailing zeroes from vector drawable pathData" into lmp-dev
...
* commit 'ebabff8d83f6793b93bc1f4145d06e5928146ba2':
Remove trailing zeroes from vector drawable pathData
2014-09-22 21:26:29 +00:00
Dianne Hackborn
7d6cd7a69b
am 2806bd99: am c65a5f33: am f01169a6: Merge "Work on issue #17581375 : Nexus 5 getting low on RAM" into lmp-dev
...
* commit '2806bd99e3e5e259eb52b1e6942831ade64e6fda':
Work on issue #17581375 : Nexus 5 getting low on RAM
2014-09-22 21:15:47 +00:00
John Spurlock
37486e54d7
am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev
...
* commit 'c018af27d9da4ee3d7dc79103ff35eb54f80a8de':
Zen: Add events as a new config attribute.
2014-09-22 21:15:32 +00:00
Alan Viverette
ce1145ddfb
am 39f73311: Merge "Remove trailing zeroes from vector drawable pathData" into lmp-dev
...
* commit '39f73311737656efab3f99edd47b993a5c2cfa80':
Remove trailing zeroes from vector drawable pathData
2014-09-22 21:15:28 +00:00
John Spurlock
e35c9bf9ba
Merge "Zen: Add events as a new config attribute." into lmp-dev
2014-09-22 21:09:39 +00:00
Alan Viverette
e2aa520598
Merge "Remove trailing zeroes from vector drawable pathData" into lmp-dev
2014-09-22 21:07:10 +00:00
Dianne Hackborn
6e78b35573
am c65a5f33: am f01169a6: Merge "Work on issue #17581375 : Nexus 5 getting low on RAM" into lmp-dev
...
* commit 'c65a5f332b7a900de3fadf407c37415e8585a88f':
Work on issue #17581375 : Nexus 5 getting low on RAM
2014-09-22 21:03:39 +00:00
Dianne Hackborn
789a7acd8c
am f01169a6: Merge "Work on issue #17581375 : Nexus 5 getting low on RAM" into lmp-dev
...
* commit 'f01169a6c1ca0f668097505151740b56db3294f1':
Work on issue #17581375 : Nexus 5 getting low on RAM
2014-09-22 20:50:56 +00:00
Svetoslav
cf3a86b559
Loosen the constraint for releasing a shared file.
...
In the spooler we have the renderer reading a file to visualize
content and the app writing a file to produce the content. Since
we have to swap the file under the renderer we have a mutex file
provider that both parties can request, use when released, and
release when required. This enables us to request the file which
closes the renderer and when the renderer is closed ask the app
to write some more pages, then open the renderer, and so on. The
mutex file provider was throwing of a thread that does not own
the file thries to relase it which is not needed, this should be
just a nop.
bug:17607134
Change-Id: Id6a2ce92d70077f57978b95315648faf02c13c68
2014-09-22 13:48:44 -07:00
John Spurlock
2dac62c2e9
Zen: Add events as a new config attribute.
...
Decouple events from alarms in the zen interception function,
and default the new allowEvents to true.
Bug:17580878
Change-Id: Iff10df385206ad73c3423ff118c79e94a10918d9
2014-09-22 16:44:37 -04:00
Dianne Hackborn
19c3b5d0d9
Merge "Work on issue #17581375 : Nexus 5 getting low on RAM" into lmp-dev
2014-09-22 20:40:17 +00:00
Michael Wright
d5d71146a1
am 508a8331: am 29c3c189: am 5dd936e7: Merge "Monitor MediaRouter for remote display connections." into lmp-dev
...
* commit '508a8331f1c626a1ecded79599c96060fd98e1f1':
Monitor MediaRouter for remote display connections.
2014-09-22 20:33:46 +00:00
Michael Wright
429bc05e18
am 29c3c189: am 5dd936e7: Merge "Monitor MediaRouter for remote display connections." into lmp-dev
...
* commit '29c3c1891e376f1a6ca84af9ce6bd56ec067dd71':
Monitor MediaRouter for remote display connections.
2014-09-22 20:22:45 +00:00
Michael Wright
e731ea1d37
am 5dd936e7: Merge "Monitor MediaRouter for remote display connections." into lmp-dev
...
* commit '5dd936e74269fb110ae59d110567e21337a9b5d0':
Monitor MediaRouter for remote display connections.
2014-09-22 20:15:59 +00:00
John Spurlock
4d9c71eaf7
am 024849b2: am 92b32c41: am afbfb9b5: Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev
...
* commit '024849b2f33339640c43415bc3e6acef997f5add':
Doze: Fix NPE found when pulsing and !dozing.
2014-09-22 20:09:31 +00:00
John Spurlock
7c903f1b10
am 2af1bf3b: am 53a19524: am ff8c16e7: Merge "Zen: Add content description to settings icon." into lmp-dev
...
* commit '2af1bf3bd009f76638e9f862f519e12cf8cfa685':
Zen: Add content description to settings icon.
2014-09-22 20:09:24 +00:00
Michael Wright
3119b82c43
Merge "Monitor MediaRouter for remote display connections." into lmp-dev
2014-09-22 20:04:30 +00:00
Alan Viverette
9781c5c736
Remove trailing zeroes from vector drawable pathData
...
Speeds up parseFloat.
BUG: 17391797
Change-Id: I81cf824f6ba97e65ed9628a15ad762c4c9860630
2014-09-22 13:02:37 -07:00
John Spurlock
3c890fc623
am 92b32c41: am afbfb9b5: Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev
...
* commit '92b32c411a9d0acb5abd192ae959b5ed47b88f0a':
Doze: Fix NPE found when pulsing and !dozing.
2014-09-22 19:58:44 +00:00
John Spurlock
ecce707288
am 53a19524: am ff8c16e7: Merge "Zen: Add content description to settings icon." into lmp-dev
...
* commit '53a195240f444ea330f63aebe716cf249519a047':
Zen: Add content description to settings icon.
2014-09-22 19:58:40 +00:00
Dianne Hackborn
d412563922
Work on issue #17581375 : Nexus 5 getting low on RAM
...
Try to catch any cases where we remove a ProcessRecord from the LRU
list when it may still have a process associated with it, report
that this happened, and try to make sure the process is killed.
Change-Id: Icd74439caba5e1c283c01a49a46dae926a00ba71
2014-09-22 12:52:49 -07:00
Alan Viverette
9368e08481
am 8ae47443: am 8183ba88: am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev
...
* commit '8ae4744362d9b89a3406a74fa453f565eadab3bd':
Pass explicit null theme when preloading drawables
2014-09-22 19:50:10 +00:00
John Spurlock
51abd935e3
am afbfb9b5: Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev
...
* commit 'afbfb9b5efd8a7ebb320f0b5e8c3003b646705a8':
Doze: Fix NPE found when pulsing and !dozing.
2014-09-22 19:44:49 +00:00
John Spurlock
37758bf5a3
am ff8c16e7: Merge "Zen: Add content description to settings icon." into lmp-dev
...
* commit 'ff8c16e73349bc7c1e47f1ef88276928cd1a7366':
Zen: Add content description to settings icon.
2014-09-22 19:44:44 +00:00
Alan Viverette
c1f82f5254
am 8183ba88: am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev
...
* commit '8183ba888f70ecf34adc7f02389f86f7c78a0aef':
Pass explicit null theme when preloading drawables
2014-09-22 19:37:47 +00:00
John Spurlock
101b785d42
Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev
2014-09-22 19:35:55 +00:00
John Spurlock
b9e9729887
Merge "Zen: Add content description to settings icon." into lmp-dev
2014-09-22 19:35:12 +00:00
Yohei Yukawa
41dd4dff4e
am 79a12ba6: am 8fe1ca2c: am b5d063dc: Merge "Work on issue #17506095 : Plumb a new configuration to IMMS" into lmp-dev
...
* commit '79a12ba6e6ab5104579bab2ad765c61263ed56be':
Work on issue #17506095 : Plumb a new configuration to IMMS
2014-09-22 19:32:09 +00:00
Adam Lesinski
534b739118
am 37e3df38: am 1aa4db07: am 81745c51: Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev
...
* commit '37e3df38b6034f97dc6d2d3918b58d4bd0eeb751':
AAPT: Continuation of public/private attribute fix
2014-09-22 19:32:06 +00:00
Przemyslaw Szczepaniak
227079a370
am 32190676: am 90ae2778: am 299bb1fb: Fix issues with new TTS API
...
* commit '32190676f55713bce74571c123c7903004c9c383':
Fix issues with new TTS API
2014-09-22 19:32:02 +00:00
Jason Monk
797f722e29
am 1555ed94: am eeda2131: am 5c2ecf24: Merge "Announce title of QS detail views" into lmp-dev
...
* commit '1555ed941dd153fdbd4d47e4b500cb326e1d04ba':
Announce title of QS detail views
2014-09-22 19:31:58 +00:00
Jason Monk
f09cadc6a3
am 78f7385f: am f09fda20: am f9d996c1: Fix status bar cast icon not updating
...
* commit '78f7385f9663d809f066225c7a39b69363976302':
Fix status bar cast icon not updating
2014-09-22 19:31:54 +00:00
Ruben Brunk
1780cbc7a9
am d314f286: am ee38cd33: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev
...
* commit 'd314f286e04e4b61579936699407097ede030873':
camera2: Avoid setting null metering regions in LEGACY.
camera2: Fix JPEG orientation set by LEGACY request.
2014-09-22 19:31:50 +00:00
John Spurlock
5f60e02208
am d613437b: am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev
...
* commit 'd613437ba4eb18c12135295fc743e37011fb2f9b':
Doze: Ensure a doze reset happens after leaving keyguard.
2014-09-22 19:31:46 +00:00
Yigit Boyar
6c55dfc8cd
am 0b380581: am a9faefb3: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev
...
* commit '0b3805812b2dcf096433e310ee2567f33849eec8':
Allow fallback to Toolbar's default Navigation Icon
2014-09-22 19:31:42 +00:00