OSDN Git Service
Derek Sollenberger [Tue, 7 Oct 2014 13:34:08 +0000 (13:34 +0000)]
Merge "Mutable Java Shaders with Immutable Native Shaders"
Amit Mahajan [Tue, 7 Oct 2014 05:27:48 +0000 (05:27 +0000)]
am
ec20fc92: am
190202f7: am
dbbf4932: am
d9a3f89a: Merge commit \'
69555fc2\' into fix-merge-conflict3
* commit '
ec20fc9273081942b99f33c5d5fded17e0303aac':
Sms7BitEncodingTranslator
Amit Mahajan [Tue, 7 Oct 2014 05:23:20 +0000 (05:23 +0000)]
am
190202f7: am
dbbf4932: am
d9a3f89a: Merge commit \'
69555fc2\' into fix-merge-conflict3
* commit '
190202f7e586e02e098b330ac84eb441a56005d3':
Sms7BitEncodingTranslator
Amit Mahajan [Tue, 7 Oct 2014 05:19:27 +0000 (05:19 +0000)]
am
dbbf4932: am
d9a3f89a: Merge commit \'
69555fc2\' into fix-merge-conflict3
* commit '
dbbf493220ea6bb51016a4d6bb77b3b7133b1b4b':
Sms7BitEncodingTranslator
Amit Mahajan [Tue, 7 Oct 2014 05:12:44 +0000 (05:12 +0000)]
am
d9a3f89a: Merge commit \'
69555fc2\' into fix-merge-conflict3
* commit '
d9a3f89a0727590a069c563a8b97fe99b866d67c':
Sms7BitEncodingTranslator
Yohei Yukawa [Tue, 7 Oct 2014 04:59:40 +0000 (04:59 +0000)]
Merge "Use try-with-resources"
Amit Mahajan [Tue, 7 Oct 2014 04:57:42 +0000 (21:57 -0700)]
Merge commit '
69555fc2' into fix-merge-conflict3
Conflicts:
core/res/res/values/symbols.xml
Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
Yorke Lee [Tue, 7 Oct 2014 04:13:03 +0000 (04:13 +0000)]
Yorke Lee [Tue, 7 Oct 2014 04:04:22 +0000 (04:04 +0000)]
Yorke Lee [Tue, 7 Oct 2014 03:56:34 +0000 (03:56 +0000)]
Yorke Lee [Tue, 7 Oct 2014 03:31:21 +0000 (03:31 +0000)]
am
770ed6ec: Fix build break
* commit '
770ed6ec920ec10798c5b7a7b4850ccc0b2a531f':
Fix build break
Yorke Lee [Tue, 7 Oct 2014 01:58:52 +0000 (18:58 -0700)]
Fix build break
Bug:
16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
(cherry picked from commit
9858af0ec68ad28db60047587c8eb6232b4a6591)
Yohei Yukawa [Mon, 6 Oct 2014 11:50:28 +0000 (20:50 +0900)]
Use try-with-resources
We can start relying on try-with-resources in framework.
Change-Id: Iac1194022065c41e8593524e483d6076d4ea72fa
Yorke Lee [Tue, 7 Oct 2014 01:22:47 +0000 (01:22 +0000)]
am
3e6fe5d8: am
5cf70a1f: am
0b27c283: am
7e552595: am
4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
* commit '
3e6fe5d87b982238e718593133b781ce1086d672':
Add ability to add sim-initiated MO call to UI (2/4)
Amit Mahajan [Tue, 7 Oct 2014 01:20:26 +0000 (01:20 +0000)]
Merge "Sms7BitEncodingTranslator" into lmp-dev
Yorke Lee [Tue, 7 Oct 2014 01:15:26 +0000 (01:15 +0000)]
am
5cf70a1f: am
0b27c283: am
7e552595: am
4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
* commit '
5cf70a1f7de3b3e3b4fb45fcb379aa2f8d6ac3e2':
Add ability to add sim-initiated MO call to UI (2/4)
Yorke Lee [Tue, 7 Oct 2014 01:08:52 +0000 (01:08 +0000)]
am
0b27c283: am
7e552595: am
4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
* commit '
0b27c283771e3690f47900d0c2130ae10af332a5':
Add ability to add sim-initiated MO call to UI (2/4)
Yorke Lee [Tue, 7 Oct 2014 01:04:30 +0000 (01:04 +0000)]
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)
Jeff Sharkey [Tue, 7 Oct 2014 01:03:36 +0000 (01:03 +0000)]
am
0cfe6f1d: am
6d3ea645: am
fcc059dc: am
1d5ef81e: am
99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
* commit '
0cfe6f1d2fbef4494779158db9662ee0b4561674':
Reduce PackageInstaller I/O pressure.
Geoff Mendal [Tue, 7 Oct 2014 01:03:28 +0000 (01:03 +0000)]
am
8b2b2628: (-s ours) am
4dae637f: (-s ours) am
17cef234: (-s ours) am
6a6369b6: (-s ours) am
fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
8b2b262875aa2fa72006d51417df6e43d59e8c86':
Import translations. DO NOT MERGE
Raluca Sauciuc [Tue, 7 Oct 2014 01:03:21 +0000 (01:03 +0000)]
am
b81889f5: am
59f7c4c7: am
1cb156bb: am
f35c305f: am
6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
* commit '
b81889f54ec297aba82ac8110c9983966d2bf9a6':
Fix test framework to allow Mockito tests to run successfully on ART.
Paul Jensen [Tue, 7 Oct 2014 01:03:17 +0000 (01:03 +0000)]
am
7f114608: am
35c19fb0: am
84527eca: am
69c489ed: am
7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
* commit '
7f1146084b6caa3fa73a08968214868682e7833c':
Use network-specific HTTP proxy settings in captive portal login app.
Geoff Mendal [Tue, 7 Oct 2014 01:03:12 +0000 (01:03 +0000)]
am
9cbb754d: (-s ours) am
e78ec420: (-s ours) am
f2bef9cd: (-s ours) am
1d593ad4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
9cbb754dac04fdbf0acc29153adfeefa70fe60dc':
Import translations. DO NOT MERGE
Yuncheol Heo [Tue, 7 Oct 2014 01:03:06 +0000 (01:03 +0000)]
am
c1044555: am
684675f4: am
d534b936: Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
* commit '
c10445551282270c49a0769050dd21ffeee53949':
Change visibility of RecordSource into public.
Xia Ying [Tue, 5 Aug 2014 21:37:18 +0000 (16:37 -0500)]
Sms7BitEncodingTranslator
Bug:
16197894
Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
Yorke Lee [Tue, 7 Oct 2014 00:58:47 +0000 (00:58 +0000)]
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)
Jeff Sharkey [Tue, 7 Oct 2014 00:56:00 +0000 (00:56 +0000)]
am
6d3ea645: am
fcc059dc: am
1d5ef81e: am
99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
* commit '
6d3ea64599518fcbdceade5ebde7e08cc4613819':
Reduce PackageInstaller I/O pressure.
Geoff Mendal [Tue, 7 Oct 2014 00:55:56 +0000 (00:55 +0000)]
am
4dae637f: (-s ours) am
17cef234: (-s ours) am
6a6369b6: (-s ours) am
fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
4dae637fcc1dee64fb6edb279d7c9f2578b717ed':
Import translations. DO NOT MERGE
Raluca Sauciuc [Tue, 7 Oct 2014 00:55:52 +0000 (00:55 +0000)]
am
59f7c4c7: am
1cb156bb: am
f35c305f: am
6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
* commit '
59f7c4c749fb69c9f83a3d28784147a941fecc58':
Fix test framework to allow Mockito tests to run successfully on ART.
Paul Jensen [Tue, 7 Oct 2014 00:55:48 +0000 (00:55 +0000)]
am
35c19fb0: am
84527eca: am
69c489ed: am
7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
* commit '
35c19fb0f4dd67b907c74294d7880d3547a209af':
Use network-specific HTTP proxy settings in captive portal login app.
Geoff Mendal [Tue, 7 Oct 2014 00:55:44 +0000 (00:55 +0000)]
am
e78ec420: (-s ours) am
f2bef9cd: (-s ours) am
1d593ad4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
e78ec420a713978431ee1e03f559b023f3be6cb4':
Import translations. DO NOT MERGE
Yuncheol Heo [Tue, 7 Oct 2014 00:55:24 +0000 (00:55 +0000)]
am
684675f4: am
d534b936: Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
* commit '
684675f44ddb8792affbb54fdc194fa944c4ba43':
Change visibility of RecordSource into public.
Yorke Lee [Tue, 7 Oct 2014 00:54:51 +0000 (00:54 +0000)]
Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
Selim Cinek [Tue, 7 Oct 2014 00:44:04 +0000 (00:44 +0000)]
am
afb1981e: am
63a6bc2d: am
79934acb: Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev
* commit '
afb1981e004dff060c55972ebfb413ebead4787a':
Fixed a crash when the detail panel got very big
Jeff Sharkey [Tue, 7 Oct 2014 00:40:11 +0000 (00:40 +0000)]
am
fcc059dc: am
1d5ef81e: am
99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
* commit '
fcc059dcf0d84a77d9c2b5ef3b01c23afe25f72c':
Reduce PackageInstaller I/O pressure.
Geoff Mendal [Tue, 7 Oct 2014 00:40:03 +0000 (00:40 +0000)]
am
17cef234: (-s ours) am
6a6369b6: (-s ours) am
fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
17cef23480b7cb05ce35cc3e666d3871352c495c':
Import translations. DO NOT MERGE
Raluca Sauciuc [Tue, 7 Oct 2014 00:39:59 +0000 (00:39 +0000)]
am
1cb156bb: am
f35c305f: am
6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
* commit '
1cb156bb0160a1474b1703893b6e3e96c407cc5a':
Fix test framework to allow Mockito tests to run successfully on ART.
Paul Jensen [Tue, 7 Oct 2014 00:39:55 +0000 (00:39 +0000)]
am
84527eca: am
69c489ed: am
7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
* commit '
84527eca759495b4a5514edbea9a56b907992a42':
Use network-specific HTTP proxy settings in captive portal login app.
Geoff Mendal [Tue, 7 Oct 2014 00:39:51 +0000 (00:39 +0000)]
am
f2bef9cd: (-s ours) am
1d593ad4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
f2bef9cd1936c5d26d88c17b56746361af6e78f3':
Import translations. DO NOT MERGE
Selim Cinek [Tue, 7 Oct 2014 00:35:06 +0000 (00:35 +0000)]
am
63a6bc2d: am
79934acb: Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev
* commit '
63a6bc2d996381ae62a71b2d464978b7f884d7d1':
Fixed a crash when the detail panel got very big
Yuncheol Heo [Tue, 7 Oct 2014 00:34:25 +0000 (00:34 +0000)]
am
d534b936: Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
* commit '
d534b936d70cd45d7dffd623ca16ec9b7fdbcbe2':
Change visibility of RecordSource into public.
Jeff Sharkey [Tue, 7 Oct 2014 00:32:19 +0000 (00:32 +0000)]
am
1d5ef81e: am
99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
* commit '
1d5ef81e29279f769d79315f2a38e747ea92e10f':
Reduce PackageInstaller I/O pressure.
Geoff Mendal [Tue, 7 Oct 2014 00:32:15 +0000 (00:32 +0000)]
am
6a6369b6: (-s ours) am
fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6a6369b61a51ebf415a37d19e5b2aba789bc9ce7':
Import translations. DO NOT MERGE
Raluca Sauciuc [Tue, 7 Oct 2014 00:32:10 +0000 (00:32 +0000)]
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.
Paul Jensen [Tue, 7 Oct 2014 00:32:00 +0000 (00:32 +0000)]
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.
Geoff Mendal [Tue, 7 Oct 2014 00:31:51 +0000 (00:31 +0000)]
am
1d593ad4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
1d593ad47470150f751cc573eb56dae97470cf41':
Import translations. DO NOT MERGE
Yuncheol Heo [Tue, 7 Oct 2014 00:29:05 +0000 (00:29 +0000)]
Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
Selim Cinek [Tue, 7 Oct 2014 00:28:51 +0000 (00:28 +0000)]
am
79934acb: Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev
* commit '
79934acb40de31a7c4572bdb7a747edcb12bb8e4':
Fixed a crash when the detail panel got very big
Selim Cinek [Tue, 7 Oct 2014 00:22:32 +0000 (00:22 +0000)]
Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev
Chris Craik [Tue, 7 Oct 2014 00:20:52 +0000 (00:20 +0000)]
am
2cf2ae72: am
1155ed19: am
0aa69ff2: am
1a6c41fb: am
6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
* commit '
2cf2ae7231544237d7ebbc7d4c823a8eb81e9b22':
Avoid changeBounds animations on Views that are not yet laidout
Mike Lockwood [Tue, 7 Oct 2014 00:20:47 +0000 (00:20 +0000)]
am
73c35e27: am
66c009eb: am
bb68c263: am
3df6b76c: am
56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '
73c35e27d3bde6e316e3359604f4a131fef3e263':
Add support for playing audio during bootanimation
Mathieu Chartier [Tue, 7 Oct 2014 00:20:42 +0000 (00:20 +0000)]
am
361e2049: am
830467e2: am
5ade30e8: am
405a934e: am
1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
* commit '
361e204991a2f06370e9886a9a8382279c93399c':
Fix incorrect JNI_ABORT
Jinsuk Kim [Tue, 7 Oct 2014 00:20:38 +0000 (00:20 +0000)]
am
c71c8333: am
7f84aec9: am
84659edd: Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev
* commit '
c71c8333272ac81b72e6d7456dc8ec442dfc08fc':
CEC: Send <Device Vendor ID> after address allocation
Geoff Mendal [Tue, 7 Oct 2014 00:20:34 +0000 (00:20 +0000)]
am
1180831b: (-s ours) am
bfa09525: (-s ours) am
a6b02708: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
1180831b64a9358946ef96e0e751bbade5f9dece':
Import translations. DO NOT MERGE
Jinsuk Kim [Tue, 7 Oct 2014 00:20:29 +0000 (00:20 +0000)]
am
4f729b3f: am
a3ad702f: am
85c927cf: Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
* commit '
4f729b3fc790069b16ae0f8401a7f2d8efd1e057':
CEC: Ensure the key transmission finishes all the time
Chris Craik [Tue, 7 Oct 2014 00:13:22 +0000 (00:13 +0000)]
am
1155ed19: am
0aa69ff2: am
1a6c41fb: am
6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
* commit '
1155ed1920fb93ff79e4e61fc928f6bd1d68c18c':
Avoid changeBounds animations on Views that are not yet laidout
Mike Lockwood [Tue, 7 Oct 2014 00:13:18 +0000 (00:13 +0000)]
am
66c009eb: am
bb68c263: am
3df6b76c: am
56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '
66c009ebfe5b31aa1f176d4856d95f5daad6079d':
Add support for playing audio during bootanimation
Mathieu Chartier [Tue, 7 Oct 2014 00:13:14 +0000 (00:13 +0000)]
am
830467e2: am
5ade30e8: am
405a934e: am
1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
* commit '
830467e2873767ff11960c3b9fecb2e7d4c57b21':
Fix incorrect JNI_ABORT
Jinsuk Kim [Tue, 7 Oct 2014 00:13:06 +0000 (00:13 +0000)]
am
7f84aec9: am
84659edd: Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev
* commit '
7f84aec9b34b3dea2fdf3ee4fc3273e1bdd8a573':
CEC: Send <Device Vendor ID> after address allocation
Geoff Mendal [Tue, 7 Oct 2014 00:13:02 +0000 (00:13 +0000)]
am
bfa09525: (-s ours) am
a6b02708: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
bfa09525ab4b307ebe8f4e38f8b3ac6aee19e466':
Import translations. DO NOT MERGE
Jinsuk Kim [Tue, 7 Oct 2014 00:12:58 +0000 (00:12 +0000)]
am
a3ad702f: am
85c927cf: Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
* commit '
a3ad702f38b17fe27d5f73bb98a123959ada59ac':
CEC: Ensure the key transmission finishes all the time
Geoff Mendal [Tue, 7 Oct 2014 00:12:02 +0000 (00:12 +0000)]
am
b65c9a1b: (-s ours) am
a997d0e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
b65c9a1bbe2c5bddbe97543f4626867192ed09ff':
Import translations. DO NOT MERGE
Wei Liu [Tue, 7 Oct 2014 00:11:58 +0000 (00:11 +0000)]
am
38f4d482: am
a84130d3: am
de93b104: am
a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
* commit '
38f4d4828827acc9ecda0925fa298eea87ecfba5':
Hide bug report notification in Android Framework from watches.
Geoff Mendal [Tue, 7 Oct 2014 00:06:00 +0000 (00:06 +0000)]
am
a997d0e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
a997d0e3b6e46fdeaa8d91ea306c0ce7602aa52b':
Import translations. DO NOT MERGE
Wei Liu [Tue, 7 Oct 2014 00:05:56 +0000 (00:05 +0000)]
am
a84130d3: am
de93b104: am
a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
* commit '
a84130d3e45ad1ac4cb5843adc027d463c3c304d':
Hide bug report notification in Android Framework from watches.
Chris Craik [Tue, 7 Oct 2014 00:05:32 +0000 (00:05 +0000)]
am
0aa69ff2: am
1a6c41fb: am
6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
* commit '
0aa69ff2ff9e8556f4963b7dfdad56996a604392':
Avoid changeBounds animations on Views that are not yet laidout
Mike Lockwood [Tue, 7 Oct 2014 00:05:28 +0000 (00:05 +0000)]
am
bb68c263: am
3df6b76c: am
56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '
bb68c263620fe91eefb241efaf099742b3e6069c':
Add support for playing audio during bootanimation
Mathieu Chartier [Tue, 7 Oct 2014 00:05:24 +0000 (00:05 +0000)]
am
5ade30e8: am
405a934e: am
1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
* commit '
5ade30e82e05c783d74e3a52316be4c3ed11239c':
Fix incorrect JNI_ABORT
Jeff Sharkey [Mon, 6 Oct 2014 23:59:43 +0000 (23:59 +0000)]
am
99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
* commit '
99586dc0108d0f4311c8af4d06ed113bbf40a6ee':
Reduce PackageInstaller I/O pressure.
Jinsuk Kim [Mon, 6 Oct 2014 23:55:09 +0000 (23:55 +0000)]
am
84659edd: Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev
* commit '
84659edd41b0bc7ecde645405e926a641e704824':
CEC: Send <Device Vendor ID> after address allocation
Geoff Mendal [Mon, 6 Oct 2014 23:55:05 +0000 (23:55 +0000)]
am
a6b02708: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
a6b027084cdeefcd431a4e6b46c1718ed3dfb874':
Import translations. DO NOT MERGE
Jinsuk Kim [Mon, 6 Oct 2014 23:55:02 +0000 (23:55 +0000)]
am
85c927cf: Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
* commit '
85c927cfc264eda39a13ac224197525c5fae8bbc':
CEC: Ensure the key transmission finishes all the time
Selim Cinek [Mon, 6 Oct 2014 23:54:46 +0000 (16:54 -0700)]
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
Geoff Mendal [Mon, 6 Oct 2014 23:52:31 +0000 (23:52 +0000)]
am
fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
fc8d65197a6404a93f1230ac5ebc635438a5c094':
Import translations. DO NOT MERGE
Raluca Sauciuc [Mon, 6 Oct 2014 23:52:19 +0000 (23:52 +0000)]
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.
Paul Jensen [Mon, 6 Oct 2014 23:52:12 +0000 (23:52 +0000)]
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.
Jeff Sharkey [Mon, 6 Oct 2014 23:51:52 +0000 (23:51 +0000)]
Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
Chris Craik [Mon, 6 Oct 2014 23:51:05 +0000 (23:51 +0000)]
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
Mike Lockwood [Mon, 6 Oct 2014 23:51:00 +0000 (23:51 +0000)]
am
3df6b76c: am
56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '
3df6b76c5f6ca38f986305c805c9d90e0b861a41':
Add support for playing audio during bootanimation
Mathieu Chartier [Mon, 6 Oct 2014 23:50:55 +0000 (23:50 +0000)]
am
405a934e: am
1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
* commit '
405a934ec46fccf7d2e6e573bb65a5be4b51665a':
Fix incorrect JNI_ABORT
Jinsuk Kim [Mon, 6 Oct 2014 23:48:19 +0000 (23:48 +0000)]
Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev
Jinsuk Kim [Mon, 6 Oct 2014 22:43:44 +0000 (07:43 +0900)]
CEC: Send <Device Vendor ID> after address allocation
This is required to pass CTS 11.2.9-2.
Bug:
17882288
Change-Id: Ie2823be8635a458a63a95abd44135035667d5836
Geoff Mendal [Mon, 6 Oct 2014 23:45:39 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 6 Oct 2014 23:44:49 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 6 Oct 2014 23:39:11 +0000 (23:39 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Jeff Sharkey [Mon, 6 Oct 2014 22:14:27 +0000 (15:14 -0700)]
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
Geoff Mendal [Mon, 6 Oct 2014 23:34:09 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 6 Oct 2014 23:29:47 +0000 (23:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 6 Oct 2014 23:28:18 +0000 (23:28 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 23:26:35 +0000 (23:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 6 Oct 2014 23:21:55 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Raluca Sauciuc [Mon, 6 Oct 2014 23:19:11 +0000 (23:19 +0000)]
Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
Jinsuk Kim [Mon, 6 Oct 2014 23:15:32 +0000 (23:15 +0000)]
Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev
Geoff Mendal [Mon, 6 Oct 2014 23:10:37 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 6 Oct 2014 23:06:53 +0000 (23:06 +0000)]
Merge "Import translations. DO NOT MERGE"
Paul Jensen [Mon, 6 Oct 2014 23:01:26 +0000 (23:01 +0000)]
Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
Wei Liu [Mon, 6 Oct 2014 22:39:05 +0000 (22:39 +0000)]
am
de93b104: am
a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
* commit '
de93b1049eb84ccdb30e9eb7dd1f255a82e41918':
Hide bug report notification in Android Framework from watches.
ztenghui [Mon, 6 Oct 2014 22:36:31 +0000 (22:36 +0000)]
am
0a04e311: am
f11d9de4: am
8cdb0bc0: Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
* commit '
0a04e3119891d52f69c08d0ce42777cba3566b39':
Use float instead of double to increase spot shadow perf
Chris Craik [Mon, 6 Oct 2014 22:35:19 +0000 (22:35 +0000)]
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
Mike Lockwood [Mon, 6 Oct 2014 22:35:13 +0000 (22:35 +0000)]
am
56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '
56b7d562af4dd0e7bd04163fe9a86a801fcff1fe':
Add support for playing audio during bootanimation