67725 Commits

Author SHA1 Message Date
Mathias Agopian
80fe2c4e5e Merge changes I7a6b9db4,Ib579f580
* changes:
  EGLConfig is now not remaped to an internal EGLConfig
  remove multiplexing of multiple EGL implementation
2012-02-14 12:35:02 -08:00
Justin Ho
9dd3a66286 Update 4G WiMAX assets for notification area as well
Bug: 5724605

Change-Id: Iade031923f1d3a07ca6dd366642c04071168d495
2012-02-14 12:10:54 -08:00
Joe Fernandez
835e07f8f4 Merge "docs: Android NDK r7b Release Notes" into ics-mr1 2012-02-14 12:05:25 -08:00
Joe Fernandez
0ae5cacf6c docs: Android NDK r7b Release Notes
Change-Id: Ib1a92b1bbdb190f3aae6dcc69a78cbf5ad3c4760
2012-02-14 11:49:27 -08:00
Robert Greenwalt
2384386f31 Stop using shared DUN APN when tethering stops.
Backported from master, including a bug fix and a cdma enhancement.

Even if other people are sharing the connection (ie, carrier wants
default and tethered traffic on the same APN) stop using a carrier-
described APN when the tethering stops.

bug:5972599
Change-Id: I25e4831855e6b62c0c3ab3a6f4d4846aaee6ac50
2012-02-14 11:44:09 -08:00
Mike Lockwood
ffc8989965 Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1 2012-02-14 11:30:05 -08:00
Teng-Hui Zhu
7e2346d51a Update the scale while updating the drawGL functor
bug:6008955

webkit change:
https://android-git.corp.google.com/g/#/c/165734/

Change-Id: I5ba7998a6b8f33b44582b0158ba966054aaad2a8
2012-02-14 11:29:52 -08:00
Robert Greenwalt
8d27f20ac2 Add a config to set Dun capabilities.
Since CDMA doesn't use APN settings there was no place to say what a cdma
device's DUN connection would support, so by default normal device
originating traffic would be blocked on a tethering single-connection device.

With this change you can (via overlay) say that it supports everything
so mms and on-device browsing/email will still work even when on a dun connection.

The reason to allow both: some carriers will charge per byte for dun access
and so they don't want lots of non-tethering traffic used (costs the user alot)
but other carriers just use a dun connection to limit access to tethering, but
once there give unlimited data, so it makes sense to support everything there.

bug:5972599
Change-Id: I78fd7f3ac63c51a0560b659ed5ec219b10a93f8d
2012-02-14 11:29:36 -08:00
John Wang
63b596664c Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 2012-02-14 10:09:26 -08:00
Jean-Baptiste Queru
9090a7a2fd Merge from master
Change-Id: I72b13c6443acdfb1b9ad477942f32a925fde5c61
2012-02-14 10:06:49 -08:00
Jean-Baptiste Queru
788efcf8ef Merge from master
Change-Id: I62479982edbb2229f84d20a581cccb703bdfc87b
2012-02-14 10:04:12 -08:00
Guang Zhu
e3a01395ae Merge "disable cpu_upload path workaround" 2012-02-14 10:02:44 -08:00
Guang Zhu
20a14ca937 disable cpu_upload path workaround
Bug: 6008123

Change-Id: I9bee623827ad82185c77875ba317c2fd95f3fce8
2012-02-14 10:01:46 -08:00
Jean-Baptiste Queru
35377f5c50 Merge from master
Change-Id: Ib9bc82ee0517945c5a713692d748042601d406ef
2012-02-14 09:57:40 -08:00
Ying Wang
3fb7ba1ed2 Merge "Build all font files as prebuilts." 2012-02-14 09:53:36 -08:00
Glenn Kasten
05bd19f608 Merge "Fix races related to volume and mute" 2012-02-14 09:44:47 -08:00
Glenn Kasten
1013f417b6 am 4f7adcf7: Merge "Update comments"
* commit '4f7adcf76a6f97076c05720d9c20a221a57692cb':
  Update comments
2012-02-14 09:43:45 -08:00
Glenn Kasten
4f7adcf76a Merge "Update comments" 2012-02-14 09:42:32 -08:00
Chet Haase
1ace2572b5 am c87b0084: Merge "Refactor animation code in new Draw() method into its own method."
* commit 'c87b0084e3dbf5c0862d29f039ee908bccf39e9d':
  Refactor animation code in new Draw() method into its own method.
