935 Commits

Author SHA1 Message Date
Romain Guy
1c1797acff Merge "Add debug mode to measure performance." 2010-09-24 18:45:13 -07:00
Romain Guy
e2d345ea67 Add debug mode to measure performance.
Change-Id: I9d4c84034dc200b99c8266165942a7cdbcb5c0c5
2010-09-24 18:39:22 -07:00
Eric Laurent
a7936a5d6d am f3ae63ee: am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread
Merge commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7'

* commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7':
  fix problem in AudioEffect JNI setup.
2010-09-24 15:57:44 -07:00
Eric Laurent
f3ae63eef2 am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread
Merge commit '52f58e96a723a56e6619c237c814a07503745de9' into gingerbread-plus-aosp

* commit '52f58e96a723a56e6619c237c814a07503745de9':
  fix problem in AudioEffect JNI setup.
2010-09-24 13:46:36 -07:00
Eric Laurent
2fb43ef8c0 fix problem in AudioEffect JNI setup.
There is a problem in AudioEffect and Visualizer native_setup() methods
that causes a crash in the application after the mediaserver process
has crashed and restarted.
The problem is that the native AudioEffect/Visualizer constructor is
called while the JNI is in critical state after calling
GetPrimitiveArrayCritical(). As the mediaserver process just restarted, the
first call to AudioSystem will cause the binder IAudioflinger interface to
be reteived and a callback send to AudioSystem JNI to clear the mediaserver
error state. This will call env->FindClass() and crash due to the JNI being
in critical state.

Also fixed a similar problem in AudioTrack JNI

Change-Id: I4a9026a3e26c7f78d9b4b4bec1aac90fbee2ab62
2010-09-24 13:18:14 -07:00
Irfan Sheriff
c6c9a7df58 Merge "Add Wifi Protected Setup support" 2010-09-23 11:33:49 -07:00
Irfan Sheriff
5ee89800be Add Wifi Protected Setup support
Add WPS PBC and WPS pin method support with pin obtained
from AP

Bug: 2277571

Change-Id: I6ff8e447ab8c5e59456a55152588fd4d6386c610
2010-09-23 09:13:34 -07:00
Wei-Ta Chen
a23cdda0a5 am ac487f70: am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe'

* commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe':
  Unhide BitmapRegionDecoder.
2010-09-22 23:06:55 -07:00
Wei-Ta Chen
ac487f708f am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952' into gingerbread-plus-aosp

* commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952':
  Unhide BitmapRegionDecoder.
2010-09-22 23:03:30 -07:00
Wei-Ta Chen
6b849e2123 Unhide BitmapRegionDecoder.
1. Rename LargeBitmap to BitmapRegionDecoder
2. Move the instantiations of BitmapRegionDecoder out of BitmapFactory.
3. Remove the use of MemoryFile in BitmapRegionDecoder, since MemoryFile's API had been modified in master. Otherwise, the change will break the master build.
4. Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions.

Most of the modifications, except for (2) and (3), were reviewed in https://android-git.corp.google.com/g/#change,64716 .
However, that change broke the master build due to (3) and was reverted eventually.
So, instead of withdrawing this change and waiting for that change to be checked in again, I merge the two changes into one.

Change-Id: I2202c0fbbbd6d6676bbd9637e690023ea4099c40
2010-09-23 13:56:52 +08:00
Romain Guy
76f6091185 Merge "Add support for circular gradients to the GL renderer." 2010-09-21 16:50:50 -07:00
Romain Guy
ddb80bebb0 Add support for circular gradients to the GL renderer.
This change also adds full support for local transformation matrices on
sweep and radial gradients.

Change-Id: Id8773bc0766575190e3f3d51984fc5e57b266c3f
2010-09-21 16:48:50 -07:00
Romain Guy
399542a7a3 Merge "Add support for SweepGradient in the GL renderer." 2010-09-20 17:55:58 -07:00
Romain Guy
ee916f14cb Add support for SweepGradient in the GL renderer.
Change-Id: I7aa397ed4e34655ead9ba1f5b4ce087665e0f022
2010-09-20 17:54:17 -07:00
Vasu Nori
4e874edf69 don't compile statement for certain SQL statements
SQL statements such as Create table, Pragma, Begin, Commit, Rollback
etc don't need a compiled statement.

Change-Id: I55f5e4e6cbb41cbe83e592e25ba852fe23e2b39f
2010-09-17 10:15:40 -07:00
Romain Guy
a977120681 Merge "Add support for drawLines(), with anti-aliasing" 2010-09-16 20:51:45 -07:00
Romain Guy
759ea80dca Add support for drawLines(), with anti-aliasing
Change-Id: I16c0593c5671490909dec13a85df601e1428a1a6
2010-09-16 20:49:46 -07:00
Carl Shapiro
3bf23a7b9f am b0abf3ea: am 4b164c1b: Kill off the remaining GC-specific system properties.
Merge commit 'b0abf3ea47b74296fd790843e789cfd101f58a00'

