Commit Graph

35783 Commits

Author SHA1 Message Date
John Reck
a4c5ddf6e6 am 8c57cead: Merge "[View] Clear Hardware-Layers before system destroys HardwareRenderer​."
* commit '8c57cead83105ce273351024bfa745c979f9dc48':
  [View] Clear Hardware-Layers before system destroys HardwareRenderer​.
2014-07-31 18:32:45 +00:00
Narayan Kamath
8b2de134a6 am bb97753b: Merge "Switch TextUtils over to new ICU API."
* commit 'bb97753bc546c7725652b68e6611a75350573466':
  Switch TextUtils over to new ICU API.
2014-07-31 11:34:49 +00:00
John Reck
8c57cead83 Merge "[View] Clear Hardware-Layers before system destroys HardwareRenderer​." 2014-07-29 22:52:28 +00:00
Narayan Kamath
08b3516984 Switch TextUtils over to new ICU API.
.. and use Locale.getScript() instead of ICU.getScript.

bug: 15876704
Change-Id: Idf9462d8ef568dbc88c95e65a971184952e97872
2014-07-31 11:29:44 +00:00
henry.uh_chen
a199720190 [View] Clear Hardware-Layers before system destroys HardwareRenderer​.
Symptom: Sometimes HardwareLayer display is corrupted.

Root Cause: In some cases, ViewRootImpl destroys HardwareRenderer​ without
clearing HardwareLayers in the view hirarchy. If the system trims memory fully
and kill the glContext at the same time, HardwareLayer may corrupt.

Solution: Clear Hardware-Layers before system destroys HardwareRenderer​.

Reproduce steps: Modify the cache's trim memory mechanism to make it easier to
trim fully, HardwareLayers implemented in app will easily be corrupted.
Modification of the cache is not required but make it easier to reproduce.

Change-Id: If57c802cdacf8dc37cbbcc199e74f9482834f981
2014-07-25 18:07:24 +08:00
Neil Fuller
1a4290473d am fc6346d4: Merge "Rewriting android.text.format.Time without the native _tz functions"
* commit 'fc6346d461c9ed9b499643db830885241cc82838':
  Rewriting android.text.format.Time without the native _tz functions
2014-07-22 15:29:08 +00:00
Narayan Kamath
b5c714fca7 am e242111c: Merge "Remove copy of Locale.adjustLanguageCode."
* commit 'e242111c5dc63e1cbba41d2341b493cb9c064589':
  Remove copy of Locale.adjustLanguageCode.
2014-07-22 13:30:41 +00:00
Neil Fuller
fc6346d461 Merge "Rewriting android.text.format.Time without the native _tz functions" 2014-07-17 22:36:58 +00:00
Neil Fuller
d7f0849b8c Rewriting android.text.format.Time without the native _tz functions
Bug: 15765976
Change-Id: I666b72ecf9da8a9dcfb97cc503006b415909a558
2014-07-22 15:06:16 +01:00
Narayan Kamath
e242111c5d Merge "Remove copy of Locale.adjustLanguageCode." 2014-07-17 22:36:58 +00:00
Narayan Kamath
1d31a5f824 Remove copy of Locale.adjustLanguageCode.
Change-Id: Iba8c67890f95d50fadcd1245dc083d646fe6bcc1
2014-07-18 16:09:36 +01:00
Narayan Kamath
73083ed1e4 am 3c8f8caa: Merge "Add an internal API to get all asset locales."
* commit '3c8f8caaa711c0d025dab85cfdacc7586e75d31a':
  Add an internal API to get all asset locales.
2014-07-16 12:57:02 +00:00
Narayan Kamath
9e6d9d4c81 Add an internal API to get all asset locales.
This will allow us to not copy paste this code verbatim into
bundled apps.

bug: 10090157
Change-Id: I008dc683ecbef2ad8b7a26968cb3cbda7e5a8388
2014-07-14 16:29:22 +01:00
Narayan Kamath
f7d6925ee7 am 7850f95d: Merge "Allow 3 letter language codes in InputMethodUtils."
* commit '7850f95dc55c4e4801cf145c42a1bc98b49a87d6':
  Allow 3 letter language codes in InputMethodUtils.
2014-07-14 08:52:55 +00:00
Christopher Tate
f908b61abf am ef3b35b4: Merge "Logging in LocalTransport on as default"
* commit 'ef3b35b48c31919a7d6977e41db7f9d37654dec3':
  Logging in LocalTransport on as default