2012-02-14 09:22:10 -08:00
Chet Haase
c87b0084e3 Merge "Refactor animation code in new Draw() method into its own method." 2012-02-14 09:19:59 -08:00
Glenn Kasten
b3db213eb5 Update comments
We no longer put the filename at start of file.

Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
2012-02-14 09:17:59 -08:00
Chet Haase
bcca79acb1 Refactor animation code in new Draw() method into its own method.
Ongoing cleanup of View drawing code, continuation of drawChild() refactoring.

Change-Id: I6d7383bb858d39ced6917d559defe7713e53de38
2012-02-14 09:16:39 -08:00
Glenn Kasten
422ab3f1e4 am f4e1bdc1: Merge "Remove dead code AudioTrack::getLoop"
* commit 'f4e1bdc13e0c9bb6352e458bef283dfc7165e23f':
  Remove dead code AudioTrack::getLoop
2012-02-14 09:10:39 -08:00
Glenn Kasten
fe93505ce1 am 150d238f: Use size_t and ssize_t with Vector
* commit '150d238f3a5218846c5f16e64958079d22ac11c4':
  Use size_t and ssize_t with Vector
2012-02-14 09:10:36 -08:00
Glenn Kasten
f4e1bdc13e Merge "Remove dead code AudioTrack::getLoop" 2012-02-14 09:09:03 -08:00
Glenn Kasten
150d238f3a Use size_t and ssize_t with Vector
Use size_t with size() and ssize_t with indexOfKey().  Exception:
use ssize_t for backwards loops, and indices that are overloaded as a
marker or error code.

Change-Id: Ibf2a360af4539b72b09c818dda22ea2a0de92431
2012-02-14 09:06:20 -08:00
Glenn Kasten
191f238cbb am d23d2b16: Merge "AudioRecord and AudioTrack client tid"
* commit 'd23d2b1662dc61222541310f7297cbee4e8b2b9d':
  AudioRecord and AudioTrack client tid
2012-02-14 09:03:03 -08:00
Glenn Kasten
d23d2b1662 Merge "AudioRecord and AudioTrack client tid" 2012-02-14 09:01:04 -08:00
Ramanan Rajeswaran
473cc1d9b5 am c26b3a7f: am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp
* commit 'c26b3a7f12da9f5d495378749a098811a29daf85':
  DO NOT MERGE
2012-02-14 07:39:29 -08:00
Ramanan Rajeswaran
c26b3a7f12 am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp
* commit '128dfa514818399ff8b5fde56fa487374f6fd504':
  DO NOT MERGE
2012-02-14 07:36:53 -08:00
Ramanan Rajeswaran
128dfa5148 Merge "DO NOT MERGE" into ics-scoop-plus-aosp 2012-02-14 07:35:13 -08:00
Glenn Kasten
6a20b26d99 AudioRecord and AudioTrack client tid
Inform AudioFlinger of the tid of the callback thread.

Change-Id: I670df92dd06749b057238b48ed1094b13aab720b
2012-02-14 07:30:48 -08:00
Steven Ross
c9237f41a4 Removing dependence on enable_facelock
With this change, FaceUnlock is enabled by default when installed
fixes 5989485

Change-Id: Icbce3237ff533e8b7b88faf592ac4a1e143d5dc3
2012-02-14 09:27:00 -05:00
Chet Haase
6c217f0b77 am 4212d3fc: Merge "Refactor ViewGroup.drawChild() into View.draw()"
* commit '4212d3fc736712d6e5fb69d5067ce8d9a83806ef':
  Refactor ViewGroup.drawChild() into View.draw()
2012-02-14 06:22:06 -08:00
Chet Haase
4212d3fc73 Merge "Refactor ViewGroup.drawChild() into View.draw()" 2012-02-14 06:20:16 -08:00
Mike Lockwood
ece18efb35 Don't pulse LED on new notification unless notification has LED flag set
Bug: 6006131

Change-Id: I719c7d68e310bfaca227f6286159b3993784926b
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-13 20:42:19 -08:00
Jeff Brown
6c8d9f08d6 am a9daa164: Merge "Fix possible races in vsync infrastructure."
* commit 'a9daa164a58fc70d08702787e69a56212f5ad8c9':
  Fix possible races in vsync infrastructure.
2012-02-13 20:39:58 -08:00
Jeff Brown
a9daa164a5 Merge "Fix possible races in vsync infrastructure." 2012-02-13 20:38:24 -08:00
Jeff Brown
58aedbc9be Fix possible races in vsync infrastructure.
Applications sometimes crashed on exit due to the display event
receiver pipe apparently being closed while still a member of the
Looper's epoll fd set.

This patch fixes a few different possible races related to
the display event receiver lifecycle.

1. The receiver used to play a little dance with the Looper,
registering and unregistering its callback after each vsync
request.  This code was a holdover from a time before the
surface flinger supported one-shot vsync requests, so we can
get rid of it and make things a lot simpler.

2. When the Choreographer is being accessed from outside the UI
thread, it needs to take great care that it does not touch
the display event receiver.  Bad things could happen if the receiver
is handling a vsync event on the Looper and the receiver is
disposed concurrently.

3. It was possible for the Choreographer to attempt to dispose
the receiver while handling a vsync message.  Now we defer disposing
the receiver for a little while, which is also nice because we
may be able to avoid disposing the receiver altogether if we find
that we need it again a little while later.

Bug: 5974105
Change-Id: I77a158f51b0b689af34d07aee4245b969e6260d6
2012-02-13 20:34:38 -08:00
Mathias Agopian
b749dd8530 EGLConfig is now not remaped to an internal EGLConfig
this is possible now that we support only a single
EGL implementation. this allows a large code simplification.

Change-Id: I7a6b9db4c5d60f4407c6061e7a68729af63d5242
2012-02-13 20:23:15 -08:00
Jean-Baptiste Queru
919acea233 am b35b9a86: am 6466f400: am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call"
* commit 'b35b9a8642365921a185eab5e8d4716f247fed85':
  Fix incorrect prototype for JNI call
2012-02-13 20:06:19 -08:00
Jean-Baptiste Queru
b35b9a8642 am 6466f400: am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call"
* commit '6466f400a40224dc113eb6d06009a1c655151045':
  Fix incorrect prototype for JNI call
2012-02-13 20:02:50 -08:00
Jean-Baptiste Queru
6466f400a4 am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call"
* commit 'fca4ff3851508d9d2c414aa535a86d7ac0eb5e72':
  Fix incorrect prototype for JNI call
2012-02-13 20:00:40 -08:00
Jean-Baptiste Queru
fca4ff3851 am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call"
* commit 'eaf2617fc20dd6484722edc9df41faf6e91d73cc':
  Fix incorrect prototype for JNI call
2012-02-13 19:58:09 -08:00
Jean-Baptiste Queru
eaf2617fc2 am 472512f6: Merge "Fix incorrect prototype for JNI call"
* commit '472512f6970fa170e2e1a3e1c24ac2b742e2e6b6':
  Fix incorrect prototype for JNI call
2012-02-13 19:55:52 -08:00
Michael Jurka
99a9655b93 Making recents faster
Improving load time by:
- using window animation for fade-in and not
    waiting to create HW layer
- starting loading of thumbnails/icons earlier
- only initially creating views for the first
    screenful of items
- recycling views

Change-Id: I529b1085fe35d81aaafeb7433ccaed8e0537f01c
2012-02-13 19:11:40 -08:00
Omari Stephens
9f5a511a08 Add a method to the smoke test that launches each app
Bug: 5888360
Change-Id: I4a68bc8fef71fd7f89b3a7a997323bfaefadc3eb
2012-02-13 19:01:17 -08:00
Ying Wang
193ec66214 Build all font files as prebuilts.
Bug: 5972956
So that mm/mmm can be used to install all the font files.

Change-Id: I9378e98b3a01d26680613e5738a270077bca0b64
2012-02-13 18:55:41 -08:00
Guang Zhu
96a0e43ed3 am 6ae14555: Merge "fix build"
* commit '6ae14555f945a1a0fc04d6acc0131254c9b2c2e2':
  fix build
2012-02-13 18:40:55 -08:00
Guang Zhu
6ae14555f9 Merge "fix build" 2012-02-13 18:38:54 -08:00