OSDN Git Service
Ricardo Cervera [Tue, 20 Jan 2015 17:57:45 +0000 (17:57 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256
automerge:
e8f6bd4
* commit '
e8f6bd484627e16fa2fd9509b0f06056ee44be94':
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Ricardo Cervera [Fri, 16 Jan 2015 17:21:32 +0000 (17:21 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256
* commit '
98f07d901492335f51258655fbfa032fa3f2d58e':
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Ricardo Cervera [Fri, 16 Jan 2015 17:14:44 +0000 (17:14 +0000)]
am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256
* commit '
92f6a747085b4b5ed692de4bdb0050c096eae393':
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Deepanshu Gupta [Sat, 10 Jan 2015 04:59:11 +0000 (04:59 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar.
automerge:
bb600de
* commit '
bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 04:57:42 +0000 (04:57 +0000)]
Support Locale.toLanguageTag on Java 6
automerge:
dbd64f7
* commit '
dbd64f7c904287f9e1bf5bb22385aace85274cab':
Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 04:56:36 +0000 (04:56 +0000)]
LayoutLib: Fix System.arraycopy()
automerge:
51fb775
* commit '
51fb7754fc9a232a225b31b37219f4b0dcba6711':
LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 02:16:44 +0000 (02:16 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar.
* commit '
74147527357b9abd9d30b3a2dbd72a5172a35625':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 02:10:55 +0000 (02:10 +0000)]
am
8505c387: Special case AppCompat to show action bar.
* commit '
8505c3870a17f41d23329344fe381cd9ff324bd2':
Special case AppCompat to show action bar.
Deepanshu Gupta [Mon, 14 Jul 2014 22:50:49 +0000 (15:50 -0700)]
Support Locale.toLanguageTag on Java 6
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit
5cd9dde5a2a77c5095f985186d8f03147fd22870)
Deepanshu Gupta [Thu, 10 Jul 2014 20:20:42 +0000 (13:20 -0700)]
LayoutLib: Fix System.arraycopy()
Framework has specialized versions of java.lang.System.arraycopy() for
all primitive data types. These versions are not present on the Desktop
VM. This change replaces calls to any of the specialized versions with
the more general alternative - the one using Objects.
Note that this was already being done for char.
Change-Id: If1584125fea8ecc080fb39a5ee6cdb4d922d0c98
(cherry picked from commit
e1960cc0b541cda93db94de5bef42dff922b9ec3)
Deepanshu Gupta [Fri, 9 Jan 2015 03:10:07 +0000 (19:10 -0800)]
Special case AppCompat to show action bar.
Bug: http://b.android.com/78944
Change-Id: I02d68d592d812016744716f99376cfefd519b21b
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: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
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)
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
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 16:57:12 +0000 (16:57 +0000)]
Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
Ricardo Cervera [Fri, 4 Apr 2014 18:17:06 +0000 (11:17 -0700)]
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83
Tom Taylor [Wed, 5 Nov 2014 13:59:39 +0000 (13:59 +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
* commit '
6209d4e4d8a8662628c53cd5e1944abf30293d87':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Wed, 5 Nov 2014 13:58:33 +0000 (13:58 +0000)]
am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
automerge:
db864e4
* commit '
db864e4ddc788a21db6793bbcb5f559131f20736':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:18:50 +0000 (19:18 +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
* commit '
7c570346082f7f0399614b87f9a4c67d1ae1f1c6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:14:26 +0000 (19:14 +0000)]
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
* commit '
47419a443591ea3c641da8720514e1384dd75440':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:08:16 +0000 (19:08 +0000)]
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
* commit '
192a39044290be84a1086a876a9d4ab0571ab97b':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:00:42 +0000 (19:00 +0000)]
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
* commit '
23fb29723c47b2aeb6aecc382a503630a8d8e983':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:50:31 +0000 (18:50 +0000)]
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
* commit '
d7044fe1f12b48cc7ba6803772ec4a2f2fe14c19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:39:38 +0000 (18:39 +0000)]
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
* commit '
b2e54c1b46c275d017fb5bef17add3eb4c465508':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:30:23 +0000 (18:30 +0000)]
am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
75e7fbaa83448753a1db9647e58693f1a281900c':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:23:51 +0000 (18:23 +0000)]
am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
37906e6ebc1985ad4b7151116b7cf4fef8322b19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:18:16 +0000 (18:18 +0000)]
am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
44f6d0d5810ce507394cc514481d977315d2496f':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:11:02 +0000 (18:11 +0000)]
am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
4c5b16d7409bbd947af3e0dadf4b1901b48e4cd7':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:03:07 +0000 (18:03 +0000)]
am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
66aa87ae0355a4e6c8ed56704fec4fb225ed18f6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:53:14 +0000 (17:53 +0000)]
am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
90743d6409eaecdc869fdcf891ffff8b0a5757ec':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:49:26 +0000 (17:49 +0000)]
am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
5244937248b7283b5cf586b5637a108579217d4e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:43:41 +0000 (17:43 +0000)]
am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
bfb7ffeb3e240784c1ea2a50187c120e6445b20e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:42:20 +0000 (17:42 +0000)]
am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
bc57a1f81317f765865e3e0c00d3421a3084955e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
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
Mark Renouf [Fri, 31 Oct 2014 09:21:12 +0000 (09:21 +0000)]
If no display settings are matched, return the first one. DO NOT MERGE
automerge:
cf0f740 -s ours
* commit '
cf0f740e39f79da3fc8367c61ed473273248e8c1':
If no display settings are matched, return the first one. DO NOT MERGE
Mark Renouf [Thu, 30 Oct 2014 20:57:30 +0000 (16:57 -0400)]
If no display settings are matched, return the first one. DO NOT MERGE
Language changes will prevent previously saved display settings from
being loaded. This provides a fallback in the event a single entry exists
but does not match the current (localized) name of the Built-In Display.
BUG:
18130296
BUG:
18190800
Change-Id: Ibeff56045fc5713b9f79707dfb92bafc9fadd84f
Mark Renouf [Thu, 30 Oct 2014 23:07:22 +0000 (23:07 +0000)]
Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
automerge:
7be03da -s ours
* commit '
7be03da0d4365346934c9d6672526119765d1047':
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
Mark Renouf [Thu, 30 Oct 2014 22:27:03 +0000 (22:27 +0000)]
Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
Mark Renouf [Thu, 30 Oct 2014 20:40:27 +0000 (16:40 -0400)]
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
BUG:
18130296
Change-Id: Iaee21a45e8e84c6bf8d99b04382e43ec12606ce6
kmccormick [Thu, 30 Oct 2014 05:23:58 +0000 (05:23 +0000)]
am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
automerge:
3e92c4a
* commit '
3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:09:23 +0000 (23:09 +0000)]
am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
* commit '
1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:04:28 +0000 (23:04 +0000)]
Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
kmccormick [Tue, 14 Oct 2014 22:34:21 +0000 (15:34 -0700)]
Doc update: deliv receipt, rate exceeded, bug fixes.
Fix for:
b/
17936796
Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
Luan Nguyen [Tue, 28 Oct 2014 01:44:10 +0000 (01:44 +0000)]
am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
automerge:
aec7c97
* commit '
aec7c974eb223b5608bbd2bb06e11fc397e6ffb2':
docs: fixed typo/grammar issues.
Joe Fernandez [Tue, 28 Oct 2014 01:43:13 +0000 (01:43 +0000)]
am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
automerge:
90f734e
* commit '
90f734eb180619eb8ffd2e30580f72b500184f8b':
docs:Added 64-bit image note from Preview page
Natalie Masse [Tue, 28 Oct 2014 01:42:13 +0000 (01:42 +0000)]
am
1e5bb861: Link and typo fixed
automerge:
bcf9ced
* commit '
bcf9ced47a123220271fcca70f71c2adf69ad100':
Link and typo fixed
Scott Rowe [Tue, 28 Oct 2014 01:41:06 +0000 (01:41 +0000)]
am
ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
automerge:
a1e3063
* commit '
a1e3063ebe04c8c304f48a02117085962f75cb63':
docs: update reference to FragmentRetainInstance
Joe Fernandez [Tue, 28 Oct 2014 01:40:11 +0000 (01:40 +0000)]
am
58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
automerge:
2f9ea27
* commit '
2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
Typo fixed in sample code
Prashant Malani [Tue, 28 Oct 2014 01:39:14 +0000 (01:39 +0000)]
Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev
automerge:
645e017 -s ours
* commit '
645e017ca54e654c34b131235e90589a7d92ce0c':
DO NOT MERGE Add empty ArrayList check.
Ricardo Cervera [Tue, 28 Oct 2014 01:38:14 +0000 (01:38 +0000)]
am
8a7ba4c6: Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs
automerge:
dc1f308
* commit '
dc1f308048a732572fae3cf92ddfe5cd943c0059':
docs: Fixing notify link. Bug:
17571861
Luan Nguyen [Tue, 28 Oct 2014 01:37:14 +0000 (01:37 +0000)]
am
2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs
automerge:
c07a288
* commit '
c07a288a889ac88282118d4089e969f20c1aabe3':
docs: Android Wear Design fixes
smain@google.com [Tue, 28 Oct 2014 01:36:21 +0000 (01:36 +0000)]
am
075531ae: add the butterbar for L announce to Preview landing page
automerge:
e43bb6a
* commit '
e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
add the butterbar for L announce to Preview landing page
smain@google.com [Tue, 28 Oct 2014 01:35:28 +0000 (01:35 +0000)]
am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906
automerge:
6fbe299
* commit '
6fbe299fa5bcc084cd69899afdc3c77767b7c1f5':
update analytics event tracking calls to use new script bug:
16331906
Ricardo Cervera-Navarro [Tue, 28 Oct 2014 01:34:31 +0000 (01:34 +0000)]
am
7668aa27: am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
automerge:
c93723b
* commit '
c93723bdf9b2ce4dc0426817b8bec924d9f97a79':
Revert "docs: Watermarked images for codes that weren't found."
Rich Slogar [Tue, 28 Oct 2014 01:33:39 +0000 (01:33 +0000)]
am
a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs
automerge:
858cfad
* commit '
858cfad9482817305cc5b846102c3f8e5d12782a':
docs:SDK tools 23.0.5 Release Note
Eric Gilmore [Tue, 28 Oct 2014 00:15:23 +0000 (17:15 -0700)]
Merge commit '
a4eb81b' into klp-modular-dev-plus-aosp
Conflicts:
docs/html/guide/topics/connectivity/nfc/nfc.jd
Luan Nguyen [Fri, 24 Oct 2014 15:59:44 +0000 (15:59 +0000)]
am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '
049db36afd63b972f971f8bac6a405bc2f9437f4':
docs: fixed typo/grammar issues.
Luan Nguyen [Fri, 24 Oct 2014 15:55:47 +0000 (15:55 +0000)]
Merge "docs: fixed typo/grammar issues." into klp-modular-docs
Joe Fernandez [Fri, 24 Oct 2014 09:27:02 +0000 (09:27 +0000)]
am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '
0e893eb7ac1985a02d61525a5e6076d45a1e8c7d':
docs:Added 64-bit image note from Preview page
Natalie Masse [Fri, 24 Oct 2014 08:13:36 +0000 (08:13 +0000)]
am
1e5bb861: Link and typo fixed
* commit '
1e5bb861265072b9af555d09202e49cb38a3c4f1':
Link and typo fixed
Joe Fernandez [Fri, 24 Oct 2014 06:06:00 +0000 (06:06 +0000)]
Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
Natalie Masse [Fri, 17 Oct 2014 12:44:39 +0000 (13:44 +0100)]
Link and typo fixed
Change-Id: Ie9ace6e002703d7d1f83173da49672cf60ca1653
Scott Rowe [Thu, 16 Oct 2014 17:01:04 +0000 (17:01 +0000)]
am
ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit '
ab64919c0e683dcd0f32f95f580f0d95ce29476d':
docs: update reference to FragmentRetainInstance
Scott Rowe [Thu, 16 Oct 2014 16:56:54 +0000 (16:56 +0000)]
Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
Joe Fernandez [Thu, 16 Oct 2014 14:39:16 +0000 (14:39 +0000)]
am
58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit '
58c64870a8f3505d032ec7c5ac0fc4faba08347a':
Typo fixed in sample code
Joe Fernandez [Thu, 16 Oct 2014 14:34:46 +0000 (14:34 +0000)]
Merge "Typo fixed in sample code" into klp-modular-docs
Prashant Malani [Wed, 15 Oct 2014 17:02:00 +0000 (17:02 +0000)]
Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev
Tom Taylor [Wed, 15 Oct 2014 16:45:39 +0000 (09:45 -0700)]
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Bug
17969135
Use query (instead of rawQuery) and pass in arguments instead of building
the query with a giant string. Add a unit test that fails with the old
code but passes with the new code.
Change-Id: Id04a1db6fb95fcd923e1f36f5ab3b94402590918
Ricardo Cervera [Wed, 15 Oct 2014 15:50:42 +0000 (15:50 +0000)]
am
8a7ba4c6: Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs
* commit '
8a7ba4c681d16aab194e1c4ab7b7bfcce5012d17':
docs: Fixing notify link. Bug:
17571861
Ricardo Cervera [Wed, 15 Oct 2014 15:47:30 +0000 (15:47 +0000)]
Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs
Luan Nguyen [Wed, 15 Oct 2014 15:17:40 +0000 (15:17 +0000)]
am
2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs
* commit '
2a364235d27245d999bb1d6e7621c0d6a0e89ef0':
docs: Android Wear Design fixes
Luan Nguyen [Wed, 15 Oct 2014 15:12:23 +0000 (15:12 +0000)]
Merge "docs: Android Wear Design fixes" into klp-modular-docs
smain@google.com [Wed, 15 Oct 2014 03:36:11 +0000 (03:36 +0000)]
am
075531ae: add the butterbar for L announce to Preview landing page
* commit '
075531ae190dd6e64d3a53991a209a624cb0ec63':
add the butterbar for L announce to Preview landing page
smain@google.com [Wed, 15 Oct 2014 02:34:43 +0000 (19:34 -0700)]
add the butterbar for L announce to Preview landing page
Change-Id: Id84a5a62153281b3daaefc287450d392ecb51bbc
smain@google.com [Wed, 15 Oct 2014 02:15:35 +0000 (02:15 +0000)]
am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906
* commit '
d8d20f52ec0550477b773cee4c0f0343f2a9301f':
update analytics event tracking calls to use new script bug:
16331906
smain@google.com [Wed, 8 Oct 2014 23:53:42 +0000 (16:53 -0700)]
update analytics event tracking calls to use new script
bug:
16331906
Change-Id: I4cd8f08509cfb887a424696553404ba3c635151b
Craig Mautner [Tue, 22 Jul 2014 18:08:53 +0000 (11:08 -0700)]
DO NOT MERGE Add empty ArrayList check.
Fixes bug
15768779.
Fixes bug
17955259.
Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
Tom Taylor [Tue, 14 Oct 2014 20:38:17 +0000 (13:38 -0700)]
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Bug
17969135
Use query (instead of rawQuery) and pass in arguments instead of building
the query with a giant string. Add a unit test that fails with the old
code but passes with the new code.
Change-Id: Id04a1db6fb95fcd923e1f36f5ab3b94402590918
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 22:20:02 +0000 (22:20 +0000)]
am
7668aa27: am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
* commit '
7668aa27999e5650fe8776853565f792311fb57d':
Revert "docs: Watermarked images for codes that weren't found."
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 22:14:16 +0000 (22:14 +0000)]
am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
* commit '
aa7bcf140d95049f1482c896b770de7ba339f7c9':
Revert "docs: Watermarked images for codes that weren't found."
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 21:59:47 +0000 (21:59 +0000)]
Merge "Revert "docs: Watermarked images for codes that weren't found."" into klp-docs
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 15:49:07 +0000 (15:49 +0000)]
Revert "docs: Watermarked images for codes that weren't found."
Remove easter eggs.
This reverts commit
453df8e6e33f30808ea2244eaa1dd32169996129.
Change-Id: Iaa8c815a876d163c35cc83f3cf4899dd426def7b
Rich Slogar [Fri, 10 Oct 2014 21:23:51 +0000 (21:23 +0000)]
am
a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs
* commit '
a3287768e267f71fbce5d3341b6db8f3a9e04230':
docs:SDK tools 23.0.5 Release Note
Rich Slogar [Fri, 10 Oct 2014 21:19:07 +0000 (21:19 +0000)]
Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs
Eric Gilmore [Fri, 10 Oct 2014 20:49:54 +0000 (20:49 +0000)]
am
e77fe607: Docs: adding closing bracket to un-break javadoc tokens.
* commit '
e77fe607609e5a6ea59e11164e21744623cf07a5':
Docs: adding closing bracket to un-break javadoc tokens.
Rich Slogar [Fri, 10 Oct 2014 18:03:23 +0000 (11:03 -0700)]
docs:SDK tools 23.0.5 Release Note
Change-Id: Ib26f100247d3b8b6f0447251a35fa427393c9938
Eric Gilmore [Tue, 7 Oct 2014 19:48:48 +0000 (12:48 -0700)]
Docs: adding closing bracket to un-break javadoc tokens.
Bug:
17186958
Change-Id: Ib21120d71ccd7c59536af3d26d7090fc919bec17
Joe Fernandez [Thu, 9 Oct 2014 12:17:00 +0000 (12:17 +0000)]
am
a63f81ec: am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
* commit '
a63f81ec897988befad7b286b50f73a42319fd5e':
docs: Android TV publishing requirements
Joe Fernandez [Thu, 9 Oct 2014 12:01:36 +0000 (12:01 +0000)]
am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
* commit '
e15773be4837baf15079d5d7e8f8c0c09cef952f':
docs: Android TV publishing requirements
Joe Fernandez [Thu, 9 Oct 2014 04:19:19 +0000 (04:19 +0000)]
Merge "docs: Android TV publishing requirements" into klp-modular-docs
Joe Fernandez [Mon, 6 Oct 2014 05:12:10 +0000 (22:12 -0700)]
docs: Android TV publishing requirements
Change-Id: If1105cb596934034a7156b573c99905bbe6c4978
Fred Fettinger [Thu, 9 Oct 2014 01:00:47 +0000 (01:00 +0000)]
am
b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
* commit '
b4093c12f8a8cf73f869419904c60e953f5725ee':
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
Fred Fettinger [Fri, 29 Aug 2014 19:02:31 +0000 (14:02 -0500)]
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
Cherry-picked into klp-modular-dev.
bug:
17441218
GLConsumer uses glBindTexture() directly instead of going through
Caches::bindTexture(). This can cause libhwui to draw with the wrong
texture bound in the following case which involves 2 TextureViews:
Frame 1:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
Frame 2:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 2)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
HWUI renders TextureView B:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 2) and draws
In this case, HWUI will incorrectly draw TextureView A using texture 2 on
frame 2, because mBoundTextures[0]=1, even though the texture currently
bound to GL_TEXTURE_EXTERNAL_OES is 2.
Since GLConsumer is always used with a target of GL_TEXTURE_EXTERNAL_OES,
work around this problem by having mBoundTextures[] store only the
textures bound to the target GL_TEXTURE_2D. This is the common case
where the extra performance is needed. Since it's legal to have
different textures bound to GL_TEXTURE_2D and GL_TEXTURE_EXTERNAL_OES
on one texture unit, Caches::bindTexture() does not need to clear
mBoundTextures[mTextureUnit] when target != GL_TEXTURE_2D.
Change-Id: I8bc54ab8adcfacad7f3ed17a31236dc7a86c967a
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
(cherry picked from commit
e4de36bbc2baf13206deb53ced39f0befadb1861)
smain@google.com [Thu, 9 Oct 2014 00:09:53 +0000 (00:09 +0000)]
am
63cd4977: am
770c3c5e: fix unclickable link due to overlay from offset dev below
* commit '
63cd4977fd72de401f347ba159a71fe3d04399b3':
fix unclickable link due to overlay from offset dev below