2014-07-11 01:44:36 +00:00
Narayan Kamath
7be75338a3 Allow 3 letter language codes in InputMethodUtils.
Replace locale.substring(0, 2) with a function that always
returns the first component of the locale (assumed to be the
language).

bug: 10090157

(cherry picked from commit cefc79c6b18bb2e824c299e7b9e212071e5ebc43)

Change-Id: I56b02dd0c6dc222daa3ceade841a30879449bb4a
2014-07-14 09:42:55 +01:00
Christopher Tate
ef3b35b48c Merge "Logging in LocalTransport on as default" 2014-07-10 17:35:34 +00:00
Henrik Baard
2db2b9aa36 Logging in LocalTransport on as default
The logging is LocalTransport.java is enabled by
default.

Change default to false to remove logs, as this class
states that it is only for debug.

Change-Id: Iae63c7b62edbd503c606f0aee671a9579e78843d
2014-07-10 08:46:39 +02:00
Brian Carlstrom
044492e1b7 am 52a154fe: Merge "Remove"
* commit '52a154febb7c06b142116235c368417dd5e542ba':
  Remove
2014-07-07 20:55:16 +00:00
Brian Carlstrom
87f597465c Remove
(cherry picked from commit 9881203920c8445e9a4bdd9e4a90ba0014f34c5e)

Change-Id: Ib40823b7c03af4c71da902b0e5c504e074cf0dd9
2014-07-07 11:31:47 -07:00
Nick Kralevich
7228aa109a am 42b74e23: Merge "Typo in method name: Clone"
* commit '42b74e231d893f553e4e8c88641e056ebcf82ac5':
  Typo in method name: Clone
2014-07-05 17:16:59 +00:00
Nick Kralevich
d05a074348 am a347ece5: Merge "Fix typo in comment of FragmentTransaction"
* commit 'a347ece5a77d4b695af6255d751d98dbb519ad74':
  Fix typo in comment of FragmentTransaction
2014-07-05 17:11:42 +00:00
Nick Kralevich
d92ab153a3 am a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator"
* commit 'a6336747a42fa5b64f82b7fe57ddf614d1fda9b2':
  Fix a copy/paste typo in ViewPropertyAnimator
2014-07-05 16:52:11 +00:00
Nick Kralevich
23219098a6 am b70888d4: Merge "Fix a typo in a javadoc comment"
* commit 'b70888d45573c015fbb9d584df575bf78f5e9684':
  Fix a typo in a javadoc comment
2014-07-05 16:45:31 +00:00
Nick Kralevich
dbb32da844 am c9eff23b: Merge "Fix typo in DevicePolicyManager documentation"
* commit 'c9eff23b443f26fb8c4873a6ecb61eded0564163':
  Fix typo in DevicePolicyManager documentation
2014-07-05 16:45:26 +00:00
Nick Kralevich
58005ec545 am 3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
* commit '3b345a6f9103c1677a696b4770cc318df45cdcaa':
  Fix javadoc typo in Message.java: "arg1" -> "arg2"
2014-07-05 16:35:13 +00:00
Narayan Kamath
5ae312fb5b am 759e0d6a: Merge "Fix LocalePicker locale filtering."
* commit '759e0d6a7a258dbc34a38a7db320827eb9144487':
  Fix LocalePicker locale filtering.
2014-07-04 08:48:58 +00:00
Narayan Kamath
759e0d6a7a Merge "Fix LocalePicker locale filtering." 2014-07-04 08:02:36 +00:00
Narayan Kamath
80b574199c Fix LocalePicker locale filtering.
This was broken by commit b27c137087 which
removed a badly phrased check. Prior to that commit,
there was a check that excluded locales whose toString()
length was not 5.

This change reinstates that check in a less roundabout
way, by excluding BCP-47 tags that don't have a country
subtag.

bug: 16038949

Change-Id: Ic24b1df87b2e2ce47d9ae04c7759088721f27b4f
2014-07-03 13:31:42 +01:00
Brian Duff
c542745e23 am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit 'a6e9dd3f9a2d966faf2d1710d2189127b968dc52':
  Fix a typo in NumberPicker javadoc.
