OSDN Git Service
Jeff Sharkey [Wed, 12 Nov 2014 22:20:46 +0000 (22:20 +0000)]
am
d68b87cd: Recover apps with malformed certificates.
* commit '
d68b87cdd402d46013170d9316a31c82be4e4816':
Recover apps with malformed certificates.
Jeff Sharkey [Wed, 12 Nov 2014 20:18:11 +0000 (12:18 -0800)]
Recover apps with malformed certificates.
There was a window of time in Lollipop where we persisted certificates
after they had passed through a decode/encode cycle. The well-written
OpenSSL library was liberal when decoding (allowing slightly malformed
certs to be parsed), but then strict when encoding, giving us
different bytes for effectively the same certificate.
A related libcore change (
0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b)
now returns the original bytes verbatim, fixing both pre-Lollipop
installs and installs after that change.
This change recovers any apps that had been installed during the
window of time described above by doing a one-time check to see if
the certs are effectively equal.
Bug:
18228011
Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
smain@google.com [Wed, 12 Nov 2014 17:52:06 +0000 (17:52 +0000)]
am
8d88f19b: am
f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
* commit '
8d88f19bfe8ec0afb27593c0dea9b547d8c80b48':
fix code type and mention api level 21 exception for bindService()
Renato Mangini [Wed, 12 Nov 2014 17:52:02 +0000 (17:52 +0000)]
am
a53b8bad: am
4b7b68d8: Add "notification" category for samples.
* commit '
a53b8badb994c3825140f68eba94888b3274c0b5':
Add "notification" category for samples.
smain@google.com [Wed, 12 Nov 2014 17:44:52 +0000 (17:44 +0000)]
am
f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
* commit '
f9c4f6b56e1392a411e2996a2bf372873ebf14da':
fix code type and mention api level 21 exception for bindService()
Renato Mangini [Wed, 12 Nov 2014 17:44:48 +0000 (17:44 +0000)]
am
4b7b68d8: Add "notification" category for samples.
* commit '
4b7b68d824ee8bf184f6bfb05f75c74c129a9f8e':
Add "notification" category for samples.
smain@google.com [Wed, 12 Nov 2014 17:41:35 +0000 (17:41 +0000)]
Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
smain@google.com [Wed, 12 Nov 2014 17:32:16 +0000 (09:32 -0800)]
fix code type and mention api level 21 exception for bindService()
Change-Id: I45460a1559960a32818e9cc88b1241b26f2f1f7d
Renato Mangini [Wed, 12 Nov 2014 03:51:53 +0000 (19:51 -0800)]
Add "notification" category for samples.
Bug:
18323953
Change-Id: Ifb78015604fd203baaf5f4c6496a86aa6c831227
Bryce Lee [Tue, 11 Nov 2014 23:59:32 +0000 (23:59 +0000)]
Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev
Deepanshu Gupta [Tue, 11 Nov 2014 17:17:02 +0000 (17:17 +0000)]
am
a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev
* commit '
a44fdb9e216810ba62f20c1b4571ebc240931efa':
Don't skip loading object animator.
Deepanshu Gupta [Tue, 11 Nov 2014 17:11:22 +0000 (17:11 +0000)]
Merge "Don't skip loading object animator." into lmp-dev
Deepanshu Gupta [Tue, 11 Nov 2014 15:21:19 +0000 (15:21 +0000)]
Don't skip loading object animator.
This is used by Buttons as part of StateListAnimator.
Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274
Eric Laurent [Tue, 11 Nov 2014 01:43:21 +0000 (01:43 +0000)]
am
75c306dd: am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge:
8db769d automerge:
9e0ed1c
* commit '
75c306ddc716b36bdc54aaf75dd7eacbd008ab98':
Eric Laurent [Tue, 11 Nov 2014 01:34:45 +0000 (01:34 +0000)]
am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge:
8db769d
automerge:
9e0ed1c
* commit '
9e0ed1c2d67bc2ec74e24782f3738889fa0d79d2':
Eric Laurent [Tue, 11 Nov 2014 00:22:33 +0000 (00:22 +0000)]
am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
automerge:
8db769d
* commit '
8db769dd56822a59f1997a9cb53ed02d3d1cb8dd':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:44:16 +0000 (23:44 +0000)]
am
3011e1be: am
8db769dd: am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
3011e1be2c14f99b1fd72b7e17207ad067668f1b':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:38:23 +0000 (23:38 +0000)]
am
8db769dd: am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
8db769dd56822a59f1997a9cb53ed02d3d1cb8dd':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:33:52 +0000 (23:33 +0000)]
am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
df878bd3fc63f26e91b055e39ba63c53c14b31a0':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:29:07 +0000 (23:29 +0000)]
am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
ced2f74ac170439231f189e31538b9f403909966':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:24:02 +0000 (23:24 +0000)]
am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
e8c1a97fa33797df528265b6f0b0c2c39ac2c589':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:20:06 +0000 (23:20 +0000)]
am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
3b92fc04700a68dab3c3c4a873535837c4e51e8b':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:11:00 +0000 (23:11 +0000)]
am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
1c2b0d52144dc94a7d1dcefb7e4fbd7fb29f5202':
AudioEffect JNI: use new max preprocessing constant
Joe Fernandez [Mon, 10 Nov 2014 23:02:56 +0000 (23:02 +0000)]
am
3bd60359: am
c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
* commit '
3bd60359e2db6cbd4437179225fe4f9dd4f682e4':
docs:builds tools 21.1.1 update
Joe Fernandez [Mon, 10 Nov 2014 22:55:20 +0000 (22:55 +0000)]
am
c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
* commit '
c2f2a72571a485671f36e9d5b5c1fd9e788c11cd':
docs:builds tools 21.1.1 update
Joe Fernandez [Mon, 10 Nov 2014 22:50:16 +0000 (22:50 +0000)]
Merge "docs:builds tools 21.1.1 update" into lmp-docs
Dirk Dougherty [Mon, 10 Nov 2014 22:18:10 +0000 (22:18 +0000)]
am
f253fe3e: am
602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs
* commit '
f253fe3e67345325b84fe0b13e38b8f2ec636b98':
Add Nexus 6 and Nexus 9 to the device framer.
Dirk Dougherty [Mon, 10 Nov 2014 22:11:54 +0000 (22:11 +0000)]
am
602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs
* commit '
602c63f8405466dab18b6bbd93eb682900cf459f':
Add Nexus 6 and Nexus 9 to the device framer.
Bryce Lee [Mon, 10 Nov 2014 21:33:28 +0000 (13:33 -0800)]
Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
Bug:
18297399
Change-Id: I5a520e8bf861e46d61e54d7d0849e55b2e5d9239
Deepanshu Gupta [Mon, 10 Nov 2014 21:00:43 +0000 (21:00 +0000)]
Merge "Fix setting styles in custom views." into lmp-dev
automerge:
5c22a79
* commit '
5c22a79baf81727b56a85a194d678c18449b5150':
Fix setting styles in custom views.
Deepanshu Gupta [Mon, 10 Nov 2014 20:58:58 +0000 (20:58 +0000)]
Merge "Add primitive shadows support to LayoutLib" into lmp-dev
automerge:
97c04ac
* commit '
97c04ac7ed4f34ca0cfb75646cc00687fb0954d4':
Add primitive shadows support to LayoutLib
Deepanshu Gupta [Mon, 10 Nov 2014 20:56:36 +0000 (20:56 +0000)]
Merge "Remove needlessly thrown IOException." into lmp-dev
automerge:
f305d2c
* commit '
f305d2c4a80af9e2011824349adc6f133cd8822c':
Remove needlessly thrown IOException.
Deepanshu Gupta [Mon, 10 Nov 2014 20:28:40 +0000 (20:28 +0000)]
Merge "Fix setting styles in custom views." into lmp-dev
Deepanshu Gupta [Mon, 10 Nov 2014 20:10:55 +0000 (20:10 +0000)]
Fix setting styles in custom views.
Bug: http://b.android.com/78842
Change-Id: I5d4571d94d96b00419acc258c9e2b519367b689d
Dirk Dougherty [Mon, 10 Nov 2014 19:45:16 +0000 (19:45 +0000)]
Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs
Eric Laurent [Wed, 5 Nov 2014 20:18:05 +0000 (12:18 -0800)]
AudioEffect JNI: use new max preprocessing constant
Bug:
18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
(cherry picked from commit
b27a8a5bcc40054f6d775d070bc2de6eb996d1c2)
Deepanshu Gupta [Mon, 10 Nov 2014 18:58:27 +0000 (18:58 +0000)]
Merge "Add primitive shadows support to LayoutLib" into lmp-dev
Deepanshu Gupta [Mon, 10 Nov 2014 18:54:19 +0000 (18:54 +0000)]
Merge "Remove needlessly thrown IOException." into lmp-dev
Rich Slogar [Mon, 10 Nov 2014 17:56:48 +0000 (09:56 -0800)]
docs:builds tools 21.1.1 update
Change-Id: I96fd6ad0926414664b192ca41d13f49f25365e4a
Geoff Mendal [Mon, 10 Nov 2014 17:23:37 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 10 Nov 2014 17:13:39 +0000 (09:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9f1f78c7b1589471c3a4f315d53923db92378b37
Auto-generated-cl: translation import
Ricardo Cervera [Mon, 10 Nov 2014 16:46:47 +0000 (16:46 +0000)]
am
43f46ab9: am
e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
* commit '
43f46ab99de710f9b39106e1ac4733f06188e74c':
docs: Material design shadow fixes.
Ricardo Cervera [Mon, 10 Nov 2014 16:42:20 +0000 (16:42 +0000)]
am
e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
* commit '
e627b94c76ad144abb0207efcdc6b1cb3855bc14':
docs: Material design shadow fixes.
Ricardo Cervera [Mon, 10 Nov 2014 16:36:20 +0000 (16:36 +0000)]
Merge "docs: Material design shadow fixes." into lmp-docs
Geoff Mendal [Mon, 10 Nov 2014 15:03:14 +0000 (07:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5f5fab81cb5dc43388dba446d704c6f50e0415d9
Auto-generated-cl: translation import
Andreas Gampe [Fri, 7 Nov 2014 23:43:00 +0000 (15:43 -0800)]
Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE
Tighter list derived from usage.
Bug:
18248625
Change-Id: I3796fc13f880b1219579103c81bc2d1d727eb4df
Ricardo Cervera [Fri, 7 Nov 2014 23:40:06 +0000 (15:40 -0800)]
docs: Material design shadow fixes.
Bug:
18294964
Change-Id: I7abb298c3de71b8d8905cbe476c40223234f2c2f
Deepanshu Gupta [Wed, 5 Nov 2014 02:19:55 +0000 (18:19 -0800)]
Add primitive shadows support to LayoutLib
The shadows rendered are not the same as rendered by the framework. The
main purpose of the shadows here is let the user know when shadows will
be cast.
Currently rectangular shadows are available in only two intensities. Any
elevation below 10dp uses one shadow and any elevation over 10 dp uses
the other.
Also, even though the code for arbitrary shapes exist, it doesn't quite
work yet. No shadows are visible when that code is run.
Change-Id: Ie8235ffccf1d3809713f5d8f82afde434817d6b2
John Reck [Fri, 7 Nov 2014 18:33:36 +0000 (10:33 -0800)]
DO NOT MERGE Fix finalizer ordering/double-free issue
Bug:
18289984
If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer
Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
(cherry picked from commit
c298f9c9170b9e8721cfb616f784ec22734f22f4)
Ricardo Cervera [Fri, 7 Nov 2014 18:39:00 +0000 (18:39 +0000)]
am
578e205d: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs automerge:
58dc8c4 automerge:
c9ad13a
* commit '
578e205d977d66fce491015f1f31ab82c534587d':
Tom Taylor [Fri, 7 Nov 2014 18:33:30 +0000 (18:33 +0000)]
am
d1290de2: am
7c570346: am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge
* commit '
d1290de2aabb0f79be29a9c5135fe1049df016d0':
Tom Taylor [Fri, 7 Nov 2014 18:33:27 +0000 (18:33 +0000)]
am
1764db5b: am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge:
db864e4 automerge:
89f7eca
* commit '
1764db5bf2aad8353f94f28ef4ae6c284adeb547':
Ricardo Cervera [Fri, 7 Nov 2014 18:30:57 +0000 (18:30 +0000)]
am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs automerge:
58dc8c4
automerge:
c9ad13a
* commit '
c9ad13a5e18a6eea512547cba6530cb1eb6a9da8':
Tom Taylor [Fri, 7 Nov 2014 18:29:25 +0000 (18:29 +0000)]
am
7c570346: am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge:
6209d4e
automerge:
739117f
* commit '
739117f1a1f70168461a61219b02a90118641e05':
Tom Taylor [Fri, 7 Nov 2014 18:27:57 +0000 (18:27 +0000)]
am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge:
db864e4
automerge:
89f7eca
* commit '
89f7eca148869850fd5d107acbbb33a0a555fcd6':
Ricardo Cervera [Fri, 7 Nov 2014 17:49:58 +0000 (17:49 +0000)]
am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
automerge:
58dc8c4
* commit '
58dc8c42f2880b4264bfad46b9ab443576d4b4f2':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Winson Chung [Fri, 7 Nov 2014 17:34:57 +0000 (17:34 +0000)]
am
4ad2c5ba: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)" into lmp-dev
* commit '
4ad2c5ba9ba39ff6116b657d36f671a4cdd2396f':
Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)
Winson Chung [Fri, 7 Nov 2014 17:30:55 +0000 (17:30 +0000)]
Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)" into lmp-dev
Baligh Uddin [Fri, 7 Nov 2014 15:49:25 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Fri, 7 Nov 2014 15:45:35 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Fri, 7 Nov 2014 09:50:28 +0000 (01:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iae4fdd5608681f999b8b8234262b6da60d79eea2
Auto-generated-cl: translation import
Baligh Uddin [Fri, 7 Nov 2014 07:26:52 +0000 (23:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2cd2b6ae9fb2a5114ee931d03e7d1f5aff0bc1e6
Auto-generated-cl: translation import
Quddus Chong [Fri, 7 Nov 2014 03:45:33 +0000 (03:45 +0000)]
am
871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug:
18181075" into lmp-docs
automerge:
0d7fa2f
* commit '
0d7fa2fdd95a1e76373bfa8be31d8c50e96c5715':
docs: Removed statement that ART does not implement compacting garbage collection. bug:
18181075
Quddus Chong [Fri, 7 Nov 2014 02:52:28 +0000 (02:52 +0000)]
am
871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug:
18181075" into lmp-docs
* commit '
871aff9ca6654ee17e1cfb6d76b987dd3d552bba':
docs: Removed statement that ART does not implement compacting garbage collection. bug:
18181075
Quddus Chong [Fri, 7 Nov 2014 01:11:32 +0000 (01:11 +0000)]
Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug:
18181075" into lmp-docs
Winson Chung [Wed, 5 Nov 2014 21:41:12 +0000 (13:41 -0800)]
Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)
Change-Id: I1bcf6f91f616890f0e815db33267c5230ae9c76f
(cherry picked from commit
559e6d34b4e76ee21dc6e300681c399ed735a964)
Andre Eisenbach [Wed, 29 Oct 2014 19:13:38 +0000 (12:13 -0700)]
Fix crash during Bluetooth on/off stress test
Bug:
18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
(cherry picked from commit
178d3b54cd50558be789c5dfd8dad80ffdc65021)
Luan Nguyen [Fri, 7 Nov 2014 00:10:25 +0000 (00:10 +0000)]
am
816b93cf: am
712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
* commit '
816b93cf23c59a8a17e998ca706619b9eaa23793':
cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
Joe Fernandez [Fri, 7 Nov 2014 00:10:21 +0000 (00:10 +0000)]
am
d00ce6c5: am
1d295821: docs: fix for Brand inquiries form
* commit '
d00ce6c537242d8bf6f01122f7faebfc07652e87':
docs: fix for Brand inquiries form
Luan Nguyen [Fri, 7 Nov 2014 00:05:20 +0000 (00:05 +0000)]
am
712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
* commit '
712c7ea3d87be2afb7ecaf0d87ea9f9eb1a0007c':
cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
Joe Fernandez [Fri, 7 Nov 2014 00:05:16 +0000 (00:05 +0000)]
am
1d295821: docs: fix for Brand inquiries form
* commit '
1d295821355c6a1ffcb01866e38664343570129e':
docs: fix for Brand inquiries form
Andres Morales [Thu, 6 Nov 2014 23:57:25 +0000 (23:57 +0000)]
am
b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
* commit '
b1477d11ca873db761dd378a5fea93b26d695f78':
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
Andres Morales [Thu, 6 Nov 2014 23:50:56 +0000 (23:50 +0000)]
Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
Andres Morales [Tue, 4 Nov 2014 22:56:16 +0000 (14:56 -0800)]
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
Requires less memory pressure to start killing cached
processes.
Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
Luan Nguyen [Thu, 6 Nov 2014 23:26:51 +0000 (23:26 +0000)]
Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
Joe Fernandez [Thu, 6 Nov 2014 22:53:04 +0000 (14:53 -0800)]
docs: fix for Brand inquiries form
b/
18162023
Change-Id: Iaf8a82bf268fb1c798c90012928641bd2961f4df
Jason Parks [Thu, 6 Nov 2014 22:23:01 +0000 (22:23 +0000)]
Merge "Fix NPE for CTS." into lmp-sprout-dev
Jeff Hao [Thu, 6 Nov 2014 20:45:00 +0000 (20:45 +0000)]
Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev
Rich Slogar [Thu, 6 Nov 2014 20:39:18 +0000 (20:39 +0000)]
am
830790ba: am
b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit '
830790baf8c35942832c5e7fb2467be6112048f4':
docs:Remove tools/index.jd file.
Rich Slogar [Thu, 6 Nov 2014 20:33:30 +0000 (20:33 +0000)]
am
b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit '
b0af6987aacec95b90c655f7e9bd9576baaab3df':
docs:Remove tools/index.jd file.
Rich Slogar [Thu, 6 Nov 2014 20:30:10 +0000 (20:30 +0000)]
Merge "docs:Remove tools/index.jd file." into lmp-docs
Jason Parks [Thu, 6 Nov 2014 20:08:52 +0000 (14:08 -0600)]
Fix NPE for CTS.
The effect list can be empty and will return null
from native code. This fixes the CTS crash.
Bug:
18256010
Change-Id: Ifa552efc9de216993427115c001c7071c90403f1
Deepanshu Gupta [Mon, 3 Nov 2014 23:52:51 +0000 (15:52 -0800)]
Remove needlessly thrown IOException.
Change-Id: If34986367554c98f96f6f9a1088f5e25077a1be1
Quddus Chong [Thu, 6 Nov 2014 19:29:38 +0000 (11:29 -0800)]
docs: Removed statement that ART does not implement compacting garbage collection.
bug:
18181075
Change-Id: Ibbb20604595a6740d19ec1d887854d60fb9d797b
Vinod Krishnan [Wed, 5 Nov 2014 17:16:30 +0000 (09:16 -0800)]
Adding wallpaper animations
- this has the best behavior. Sometimes the behavior is not consistent
Bug:
18058382
Change-Id: I744169ea333d3cef9d7b3618b940280aa8db4dc3
Ricardo Cervera [Thu, 6 Nov 2014 17:19:00 +0000 (17:19 +0000)]
am
b4a19198: am
58dc8c42: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
b4a1919816f4563390f2416038a66cd36b4f06aa':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Paul Lawrence [Thu, 6 Nov 2014 17:14:35 +0000 (17:14 +0000)]
am
afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
* commit '
afb6b50e824153de5e2f0c4d49dd95fde79fa04f':
DO NOT MERGE: Don't log passwords returned from vdc
Ricardo Cervera [Thu, 6 Nov 2014 17:13:58 +0000 (17:13 +0000)]
am
58dc8c42: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
58dc8c42f2880b4264bfad46b9ab443576d4b4f2':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Ricardo Cervera [Thu, 6 Nov 2014 17:09:12 +0000 (17:09 +0000)]
am
9bc1b15a: am
cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
* commit '
9bc1b15a66647e63f15383c1f82d5ed7cca0a304':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Paul Lawrence [Thu, 6 Nov 2014 17:08:25 +0000 (17:08 +0000)]
Merge "DO NOT MERGE: Don't log passwords returned from vdc" into lmp-dev
Ricardo Cervera [Thu, 6 Nov 2014 17:03:00 +0000 (17:03 +0000)]
am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
e7cd5f2e9cf76ed789534dfe5cc60c27a3b4984f':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Ricardo Cervera [Thu, 6 Nov 2014 17:02:56 +0000 (17:02 +0000)]
am
cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
* commit '
cc0753b077abb1ad5e5e95885567261b35067ed4':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Ricardo Cervera [Fri, 10 Oct 2014 23:04:11 +0000 (16:04 -0700)]
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Change-Id: I4fed30061daabfb05b24e84bb36cd21d38ad0fea
(cherry picked from commit
2871e05b48f0b932885986322ce01212717a6399)
Ricardo Cervera [Thu, 6 Nov 2014 16:57:12 +0000 (16:57 +0000)]
Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
Dirk Dougherty [Thu, 6 Nov 2014 05:25:51 +0000 (05:25 +0000)]
am
f15017fc: am
326c70ef: Doc change: Add play dev guide page with index card and shareable download.
* commit '
f15017fc0af505e8fd5efab3791d153020621084':
Doc change: Add play dev guide page with index card and shareable download.
Dirk Dougherty [Thu, 6 Nov 2014 05:20:29 +0000 (05:20 +0000)]
am
326c70ef: Doc change: Add play dev guide page with index card and shareable download.
* commit '
326c70efeed9c01e8c8d0f38f7ae27891f726e6b':
Doc change: Add play dev guide page with index card and shareable download.
Dirk Dougherty [Thu, 6 Nov 2014 04:14:15 +0000 (20:14 -0800)]
Doc change: Add play dev guide page with index card and shareable download.
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
(cherry picked from commit
0ce73219be7f37170eb19dba690a5cd8d3e22e21)
Dirk Dougherty [Thu, 6 Nov 2014 04:29:44 +0000 (04:29 +0000)]
am
d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev
* commit '
d7476cf42fd397ae8dc70fd9eae636c845842df1':
Doc change: Add play dev guide page with index card and shareable download.
Joe Fernandez [Thu, 6 Nov 2014 04:23:30 +0000 (04:23 +0000)]
am
ab6e9048: am
2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs
* commit '
ab6e9048ebe2ac6cd4897378b56017267d6ee16e':
docs: Add more information for getting started with TV app
Dirk Dougherty [Thu, 6 Nov 2014 04:22:10 +0000 (04:22 +0000)]
Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev