1472 Commits

Author SHA1 Message Date
Jeff Brown
14fcf900ce Fix invalid JNI call signature.
Bug: 5029536

Change-Id: I1f9b3faa77d49e26ef43982ff57cbbf0c3be8b40
2011-07-14 04:08:21 -07:00
Mike Lockwood
c1b9bbb21c Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 19:45:44 -04:00
Wink Saville
8ff5a9d84e resolved conflicts for merge of 99cd6671 to master
Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79
2011-07-12 13:56:05 -07:00
Jeff Brown
bd882b1c87 Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
2011-07-11 22:12:16 -07:00
Jaikumar Ganesh
5623b07497 Merge "Bluetooth Health APIs" 2011-07-11 14:17:57 -07:00
Jaikumar Ganesh
fb658c72a3 Bluetooth Health APIs
1. Remove the check of configs in BluetoothHealth.
   This check is useless since BluetoothHealth is a proxy.

2. Add a wrapper and a callback class. We shouldn't expose
   Binder interfaces as public APIs.

Change-Id: If62620b4251cf93f3f97d2fe63099e40fae7da4d
2011-07-11 11:32:27 -07:00
Kazuhiro Ondo
99cd66711b am 64ba5eaa: Concurrent multi-PDP support in TrafficStats
* commit '64ba5eaa40614877c679b3fbaaa3c2efd17d50d2':
  Concurrent multi-PDP support in TrafficStats
2011-07-10 16:16:54 -07:00
Kazuhiro Ondo
64ba5eaa40 Concurrent multi-PDP support in TrafficStats
Quick fix to enable concurrent multiple PDP support in TrafficStats.
Just updated the list of hard-coded mobile interfaces for now.

Bug: 4553527
Change-Id: I44ce73f3000542d6457f353bb561a2275684af6b
2011-07-10 14:40:43 -07:00
Jeff Brown
10e8971286 Eliminate single-process mode.
Bug: 5010576

Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
2011-07-08 19:54:07 -07:00
Wink Saville
ae367419df resolved conflicts for merge of e4a56a32 to master
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
2011-07-08 12:49:14 -07:00
Wink Saville
e4a56a32ac am 8171e6f6: Use resetConnections with resetMask.
* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
  Use resetConnections with resetMask.
2011-07-08 09:40:08 -07:00
Romain Guy
9ace8f5e79 Use NEAREST filtering for layers whenever possible.
Change-Id: Id5bee1bd4a322cf93e8000b08e18f1e1b058648e
2011-07-07 20:50:11 -07:00
Wink Saville
8171e6f690 Use resetConnections with resetMask.
Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
2011-07-07 16:17:06 -07:00
Romain Guy
f61970fc79 Add an API to query maximum bitmap/texture size on Canvas.
Change-Id: I2c576c9a4ecad9f33cc6636bcbc29786acdf052d
2011-07-07 14:10:06 -07:00
Matthew Xie
a0c680393f Incoming Bluetooth Connection requests - dialog.
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.
Includes down merged contributions from Jaikumar Ganesh.

Change-Id: Ic8b857aad3554315aae39a0e871eb94d0ac98a91
2011-07-07 12:43:27 -07:00
Jamie Gennis
3cf7cf5751 Merge changes I9fb59763,I8b2c6e00
* changes:
  SurfaceTexture: consume buffers after err checks
  SurfaceTexture: change onFrameAvailable behavior
2011-06-28 12:55:03 -07:00
Andy McFadden
84e297238f Remove native EventRecurrence parser
Switch over to the new parser.

Bug 4575374

Change-Id: If78d8042fb266182900398f7fc464a048c779966
2011-06-28 07:43:27 -07:00
Jamie Gennis
bd5404d031 SurfaceTexture: change onFrameAvailable behavior
This change alters the conditions under which the onFrameAvailable
callback gets called by the C++ SurfaceTexture class.  The new behavior
is to call the callback whenever a frame gets queued that will be
visible to the buffer consumer.  This means that buffers queued in
synchronous mode always trigger the callback, as those buffers will
remain pending until they are consumed.  Buffers queued in asynchronous
mode will only trigger the callback if there was not previously an
unconsumed buffer pending.

The new behavior means that a consumer should perform a draw operation
exactly once for every onFrameAvailable call that it recieves.  This
change also modifies SurfaceFlinger and the SurfaceTexture JNI to
support of the new behavior.

Change-Id: I8b2c6e00961d3d58b11c6af50b555b6e4c5f5b40
2011-06-27 15:45:39 -07:00
Jean-Baptiste Queru
a2c8a7b573 am ec5039b3: am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."
* commit 'ec5039b3720ee9b92fb2a2c6dd9f468d2dcd7172':
  Add WEBP to the list of Image formats that support Compression.
2011-06-27 14:15:01 -07:00
Jamie Gennis
436b50f0dc Merge "SurfaceTexture: detach from Dalvik when necessary." 2011-06-26 12:23:12 -07:00
Jean-Baptiste Queru
ec5039b372 am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."
* commit '99c070d8eb9f1ff9ea5c38991f15f091040226c2':
  Add WEBP to the list of Image formats that support Compression.
2011-06-24 12:20:24 -07:00
Fabrice Di Meglio
d3d4b4b86a Merge "Fix potential advances overrun in TextLayoutCache." 2011-06-24 12:02:58 -07:00
Doug Felt
b092f55c37 Fix potential advances overrun in TextLayoutCache.
Change-Id: Ibec544f249833a28fe8ef9a15fc8ab48fddfc51c
2011-06-24 11:54:00 -07:00
Jaikumar Ganesh
c9286ebbf4 Merge "Implement APIs for Bluetooth Health profile." 2011-06-24 11:34:35 -07:00
Jean-Baptiste Queru
99c070d8eb am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."
* commit '4fea5373d350f5d855408ffaa41206b8fa743c55':
  Add WEBP to the list of Image formats that support Compression.
2011-06-24 11:33:46 -07:00
Jaikumar Ganesh
2ea1e85dcb Implement APIs for Bluetooth Health profile.
This first patch implements all the APIs.
The APIs wil be made public soon. The data specification
API will be submited in another patchset.
Change-Id: I2462683b7e07380e2c42474b0036b34d03b4bed1
2011-06-24 11:31:43 -07:00
Grace Kloba
5c5050d902 Make TextureView to use async SurfaceTexture.
With this, there is no synchronous destroy SurfaceTexture requirement any more.

Revert the previous change which only applies to the sync SurfaceTexture.

Change-Id: Id4790d38a27f2982d0c8ad471bc1107683d27ffc
2011-06-23 22:32:04 -07:00
Grace Kloba
0904d0af81 Add allowSynchronousMode to SurfaceTexture constructor.
Change-Id: I54f30a3c16bbe6b813f3bcd1d389da5627531304
2011-06-23 21:21:47 -07:00
Jamie Gennis
0a8fd9b610 SurfaceTexture: detach from Dalvik when necessary.
This change adds a call to detach from the Davlik VM in SurfaceTexture
JNI calls that caused an attach.

Change-Id: I8e0d7d596680bd25ac42f8db4ca8343a62827255
2011-06-23 15:12:16 -07:00
tedbo
0694cfe49a Merge "Add method to create a ParcelSurfaceTexture from android.view.Surface." 2011-06-23 14:45:30 -07:00
Jamie Gennis
b950b8e23e Merge "Fix the issue where onFrameAvailable is not triggered if SurfaceTexture is in sync mode." 2011-06-23 13:02:40 -07:00
Vikas Arora
2305ac9e4a Add WEBP to the list of Image formats that support Compression.
Note: The integrator of this change to Android internal code-repo will
have to run one extra step 'make update-api' to update 'api/current.txt'
file corresponding to approved API. The AOSP branch didn't have this
file, hence I could not add the same to this change. The updated file
'api/current.txt' has to be submitted along with this change.

Change-Id: I29909e907a2e82d801e16654322190a808c5bda9
2011-06-23 13:11:13 +05:30
Romain Guy
a9489274d6 Add the ability to specify the opacity of a TextureView
TextureView assumes its content is opaque by default.

Change-Id: Iba873423566a5b67c388081838bd910dceba32ba
2011-06-22 20:58:11 -07:00
tedbo
4e8a5c922c Add method to create a ParcelSurfaceTexture from android.view.Surface.
Change-Id: I05e343ab7e327478f60322af9373574b70c148f5
2011-06-22 16:18:09 -07:00
Romain Guy
c989d867f2 Collapse UI events in TextureView.
Change-Id: Ia6c0cef0f694edc4b685c1ade1a9ba509a51e541
2011-06-22 15:01:07 -07:00
Irfan Sheriff
5389c80d1f am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE
* commit 'cf99765b6255d73aa4fbc61d5bd78ec65fbd0370':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
2011-06-22 11:19:09 -07:00
Irfan Sheriff
cf99765b62 resolved conflicts for merge of 914ed90f to honeycomb-LTE
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
2011-06-22 11:01:16 -07:00
Irfan Sheriff
20b6ded6e3 am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE
* commit '5d5b73be515d839d72e1cf7aeffdfdfb56d66045':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
2011-06-22 07:47:16 -07:00
Irfan Sheriff
c74eacde30 resolved conflicts for merge of 267a6181 to honeycomb-LTE
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
2011-06-22 07:11:42 -07:00
Grace Kloba
0bc6eb30bc Fix the issue where TextureView stuck if the producer side is too fast.
When SurfaceTexture is in sync mode, the consumer needs to pull the pending
frames. Otherwise the onFrameAvailable won't be called and no more update.

This simple fix is to skip frame to keep up with the producer side.

Change-Id: Ica833695dc0b0221d2543f46f0dd41aa55d1aa16
2011-06-22 01:29:13 -07:00
Grace Kloba
925bcaabde Fix the issue where onFrameAvailable is not triggered if SurfaceTexture is in sync mode.
If there is more frame after updateTexImage, trigger the listener again.

Change-Id: I1415ae9a914cc8bb139cb369464b1f6a2aa24058
2011-06-22 00:56:54 -07:00
Andy McFadden
ae633b2d36 Port EventRecurrence.parse() from native
This adds a Java-language implementation of EventRecurrence.parse(),
to make it easier to relocate it for the benefit of unbundled
Calendar.

Differences from the native version:

 - enforces that FREQ appears first
 - allows (but ignores) X-* parts
 - improved validation on various values
 - error messages are more specific
 - enforces that only one of UNTIL and COUNT may be present [disabled]
 - allows lower-case property and enumeration values [disabled]

As part of the transition process, both versions of the parser are
called on every request, and the results are compared.  If the results
are different a warning message is logged.

An unnecessary constructor was removed.

This also this moves some EventRecurrence tests out of CalendarProvider,
into coretests, and adds a simple parse test with the examples from
the RFC.

Bug 4575374

Change-Id: If737ed1272fda65c93363d87b2da12b85e644f5b
2011-06-21 16:04:48 -07:00
Irfan Sheriff
914ed90f2c Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
This reverts commit 58d1bb497e0d83e28a02fbcdc1f33f29a992db7e.
2011-06-21 14:26:37 -07:00
Jaikumar Ganesh
9e5d0de9a3 am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread
* commit 'b38fa2a0ac2bde56504929de6a3dd61ac723958e':
  DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
2011-06-21 13:24:46 -07:00
Irfan Sheriff
58d1bb497e DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
This reverts commit fe3b33d4ead06c546202753e38188db5e2eaa7fa.

Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
2011-06-21 11:38:23 -07:00
Jaikumar Ganesh
b38fa2a0ac Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 2011-06-21 11:23:51 -07:00
Jaikumar Ganesh
d762f063be DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.

Change-Id: Ibe267f7cda28ce2a46c25800df2e8ac685b0b9e6
2011-06-21 09:27:12 -07:00
Jamie Gennis
fd0ffd2a4e Merge "SurfaceTexture: attach to Dalvik when needed." 2011-06-20 11:54:34 -07:00
Jamie Gennis
84293fb962 SurfaceTexture: attach to Dalvik when needed.
This change fixes a bug in the SurfaceTexture JNI where a thread that
the Dalvik VM was not aware of calls the onFrameAvailable callback.
When this happens the callback needs to first attach the thread to the
VM before attempting to post the onFrameAvailable event for Java code to
handle.

Change-Id: I6a5470c32611ea6f38e9167779450f50635cabd3
2011-06-17 16:42:46 -07:00
Romain Guy
035f1010eb Correctly register native methods.
Change-Id: Ic82a2b9c5dd7fb5dc23650c4d5aa208ef8563a31
2011-06-15 17:57:28 -07:00