2014-07-03 06:45:04 +00:00
Nick Kralevich
a347ece5a7 Merge "Fix typo in comment of FragmentTransaction" 2014-07-03 01:32:01 +00:00
Nick Kralevich
c9eff23b44 Merge "Fix typo in DevicePolicyManager documentation" 2014-07-03 01:32:01 +00:00
Nick Kralevich
a6336747a4 Merge "Fix a copy/paste typo in ViewPropertyAnimator" 2014-07-02 20:52:43 +00:00
Nick Kralevich
b70888d455 Merge "Fix a typo in a javadoc comment" 2014-07-02 20:52:43 +00:00
Nick Kralevich
42b74e231d Merge "Typo in method name: Clone" 2014-07-02 20:51:20 +00:00
Nick Kralevich
3b345a6f91 Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2"" 2014-07-02 20:51:20 +00:00
Brian Duff
a6e9dd3f9a Merge "Fix a typo in NumberPicker javadoc." 2014-07-02 20:51:20 +00:00
Narayan Kamath
e2840977d3 am 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened."
* commit '6e84f8c1b9c72ab6e1eb189358292237dbe1efe8':
  Fix native crashes when APKs can't be opened.
2014-07-02 12:12:18 +00:00
Narayan Kamath
9417121243 am 104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '104da1e495cbed81e7ebe66b80344bf916b02391':
  Fix broken assumptions in LocalePicker.
2014-07-02 08:49:08 +00:00
Narayan Kamath
6e84f8c1b9 Merge "Fix native crashes when APKs can't be opened." 2014-07-01 17:48:27 +00:00
Narayan Kamath
b27c137087 Fix broken assumptions in LocalePicker.
This code assumed that the locale is always 5 chars in
length and was of the form xx-YY. This is not necessarily
true. The language can be 3 letters in length and the locale
might have a script and variant.

Also cleans up several nasty pieces of code and eliminates
unnecessary array copies and improves readability by using
idiomatic java.

bug: 15873165
bug: 10090157

Change-Id: Iab1cfd7b78e5772b1245654f2153caf63a96033d
2014-07-01 11:12:24 +01:00
Narayan Kamath
ec4516470d Fix native crashes when APKs can't be opened.
There was lax / incomplete error checking around the
construction of Apk handles. This change changes the ApkHandle
API and makes it throw IOException if the zipfile couldn't
be opened.

Additionally :
- Fix a resource leak in DefaultContainerService
- Report errors correctly during package moves.

bug: 15563874
Change-Id: Ic71a10709eb82b8f53405bbfb2320e80aa96b771
2014-06-30 17:14:29 +01:00
Narayan Kamath
c141ae547e am 989ab6d3: Merge "Update javadoc for android.os.Bundle."
* commit '989ab6d38d77c0a1f7dc5e648e1950410d5d01d4':
  Update javadoc for android.os.Bundle.
2014-06-24 10:08:52 +00:00
Narayan Kamath
989ab6d38d Merge "Update javadoc for android.os.Bundle." 2014-06-24 06:22:45 +00:00
Robert Greenwalt
0b57289678 Merge "DO NOT MERGE refactor wifi p2p's startDhcpServer function" 2014-06-23 21:56:07 +00:00
Jianzheng Zhou
78c8e7c8bf DO NOT MERGE refactor wifi p2p's startDhcpServer function
Add getTetheredDhcpRanges() interface and call it before calling
mNwService.startTethering() to update dhcp ranges. This will allow p2p app
to run well concurrently with other tethering app(e.g. usb tethering).

Change-Id: I5e8ffeb5d2d396f48b897cd9396f133e25ecca57
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2014-06-23 21:02:45 +00:00
Marco Nelissen
b416af13e7 Fix thumbnail bug
When there was no thumbnail for a given image, the getThumbNail() convenience
method could return a previously-returned thumbnail instead of null.

b/15771860
https://code.google.com/p/android/issues/detail?id=40714

Change-Id: Ibd18e048145bf347469f800afdf436247ea6b693
2014-06-20 14:10:00 -07:00
Narayan Kamath
ca2197b045 Update javadoc for android.os.Bundle.
Call out the fact that defaultValue is returned if a null
mapping exists for a given key.

bug: https://code.google.com/p/android/issues/detail?id=68453
Change-Id: Ifa6e94c1dee47809f70cadcb668cb98cb8dbef14
2014-06-19 10:46:00 +01:00
Jeff Sharkey
b5e05cffcc Merge "Fixing parcel leaks to avoid virtual memory leak" 2014-06-18 22:48:04 +00:00
Maunik Shah
db1a9a3862 Fixing parcel leaks to avoid virtual memory leak
Client has to call recycle() on parcel object after its usage
otherwise native layer of binder won't clear the resources of
parcel which were allocated for IPC

Change-Id: Ib31ddcc92aa4ebd80bb66729922b9133692e9c9e
2014-06-19 19:44:21 +05:30