Alan Viverette
c21569aef8
Prevent reentrance in Dialog.findViewById()
...
BUG: 12063988
Change-Id: I58117949dde589bcdfcfe88ec90b4a6e8418fe2a
2013-12-09 14:50:41 -08:00
Baligh Uddin
38bae539f8
Remove deprecated locales
...
Bug:11340849
Change-Id: Ib99486303927a6bce308b113d70f8e5b5bce4a13
2013-12-09 22:41:12 +00:00
Andres Morales
38a7ed05f8
Adding INfcUnlockSettings and NfcUnlock interface class.
...
Change-Id: Ie55a5d4bb58c2944952fc84cce32d3573a3a1a22
2013-12-09 14:41:01 -08:00
George Mount
7fe03a267e
Add Path trimming.
...
Change-Id: Iafcf127a5136883ad4c0185d3c15f96d67f38d0d
2013-12-09 14:34:54 -08:00
Kenny Root
25fd0c9e74
Merge changes Ib4450c39,Ie7ed5655
...
* changes:
preloaded-classes: remove some OpenSSLCipher modes
Add CertStoreParameters to preloaded-classes
2013-12-09 22:29:00 +00:00
Qiwen Zhao
de8905e495
DO NOT MERGE reset to goog/klp-volantis-dev
2013-12-09 14:17:43 -08:00
Kenny Root
53bcf2264c
preloaded-classes: remove some OpenSSLCipher modes
...
Some cipher modes were removed from OpenSSLCipher. This change removes
those classes from the preloaded classes list.
Change-Id: Ib4450c392513973836684b4d5df7fffb200b6260
2013-12-09 14:03:02 -08:00
Kenny Root
744f562c4d
Add CertStoreParameters to preloaded-classes
...
For image creating, art needs this in the preloaded-classes list.
Otherwise it complains loudly about not being able to load it from a
class initializer in Provider.java.
Change-Id: Ie7ed5655cba038b504767c3de9f70b47a8965cce
2013-12-09 13:49:29 -08:00
Joe Fernandez
53b01dbb58
docs: Support Library 19.0.1 Release Notes
...
Release notes for Support Library version releasing with the
KitKat MR1 update.
Change-Id: I6e2641e563772f93cc2f61ee7b466b0920209f77
2013-12-09 11:56:10 -08:00
Dianne Hackborn
3732f8d078
Merge "Fix issue #12031685 : Sticky Service Breakage in Android 4.4.1"
2013-12-09 19:29:54 +00:00
Dianne Hackborn
aa9875eb2d
Fix issue #12031685 : Sticky Service Breakage in Android 4.4.1
...
Got a little too aggressive about cleaning up service state; need to
avoid removing services from an app until we are in the second loop
doing the final cleanup, otherwise we can leave services around with
restarting their process.
Change-Id: I526a80285b4ef90c329db7c13442a27b9ad3585f
2013-12-09 11:26:11 -08:00
Lorenzo Colitti
4598ea4e5e
am 263c4788: am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress."
...
* commit '263c4788dcf45f104f8668fd6621d1a7c39689b9':
Add address flags and scope to LinkAddress.
2013-12-09 18:34:44 +00:00
Lorenzo Colitti
263c4788dc
am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress."
...
* commit '30253d7a649bd4fc6a436ae880a70e1142c1e58f':
Add address flags and scope to LinkAddress.
2013-12-09 18:31:25 +00:00
John Spurlock
3f6239e37e
Merge "Show hideycling for non-primary users."
2013-12-09 18:29:00 +00:00
Lorenzo Colitti
30253d7a64
am 2daa0c93: Merge "Add address flags and scope to LinkAddress."
...
* commit '2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2':
Add address flags and scope to LinkAddress.
2013-12-09 10:28:19 -08:00
Baligh Uddin
9d20c2f3c1
Merge "Import translations. DO NOT MERGE"
2013-12-09 18:25:34 +00:00
Baligh Uddin
bc3e609dbc
Import translations. DO NOT MERGE
...
Change-Id: Ie859264a5323e31dde1529b33e9318949cc1668c
Auto-generated-cl: translation import
2013-12-09 10:17:36 -08:00
Baligh Uddin
bd4fd493b5
am 0126e980: (-s ours) am 19158fc3: (-s ours) am 325a1352: (-s ours) am 0bfbb676: (-s ours) Import translations. DO NOT MERGE
...
* commit '0126e9803401a657ea27e8ee8499fb52ca3810a9':
Import translations. DO NOT MERGE
2013-12-09 18:13:39 +00:00
Baligh Uddin
0126e98034
am 19158fc3: (-s ours) am 325a1352: (-s ours) am 0bfbb676: (-s ours) Import translations. DO NOT MERGE
...
* commit '19158fc39a40f51c87195f5e3066bd891d359a2e':
Import translations. DO NOT MERGE
2013-12-09 18:10:32 +00:00
Baligh Uddin
19158fc39a
am 325a1352: (-s ours) am 0bfbb676: (-s ours) Import translations. DO NOT MERGE
...
* commit '325a13527d8c18c93bee266475cade9037f71698':
Import translations. DO NOT MERGE
2013-12-09 10:08:25 -08:00
Baligh Uddin
325a13527d
am 0bfbb676: (-s ours) Import translations. DO NOT MERGE
...
* commit '0bfbb676277c907444b09ba9e653491b32dddf9c':
Import translations. DO NOT MERGE
2013-12-09 10:05:02 -08:00
Baligh Uddin
0bfbb67627
Import translations. DO NOT MERGE
...
Change-Id: Iaac5bb8f0ee9e7471e6f6401eab46a86a406ce4c
Auto-generated-cl: translation import
2013-12-09 09:53:12 -08:00
John Spurlock
0513d5abb6
Show hideycling for non-primary users.
...
User 0 owns the window (system_server) but should be allowed
to display on a user's behalf.
Use the corresponding private flag for this system window, since
we cannot classify it by type (TYPE_TOAST) in policy.
Bug:12015090
Change-Id: I33aedb4624288415a5e1ae937676b693024546a9
2013-12-09 11:59:45 -05:00
Narayan Kamath
afd31e0829
Reimplement ZipFileRO in terms of libziparchive.
...
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).
This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.
One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).
bug: 10193060
Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
2013-12-09 16:23:16 +00:00
Narayan Kamath
b0c7c914eb
Fix inconsistency in LoggingPrintStream.
...
LoggingPrintStream prints "null" for null strings from
print(String) but throws an NPE from println(String).
Fix this by delegating to the underlying builder (and avoiding
the "fast" path when the input String == null)
bug: https://code.google.com/p/android/issues/detail?id=63380
Change-Id: I89c5c12db6ed5af8037d46f67369b38c5b4cbc9f
2013-12-09 11:21:26 +00:00
Scott Main
0ddca999d7
am 427e05b4: am 6fc956c7: am 4681d452: am 9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
...
* commit '427e05b4afdae4e8b67fe420dad1403fd22d06e7':
Revert "add Drive API feature page. fix link text on several pages"
2013-12-07 02:52:03 +00:00
Scott Main
235ce22fd2
am cf6c169f: am 71638ac4: am 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages
...
* commit 'cf6c169fe0c2f13784af3559f25acad738b7a0ae':
update robots.txt to disallow the community/ pages
2013-12-07 02:51:55 +00:00
Scott Main
7ef80e85fc
am 03775d95: am 2bbea2bb: am 38854cab: am c45eebe1: add Android Community page
...
* commit '03775d95a8cb6dd7c9fe471d832e4f7d1400471d':
add Android Community page
2013-12-07 02:51:49 +00:00
Lorenzo Colitti
2daa0c93c4
Merge "Add address flags and scope to LinkAddress."
2013-12-07 02:43:04 +00:00
Scott Main
427e05b4af
am 6fc956c7: am 4681d452: am 9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
...
* commit '6fc956c7ac7602e23f9bf164760db137cebdbbb8':
Revert "add Drive API feature page. fix link text on several pages"
2013-12-07 01:50:13 +00:00
Scott Main
6fc956c7ac
am 4681d452: am 9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
...
* commit '4681d4521cb955fcf66b6aad809aa99836cbb30a':
Revert "add Drive API feature page. fix link text on several pages"
2013-12-06 17:48:00 -08:00
Scott Main
4681d4521c
am 9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
...
* commit '9cefb57116653346729a9fc606e8ff4f899ad380':
Revert "add Drive API feature page. fix link text on several pages"
2013-12-07 01:45:31 +00:00
Scott Main
9cefb57116
Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
2013-12-07 01:42:31 +00:00
Scott Main
f2be361b46
Revert "add Drive API feature page. fix link text on several pages"
...
This reverts commit 680a1f67cd39b127663d2e8bc4b5f3ca1d868274.
Change-Id: Icc474d08e5fba678b683ae01280e015ae38dcf72
2013-12-07 01:42:10 +00:00
Yorke Lee
4fc601a650
Catch ActivityNotFoundException in quick contacts badge
...
Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
2013-12-06 16:35:29 -08:00
Scott Main
cf6c169fe0
am 71638ac4: am 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages
...
* commit '71638ac4afb54bd0f4849c1179c370ee75462565':
update robots.txt to disallow the community/ pages
2013-12-07 00:17:32 +00:00
Scott Main
71638ac4af
am 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages
...
* commit '2c93b68a0309e74e5c011cba1ef98951236f9f29':
update robots.txt to disallow the community/ pages
2013-12-06 16:15:15 -08:00
Scott Main
2c93b68a03
am b821a87d: update robots.txt to disallow the community/ pages
...
* commit 'b821a87d1b9310d7f07880c80d0b5ccafd59986a':
update robots.txt to disallow the community/ pages
2013-12-07 00:12:41 +00:00
Scott Main
03775d95a8
am 2bbea2bb: am 38854cab: am c45eebe1: add Android Community page
...
* commit '2bbea2bbc1b0efe60efcb255404661ca5160ab04':
add Android Community page
2013-12-07 00:11:35 +00:00
Scott Main
2bbea2bbc1
am 38854cab: am c45eebe1: add Android Community page
...
* commit '38854cabba3524316f8e1a9ffe9f4ac15e14d72f':
add Android Community page
2013-12-06 16:09:24 -08:00
Scott Main
b821a87d1b
update robots.txt to disallow the community/ pages
...
Change-Id: I318308f7219b296d92039cba2b6f5ace321f697f
2013-12-06 16:08:01 -08:00
Scott Main
38854cabba
am c45eebe1: add Android Community page
...
* commit 'c45eebe1868deb93c54c29885163a13a497eb86a':
add Android Community page
2013-12-07 00:06:29 +00:00
Scott Main
c45eebe186
add Android Community page
...
Change-Id: I8a9c98931b274dbb27d7952e2278eaf7798da343
2013-12-06 15:48:22 -08:00
Scott Main
d8d65f7190
am 41d6be57: am 2d285312: am 37a8d7c5: am 680a1f67: add Drive API feature page. fix link text on several pages
...
* commit '41d6be57d3d7cb6fda32398211b826e095e480c4':
add Drive API feature page. fix link text on several pages
2013-12-06 23:47:44 +00:00
Scott Main
41d6be57d3
am 2d285312: am 37a8d7c5: am 680a1f67: add Drive API feature page. fix link text on several pages
...
* commit '2d2853120eaf3ccd6867ec7038c38ef794baaecc':
add Drive API feature page. fix link text on several pages
2013-12-06 23:44:59 +00:00
Scott Main
2d2853120e
am 37a8d7c5: am 680a1f67: add Drive API feature page. fix link text on several pages
...
* commit '37a8d7c54cbdb36cd6ff9c6688140b99e256c644':
add Drive API feature page. fix link text on several pages
2013-12-06 15:41:23 -08:00
Scott Main
37a8d7c54c
am 680a1f67: add Drive API feature page. fix link text on several pages
...
* commit '680a1f67cd39b127663d2e8bc4b5f3ca1d868274':
add Drive API feature page. fix link text on several pages
2013-12-06 23:38:43 +00:00
Scott Main
680a1f67cd
add Drive API feature page.
...
fix link text on several pages
Change-Id: I717eba278bc2cc09d3ee148a08700e8e353312d2
2013-12-06 14:50:18 -08:00
Joe Fernandez
3ffaadc11e
docs: Platform image version release notes Android 4.4.2
...
Change-Id: I0ad9b672d077f9154a563868248e63348f7ffdae
2013-12-06 14:15:54 -08:00
Robert Greenwalt
5436b0cfe3
Merge "Fix descriptor leak after accepting connections"
2013-12-06 22:15:49 +00:00