ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
36,718 Commits 2 Branches 0 Tags 54 MiB
f795f549b2
Commit Graph

36718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
2640bfd168 SurfaceTexture: fix SurfaceTextureGLToGLTest 
This change fixes a couple different issues in the
SurfaceTextureGLToGLTest test fixture:
  - incorrect use of conditions
  - move logging after the locks are acquired
  - call the parent class's TearDown method
  - clean up the SurfaceTexture before eglTerminate gets called

Change-Id: I6960e5ab7f144225f01a2089d3f849c99fed0b38
 2011-07-14 17:11:47 -07:00
Jeff Brown
c9367a80d1 Merge "Minor code cleanups in vector." 2011-07-14 17:08:16 -07:00
Jeff Brown
eb629fc78d Merge "Replace Vector _grow/_shrink checks with assert." 2011-07-14 16:52:10 -07:00
James Dong
a2fd1773ba Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."" 2011-07-14 16:42:34 -07:00
Chia-chi Yeh
e99545ed6b Merge "VPN: close the socket in protectVpn() to avoid leaking descriptors." 2011-07-14 16:22:21 -07:00
Adam Cohen
c3104e31ff Merge "Catching RemoteViews#apply() layout inflation exceptions in RemoteViewsAdapter" 2011-07-14 15:55:55 -07:00
Jim Miller
57dfc671dd Merge "Fix 5027468: prevent screen from turning back on while lockscreen in password mode." 2011-07-14 15:43:17 -07:00
Fabrice Di Meglio
407b10b2a6 Merge "Fix bug #5025936 TableLayout layout direction resolution is broken" 2011-07-14 15:31:03 -07:00
Chia-chi Yeh
3fb46e476b Merge "VPN: Hook up the new control protocol and network state." 2011-07-14 15:22:59 -07:00
Jamie Gennis
3e646d62e5 SurfaceTexture: add support for new connect values 
This change adds support to SurfaceTextureClient for the new enum values
that can be passed to the ANativeWindow connect call.

Change-Id: I8c15418909e43a15673a9b22a5eb40df6923b273
 2011-07-14 15:03:33 -07:00
Justin Ho
5ad8677bfb Merge "Initial pass at some preload drawables Bug: 5020126" 2011-07-14 14:54:01 -07:00
Chia-chi Yeh
cc9b3691f2 Merge "ip-up-vpn: Create proper states for pppd and racoon." 2011-07-14 14:53:58 -07:00
John Wang
11dc831372 am 74c425d3: am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 
* commit '74c425d3e95ed0f47b1a5d447007886d01d7ff56':
  Show SIM blocked after 10 time puk wrong entries.
 2011-07-14 14:03:11 -07:00
John Wang
76652989ac am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 
* commit '54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
  Show SIM blocked after 10 time puk wrong entries.
 2011-07-14 14:00:58 -07:00
John Wang
1acde887d5 Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 2011-07-14 13:59:10 -07:00
Eino-Ville Talvala
c958b87606 Merge "NEW_API: Add auto-exposure and auto-white balance locking to the Camera." 2011-07-14 13:38:55 -07:00
Elliott Hughes
bc612a0254 Merge "Fix aidl to cope with multiple collection types per method." 2011-07-14 13:28:00 -07:00
Andreas Huber
c8105b1941 Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error" 2011-07-14 13:22:45 -07:00
Romain Guy
3f5f248676 Merge "Force bitmaps to load in ARGB8888 by default. Bug #5024993" 2011-07-14 12:45:23 -07:00
Philip Milne
2989e23704 Merge "Rationalize API after adding maximum size feature." 2011-07-14 11:32:09 -07:00
Narayan Kamath
2ac5e40251 Merge "Minor documentation updates for the AudioTrack class." 2011-07-14 11:13:07 -07:00
Glenn Kasten
92c5663426 Merge "Add MEDIA_UID" 2011-07-14 10:59:40 -07:00
Wink Saville
8f06479025 am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 
* commit '3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
  Remove STOPSHIP but allow seamless Handoff when possible.
 2011-07-14 10:55:58 -07:00
Jaikumar Ganesh
1ecf9d3e28 am 6dd45316: (-s ours) resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp 
* commit '6dd4531639157191e6224d3f8af5c9d099ca945f':
  Bluetooth: correcting return value from cancelDiscovery
 2011-07-14 10:55:55 -07:00
John Wang
b62a5356ff am 28d92afc: am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE 
* commit '28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
  Add getImei() to Phone interface.
 2011-07-14 10:49:38 -07:00