* commit 'b0abf3ea47b74296fd790843e789cfd101f58a00':
  Kill off the remaining GC-specific system properties.
2010-09-16 17:29:41 -07:00
Carl Shapiro
b0abf3ea47 am 4b164c1b: Kill off the remaining GC-specific system properties.
Merge commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c' into gingerbread-plus-aosp

* commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c':
  Kill off the remaining GC-specific system properties.
2010-09-16 16:57:37 -07:00
Carl Shapiro
4b164c1bf3 Kill off the remaining GC-specific system properties.
Change-Id: Ib09ef132c6fb99b9eb22ecfd75a910c9c0f01e25
2010-09-16 16:48:21 -07:00
Romain Guy
885b1f21d9 Merge "Better error handling in the OpenGL renderer." 2010-09-16 14:18:22 -07:00
Romain Guy
b025b9c8b4 Better error handling in the OpenGL renderer.
Add a glGetError() check on every frame
Don't attempt to create textures larger than the maximum size allowed

Change-Id: Iee4afae16089406dbe8bf10fc93b674f1271a0ca
2010-09-16 14:16:48 -07:00
Wu-cheng Li
606c3de595 am d63d7474: am 3fd5fa4c: Fix the runtime restart due to name change.
Merge commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f'

* commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f':
  Fix the runtime restart due to name change.
2010-09-15 19:11:05 -07:00
Wu-cheng Li
d63d74749f am 3fd5fa4c: Fix the runtime restart due to name change.
Merge commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5' into gingerbread-plus-aosp

* commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5':
  Fix the runtime restart due to name change.
2010-09-15 17:24:40 -07:00
Wu-cheng Li
3fd5fa4ca9 Fix the runtime restart due to name change.
bug:3001395
bug:3001399
Change-Id: I73fd1a63fea0807531b01ae2a754b32efffd41b1
2010-09-15 16:08:57 -07:00
Jeff Brown
49478536b6 am 14bc6b5d: am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Merge commit '14bc6b5d0677e5c454a67775c852f90389bb4567'

* commit '14bc6b5d0677e5c454a67775c852f90389bb4567':
  Replace epoll() with poll() and rename PollLoop to Looper.
2010-09-15 12:32:29 -07:00
Vasu Nori
77267fc68f fix bugs in exception throwing code in native_fillwindow
when exceptions are thrown, they are not being handled correctly
and the end result is some random errors/exceptions.
also change LOGD to LOGD_IF(cond,...) in keeping with Android
standards

Change-Id: Ie7f5e5e4b071ca6b2a6aa899c678c81f9ccd8e71
2010-09-14 16:38:01 -07:00
Jeff Brown
14bc6b5d06 am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp

* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
  Replace epoll() with poll() and rename PollLoop to Looper.
2010-09-14 15:32:03 -07:00
Jeff Brown
09340a4bb9 Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread 2010-09-14 15:27:33 -07:00
Jaikumar Ganesh
707952ecd4 Rework Bluetooth tethering networking configuration.
Limit it to 5 for now, and store the iface.

Change-Id: Ia6044b8e8f886dcd587ab0bb57273e0c11b6cd74
2010-09-14 15:25:14 -07:00
Jeff Brown
4fe6c3e51b Replace epoll() with poll() and rename PollLoop to Looper.
As part of this change, consolidated and cleaned up the Looper API so
that there are fewer distinctions between the NDK and non-NDK declarations
(no need for two callback types, etc.).

Removed the dependence on specific constants from sys/poll.h such as
POLLIN.  Instead looper.h defines events like LOOPER_EVENT_INPUT for
the events that it supports.  That should help make any future
under-the-hood implementation changes easier.

Fixed a couple of compiler warnings along the way.

Change-Id: I449a7ec780bf061bdd325452f823673e2b39b6ae
2010-09-14 01:59:45 -07:00
Jaikumar Ganesh
20c8f47330 resolved conflicts for merge of 0522f5e9 to master
Change-Id: Ie0a7ece33dced1042948087053e49665f6235fc2
2010-09-13 14:57:59 -07:00
Jaikumar Ganesh
0522f5e9b7 am cc5494c9: Out Of Band API for Secure Simple Pairing.
Merge commit 'cc5494c9996f809e36539b24e8b6b67683383d29' into gingerbread-plus-aosp

