Deepanshu Gupta
bb600de6e7
am 74147527: am 8505c387: Special case AppCompat to show action bar.
...
* commit '74147527357b9abd9d30b3a2dbd72a5172a35625':
Special case AppCompat to show action bar.
2015-01-10 02:16:44 +00:00
Deepanshu Gupta
7414752735
am 8505c387: Special case AppCompat to show action bar.
...
* commit '8505c3870a17f41d23329344fe381cd9ff324bd2':
Special case AppCompat to show action bar.
2015-01-10 02:10:55 +00:00
Deepanshu Gupta
dbd64f7c90
Support Locale.toLanguageTag on Java 6
...
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit 5cd9dde5a2a77c5095f985186d8f03147fd22870)
2015-01-09 17:43:12 -08:00
Deepanshu Gupta
51fb7754fc
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)
2015-01-09 17:03:54 -08:00
Deepanshu Gupta
8505c3870a
Special case AppCompat to show action bar.
...
Bug: http://b.android.com/78944
Change-Id: I02d68d592d812016744716f99376cfefd519b21b
2015-01-10 00:29:52 +00:00
Eric Laurent
8db769dd56
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
2014-11-10 23:33:52 +00:00
Eric Laurent
df878bd3fc
am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit 'ced2f74ac170439231f189e31538b9f403909966':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:29:07 +00:00
Eric Laurent
ced2f74ac1
am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit 'e8c1a97fa33797df528265b6f0b0c2c39ac2c589':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:24:02 +00:00
Eric Laurent
e8c1a97fa3
am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit '3b92fc04700a68dab3c3c4a873535837c4e51e8b':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:20:06 +00:00
Eric Laurent
3b92fc0470
am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant
...
* commit '1c2b0d52144dc94a7d1dcefb7e4fbd7fb29f5202':
AudioEffect JNI: use new max preprocessing constant
2014-11-10 23:11:00 +00:00
Eric Laurent
1c2b0d5214
AudioEffect JNI: use new max preprocessing constant
...
Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
(cherry picked from commit b27a8a5bcc40054f6d775d070bc2de6eb996d1c2)
2014-11-10 19:44:15 +00:00
Ricardo Cervera
58dc8c42f2
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
2014-11-06 17:03:00 +00:00
Ricardo Cervera
e7cd5f2e9c
Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs
2014-11-06 16:57:14 +00:00
Tom Taylor
6209d4e4d8
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
2014-11-04 19:18:50 +00:00
Tom Taylor
7c57034608
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
2014-11-04 19:14:26 +00:00
Tom Taylor
47419a4435
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
2014-11-04 19:08:16 +00:00
Tom Taylor
192a390442
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
2014-11-04 19:00:42 +00:00
Tom Taylor
23fb29723c
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
2014-11-04 18:50:31 +00:00
Tom Taylor
d7044fe1f1
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
2014-11-04 18:39:38 +00:00
Tom Taylor
b2e54c1b46
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
2014-11-04 18:30:23 +00:00
Tom Taylor
75e7fbaa83
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
2014-11-04 18:23:51 +00:00
Tom Taylor
37906e6ebc
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
2014-11-04 18:18:16 +00:00
Tom Taylor
44f6d0d581
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
2014-11-04 18:11:02 +00:00
Tom Taylor
4c5b16d740
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
2014-11-04 18:03:07 +00:00
Tom Taylor
66aa87ae03
am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '90743d6409eaecdc869fdcf891ffff8b0a5757ec':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 17:53:14 +00:00
Tom Taylor
db864e4ddc
am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '5244937248b7283b5cf586b5637a108579217d4e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 17:49:26 +00:00
Tom Taylor
90743d6409
am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit 'bfb7ffeb3e240784c1ea2a50187c120e6445b20e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 17:43:41 +00:00
Tom Taylor
5244937248
am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit 'bc57a1f81317f765865e3e0c00d3421a3084955e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 17:42:20 +00:00
Ricardo Cervera
2871e05b48
docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
...
Change-Id: I4fed30061daabfb05b24e84bb36cd21d38ad0fea
2014-11-04 09:36:12 -08:00
Mark Renouf
cf0f740e39
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
2014-10-30 21:42:11 -04:00
Mark Renouf
7be03da0d4
Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
2014-10-30 22:27:05 +00:00
Mark Renouf
e69bebd5aa
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
...
BUG: 18130296
Change-Id: Iaee21a45e8e84c6bf8d99b04382e43ec12606ce6
2014-10-30 21:03:25 +00:00
kmccormick
3e92c4a20f
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.
2014-10-29 23:09:23 +00:00
kmccormick
1867f2cfdd
Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
2014-10-29 23:04:29 +00:00
kmccormick
2022db08ab
Doc update: deliv receipt, rate exceeded, bug fixes.
...
Fix for:
b/17936796
Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
2014-10-29 15:49:36 -07:00
Luan Nguyen
aec7c974eb
am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
...
* commit '049db36afd63b972f971f8bac6a405bc2f9437f4':
docs: fixed typo/grammar issues.
2014-10-24 15:59:44 +00:00
Luan Nguyen
049db36afd
Merge "docs: fixed typo/grammar issues." into klp-modular-docs
2014-10-24 15:55:48 +00:00
Joe Fernandez
90f734eb18
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
2014-10-24 09:27:02 +00:00
Natalie Masse
bcf9ced47a
am 1e5bb861: Link and typo fixed
...
* commit '1e5bb861265072b9af555d09202e49cb38a3c4f1':
Link and typo fixed
2014-10-24 08:13:36 +00:00
Joe Fernandez
0e893eb7ac
Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
2014-10-24 06:06:01 +00:00
Natalie Masse
1e5bb86126
Link and typo fixed
...
Change-Id: Ie9ace6e002703d7d1f83173da49672cf60ca1653
2014-10-17 13:50:24 +01:00
Scott Rowe
a1e3063ebe
am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
...
* commit 'ab64919c0e683dcd0f32f95f580f0d95ce29476d':
docs: update reference to FragmentRetainInstance
2014-10-16 17:01:04 +00:00
Scott Rowe
ab64919c0e
Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
2014-10-16 16:56:55 +00:00
Joe Fernandez
2f9ea27c6c
am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
...
* commit '58c64870a8f3505d032ec7c5ac0fc4faba08347a':
Typo fixed in sample code
2014-10-16 14:39:16 +00:00
Joe Fernandez
58c64870a8
Merge "Typo fixed in sample code" into klp-modular-docs
2014-10-16 14:34:47 +00:00
Prashant Malani
645e017ca5
Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev
2014-10-15 17:02:02 +00:00
Tom Taylor
bfb7ffeb3e
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
2014-10-15 09:45:39 -07:00
Ricardo Cervera
dc1f308048
am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs
...
* commit '8a7ba4c681d16aab194e1c4ab7b7bfcce5012d17':
docs: Fixing notify link. Bug: 17571861
2014-10-15 15:50:42 +00:00
Ricardo Cervera
8a7ba4c681
Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs
2014-10-15 15:47:31 +00:00
Luan Nguyen
c07a288a88
am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs
...
* commit '2a364235d27245d999bb1d6e7621c0d6a0e89ef0':
docs: Android Wear Design fixes
2014-10-15 15:17:40 +00:00