Dianne Hackborn
93efe80b13 Merge "Improve handling of low memory." 2011-07-14 10:48:01 -07:00
Jaikumar Ganesh
21ac6a6842 Merge "Remove Car audio class from auto pairing." 2011-07-14 10:08:41 -07:00
James Dong
4d17a026ba Merge "Support profile and level query for SW video decoders" 2011-07-14 09:59:24 -07:00
Jeff Hamilton
5bfa057ed9 Merge "unhide public apis" 2011-07-14 09:53:08 -07:00
Andreas Huber
56c2b4d5e3 Merge "Include all supported mime types when querying decoder profile/level support." 2011-07-14 09:09:14 -07:00
Andreas Huber
4d29cb39ea Merge "Remove legacy http support from stagefright, chromium is the new hotness." 2011-07-14 09:09:07 -07:00
Narayan Kamath
0dbd3b0427 Merge "Minor cleanups to TextToSpeech." 2011-07-14 08:44:39 -07:00
Glenn Kasten
139617a39c Merge "OMX CallbackDispatcher uses C++ Thread not pthread" 2011-07-14 07:54:34 -07:00
Jeff Brown
8f114f602f Merge "Refactor input dispatcher use of window/app handles." 2011-07-14 04:20:56 -07:00
Jeff Brown
c172d197f9 Merge "Fix invalid JNI call signature. Bug: 5029536" 2011-07-14 04:12:51 -07:00
Jeff Brown
c105333997 Minor code cleanups in vector. 
Fixed a potential bug where calling replaceAt with a reference to
an existing element in the vector at the same index would cause
the element to be destroyed while being copied to itself.

Refactored the conditions in _grow and _shrink for clarity.
The computations are exactly the same but I think it reads better
this way.  In particular, the ssize_t variable 's' is gone: it didn't
need to be signed anyways because its value could never be negative.

Change-Id: If087841c15e6a87160eee874720c4a77eb0e99a6
 2011-07-14 04:11:23 -07:00
Jeff Brown
686f62fcaf Replace Vector _grow/_shrink checks with assert. 
On review of the code, _grow and _shrink are checking for conditions
that cannot happen and that don't even really make sense.  For
example, if _shrink is called with where + amount > mCount then
this is really bad, however the check only considered the case
when where >= mCount and then it would arbitrarily choose a new
value for where.  Huh?

As it happens, the callers are correctly validating the
arguments before passing them down to these methods so we can
get rid of this code.

Change-Id: I921852dba8997065bb0e9cac733e82028d14afcd
 2011-07-14 04:11:22 -07:00
Nick Pelly
4fa5dc52c0 am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread 
* commit '01588acaf87cfe9916239b7b26cc6810e0097138':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
 2011-07-13 22:38:44 -07:00
Jeff Brown
8a1d693e59 Provide more descriptive name for InputChannel ashmem. 
Change-Id: I4307de9f717ac4810b1b91ee0c1a3899325acf71
 2011-07-13 22:27:37 -07:00
Adam Powell
42b12e1c76 Merge "Preserve spacing for icons in menus" 2011-07-13 20:07:41 -07:00
Svetoslav Ganov
f82d42de44 Merge "Touch exploration gesture events change the window id." 2011-07-13 17:23:41 -07:00
Mike Lockwood
9ceb5ff5c0 Merge "Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build" 2011-07-13 16:46:50 -07:00
Mike Lockwood
c2be743a9c 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
Jason Sams
ec266daec3 Merge "Fix native crash when GL driver fails to initialize." 2011-07-13 16:43:27 -07:00
Dave Santoro
89c03508bc Merge "Contacts contract update for display photos." 2011-07-13 16:23:44 -07:00
Kenny Root
d8940dcb28 Merge "Add StorageVolume list to MountService dump" 2011-07-13 15:53:12 -07:00
Kenny Root
0ad4ea2cf2 Merge "Fix debugging for hwui caches" 2011-07-13 15:53:03 -07:00
Daniel Lehmann
fd7d7a11b9 Merge "Allow a sync adapter to provide an OPEN action for a group" 2011-07-13 15:40:03 -07:00
Christopher Tate
a9122b65a7 Merge "Compress the backup output stream" 2011-07-13 15:37:21 -07:00
Christopher Tate
a100c02b8d Compress the backup output stream 
Zlib compression, with a full flush between each application's
data.  Encryption will be performed on the already-compressed data
once that's implemented.

On restore, the streamed data is similarly uncompressed on the fly.

Change-Id: I19b65c88e759a66527d10913d18fffa9df0bc011
 2011-07-13 15:30:41 -07:00