913 Commits

Author SHA1 Message Date
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
Elliott Hughes
664c48e991 am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f' into gingerbread-plus-aosp

* commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f':
  Remove dead code: NIOBuffer.
2010-09-08 10:32:38 -07:00
Elliott Hughes
4c7d3f2889 Merge "Remove dead code: NIOBuffer." into gingerbread 2010-09-08 09:30:41 -07:00
Wei-Ta Chen
7b29804ba2 am 8fc6f8b2: am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread
Merge commit '8fc6f8b2152564cab6ede025644f9bc3ee61ce16'

* commit '8fc6f8b2152564cab6ede025644f9bc3ee61ce16':
  Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
2010-09-07 22:10:58 -07:00
Wei-Ta Chen
8fc6f8b215 am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread
Merge commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49' into gingerbread-plus-aosp

* commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49':
  Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
2010-09-07 21:48:48 -07:00
Wei-Ta Chen
340ce75b44 Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
This reverts commit 50ba3d2c09a9131f3578d271adf2bc8258ca1742.
2010-09-08 10:44:21 +08:00
Wei-Ta Chen
50cb7dc458 am a295a390: am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
Merge commit 'a295a3908befeb9dd30203c612d95411d68492ed'

* commit 'a295a3908befeb9dd30203c612d95411d68492ed':
  Rename LargeBitmap to BitmapRegionDecoder for having a better API.
2010-09-07 18:52:21 -07:00
Dianne Hackborn
347262622b am a1205f07: am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7'

* commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7':
  Modify native ALooper to take an explicit ident.
2010-09-07 18:52:06 -07:00
Dmitry Shmidt
59a5d2d577 am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
Merge commit 'd0f74ae081bac9a9c8f7faf9288305647735d743' into gingerbread-plus-aosp

* commit 'd0f74ae081bac9a9c8f7faf9288305647735d743':
  Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
2010-09-07 17:33:55 -07:00
Dmitry Shmidt
d0f74ae081 Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread 2010-09-07 17:29:45 -07:00
Wei-Ta Chen
a295a3908b am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
Merge commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628' into gingerbread-plus-aosp

* commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628':
  Rename LargeBitmap to BitmapRegionDecoder for having a better API.
2010-09-07 17:07:12 -07:00
Wei-Ta Chen
b356f8acec Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread 2010-09-07 17:01:57 -07:00
Irfan Sheriff
1907bd2f6c Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
Bug: 2973101
Change-Id: I874381eeb12bb796382717285750d700e9b181ce
2010-09-07 16:42:38 -07:00
Dianne Hackborn
a1205f07a6 am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp

* commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea':
  Modify native ALooper to take an explicit ident.
2010-09-07 16:38:45 -07:00
Dianne Hackborn
42c03e579a Modify native ALooper to take an explicit ident.
The ALooper API now uses an explicit "identifier" for the integer
that is returned rather than implicitly using the fd.  This allows
the APIs that had the fd to be a little more sane.

Change-Id: I8507f535ad484c0bdc4a1bd016d87bb09acd7ff0
2010-09-07 15:46:55 -07:00
Elliott Hughes
edf7223bc2 Remove dead code: NIOBuffer.
Working on speeding up our NIO implementation, I came across this suboptimal
code. Happily, it turns out to be unused.

Bug: 2935622
Change-Id: I07ae6e573d63e439f496d55af215b34598d8258a
2010-09-07 15:42:23 -07:00
Dianne Hackborn
4970675316 am b8bcfed5: am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread
Merge commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4'

* commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4':
  Add system property to turn off scheduling groups.
2010-09-07 14:47:51 -07:00
Vasu Nori
422dad0f50 android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff
Change-Id: Icf221a8e8d4c281f7719875816835ad7dfe7f3d1
2010-09-07 12:56:57 -07:00
Dianne Hackborn
b8bcfed552 am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread
Merge commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp

* commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7':
  Add system property to turn off scheduling groups.
2010-09-07 11:30:08 -07:00
Dianne Hackborn
84bb52ed61 Add system property to turn off scheduling groups.
Do this:

adb shell setprop debug.sys.noschedgroups 1

Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
2010-09-07 11:19:11 -07:00
Wei-Ta Chen
50ba3d2c09 Rename LargeBitmap to BitmapRegionDecoder for having a better API.
Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because
BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions.

Change-Id: I3e60c7fe4abd0289e1384e69a08fd20fe6fb0e10
2010-09-07 21:02:13 +08:00
Irfan Sheriff
ee923072eb Merge "Add set/get band in WifiNative" 2010-09-02 15:39:16 -07:00
Irfan Sheriff
25c9bf2396 Add set/get band in WifiNative
Add support for set and get band and set the default
to 2GHz for now till we get a fix on issues
with 11A

Change-Id: Icb9bddc353e4bf013bdb8a08d9b4ee3451c282f4
2010-09-02 12:48:20 -07:00