* commit 'cc5494c9996f809e36539b24e8b6b67683383d29':
  Out Of Band API for Secure Simple Pairing.
2010-09-13 11:52:19 -07:00
Jaikumar Ganesh
cc5494c999 Out Of Band API for Secure Simple Pairing.
Change-Id: I54ded27ab85d46eef3d2cca84f2394b1ffe88ced
2010-09-13 11:40:21 -07:00
Vasu Nori
bcd3387eed Merge "Return count of rows in a resultset only once (when startPos = 0)" 2010-09-10 13:45:45 -07:00
Vasu Nori
b18f27dbf4 Return count of rows in a resultset only once (when startPos = 0)
If a query returns 100 rows and say only 10 rows fit in 1MB, then client
receiving the cursor from the ContentProvider needs to paginate.
ContentProvider returns count of total data everytime it returns a page
(= 1MB) of data to the client.
Returning total count causes reading (and skipping unwanted) data
from sqlite.
Instead, it should be sufficient to get total count once
and re-use the count value during the life of the cursor
until a requery is performed on the cursor.
(Count won't change unless data is changed - in which case
the cursor is asked to perform requery anyway. So doing count
once and reusing it should work)
Change-Id: I3520d94524dda07be9bcff56b6fbae5276af1d3b
2010-09-10 13:43:19 -07:00
Joseph Wen
94b19d3706 am 94db0238: am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread
Merge commit '94db0238a3b6cba3cbf0e037af74e898a4741204'

* commit '94db0238a3b6cba3cbf0e037af74e898a4741204':
  Fix bug in JNI BitmapFactory
2010-09-10 02:39:10 -07:00
Joseph Wen
94db0238a3 am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread
Merge commit '219eb7ec8403ef9b98125f2b58cc27669ae69712' into gingerbread-plus-aosp

* commit '219eb7ec8403ef9b98125f2b58cc27669ae69712':
  Fix bug in JNI BitmapFactory
2010-09-10 02:35:50 -07:00
Joseph Wen
219eb7ec84 Merge "Fix bug in JNI BitmapFactory" into gingerbread 2010-09-10 02:32:05 -07:00
Joseph Wen
2dcfbefbbe Fix bug in JNI BitmapFactory
In nativeCreateLargeBitmapFromFileDescriptor() if the file descriptor
can not be rewinded isShareable should be set to false.

Change-Id: I7dd545c9d52d21c226e11b8921e35a1d9bba9515
2010-09-10 17:24:15 +08:00
Jaikumar Ganesh
41506304b8 am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread
Merge commit '166aeb290be234531ba049b6702f558a02317393' into gingerbread-plus-aosp

* commit '166aeb290be234531ba049b6702f558a02317393':
  DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
2010-09-09 16:05:43 -07:00
Jaikumar Ganesh
cf8905620f DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
Change-Id: I6bc04efd1292784bae5fc4786949d9da79e4aa22
2010-09-09 15:15:42 -07:00
Romain Guy
9584a542e3 Merge "Purge Skia objects from GL caches as needed." 2010-09-08 18:06:11 -07:00
Romain Guy
a2341a9f6a Purge Skia objects from GL caches as needed.
Change-Id: I754c671cf790ad5ae8bf047ad328034217da4ecc
2010-09-08 18:04:33 -07:00
Romain Guy
53e7ae9065 Merge "Fix possible infinite loop when purging textures." 2010-09-08 15:16:13 -07:00
Romain Guy
9aaa8269a3 Fix possible infinite loop when purging textures.
Change-Id: Ib05b398ae03e734da2dab0496df416fed4570b1c
2010-09-08 15:15:43 -07:00
Jeff Brown
b380c4d7ed resolved conflicts for merge of a05088c1 to master
Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521
2010-09-08 13:02:55 -07:00
Jeff Brown
a05088c18d am 85a31767: Add support for secure views.
Merge commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp

* commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6':
  Add support for secure views.
2010-09-08 11:55:24 -07:00
Jeff Brown
85a3176704 Add support for secure views.
Added the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the
input manager whenever another visible window is partly or wholly obscured
the target of a touch event so that applications can filter touches
accordingly.

Added a "filterTouchesWhenObscured" attribute to View which can be used to
enable filtering of touches when the view's window is obscured.

Change-Id: I936d9c85013fd2d77fb296a600528d30a29027d2
2010-09-08 11:50:55 -07:00
Elliott Hughes
cfa5903926 am 664c48e9: am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '664c48e991a70d07646d54125e97f579f3a33be4'

* commit '664c48e991a70d07646d54125e97f579f3a33be4':
  Remove dead code: NIOBuffer.
2010-09-08 10:38:41 -07:00