ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
35,687 Commits 2 Branches 0 Tags 54 MiB
07ed1a94bc
Commit Graph

35687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Block
c4b23c6c1d Merge "Fix thread violation in WebView.getViewHeight()" 2011-06-13 17:17:11 -07:00
Gilles Debunne
569b68441c Merge "Switch is not affected by touch when disabled" 2011-06-13 17:09:12 -07:00
Chia-chi Yeh
864bf3be69 Merge "VPN: tolerate duplicated routes." 2011-06-13 16:17:03 -07:00
Chia-chi Yeh
f733f326e8 Merge "VPN: fix a bad optimization of zeroing ifr_flags lately." 2011-06-13 16:11:58 -07:00
Mathias Agopian
e122079be6 Temporarily don't return the current buffer in synchronous mode 
activate synchronous mode by default.
 2011-06-13 15:51:35 -07:00
Mathias Agopian
a67932fe68 unify SurfaceTexture and Surface 
Add the concept of synchronous dequeueBuffer in SurfaceTexture
Implement {Surface|SurfaceTextureClient}::setSwapInterval()
Add SurfaceTexture logging
fix onFrameAvailable
 2011-06-13 15:51:35 -07:00
Derek Sollenberger
e692f69ad3 am f11c52d2: Updates resulting from the Skia merge (revision 1327) 
* commit 'f11c52d246d9e43c8533dff82979e7eeb72c1d50':
  Updates resulting from the Skia merge (revision 1327)
 2011-06-13 15:42:47 -07:00
Mathias Agopian
c65f218ed5 am c031afc8: (-s ours) am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit 'c031afc8e9ad6c940c7d67a15b9c53092987377e':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-13 15:42:26 -07:00
Jean-Baptiste Queru
d72a51df2b am c793f521: Merge/Ignore 653fd9cf 
* commit 'c793f521e5ace1dca39d65de3ed60d7c8242f661':
  Moving flag to a member field instead of a stack variable.
 2011-06-13 15:42:10 -07:00
Dan Morrill
1575b4353d am 74e646ca: (-s ours) Fix merge conflict for \'c2e1e329\'. 
* commit '74e646cab9a28aa3716a05fc474853c2c557f942':
  Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it.
 2011-06-13 15:41:56 -07:00
Chia-chi Yeh
20173b499c Merge "VPN: set IFF_NO_PI on TUN interface." 2011-06-13 15:38:20 -07:00
Chia-chi Yeh
49936c590a Merge "VPN: add MTU support." 2011-06-13 15:08:43 -07:00
Jamie Gennis
a6f35dd36e SurfaceTexture: add a format querying test. 
This change adds a test to verify that querying the format of a
SurfaceTextureClient immediately after setting it returns the correct
result.  The test is currently disabled because it does not pass.

Change-Id: I5bddb39c5bf96d6104624094383d410ed913e9f3
 2011-06-13 15:01:05 -07:00
Jamie Gennis
9fbf761e44 Merge changes Ic9186db2,Id5a7cdff 
* changes:
  SurfaceTexture: disable a deadlocking test.
  SurfaceTexture: add a pixel tolerance to the tests.
 2011-06-13 14:48:11 -07:00
Chia-chi Yeh
10799eead5 Merge "VPN: use ParcelFileDescriptor.adoptFd() instead of doing it in JNI." 2011-06-13 14:35:12 -07:00
Svetoslav Ganov
af927f8700 Merge "Final polish of the interrogation feature." 2011-06-13 14:30:30 -07:00
Mathias Agopian
7794b30589 am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit '77079399fca3e9c71e2ac06f3da26934e1c278b9':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-13 14:15:00 -07:00
Mathias Agopian
4c83aefe59 am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit 'a9c9a4baf24700e8817d47d8ea8da1742caea0b5':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-13 14:13:21 -07:00
RoboErik
6ac2ba7aae Merge "Remove @hide on SyncColumns, make them protected" 2011-06-13 13:59:38 -07:00
Mathias Agopian
867740df05 fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
 2011-06-13 13:44:28 -07:00
Jamie Gennis
2510d9576f SurfaceTexture: disable a deadlocking test. 
This change disables the UpdateTexImageAfterFrameFinishedWorks test
because it's currently causing deadlocks on some devices.

Change-Id: Ic9186db207e8d656f3af5d86fa138c7d96393c55
 2011-06-13 13:43:51 -07:00
Jamie Gennis
824efa74e7 SurfaceTexture: add a pixel tolerance to the tests. 
This change adds a default tolerance of 2 to all the pixel value checks
in the SurfaceTexture tests.

Change-Id: Id5a7cdffdfae16076e2daf4964a3326105b5ae2c
 2011-06-13 13:41:01 -07:00
RoboErik
ecbb9dbce4 Merge "Make interfaces protected so they get included in api" 2011-06-13 13:32:17 -07:00
Jamie Gennis
ac642349ba Merge "libutils: add a binary blob cache implementation." 2011-06-13 12:32:46 -07:00
Jean-Baptiste Queru
574462f9d8 Merge/Ignore 653fd9cf 
Change-Id: Ia17ee5cace2d97d87de821a82d4412f6e60aac65
 2011-06-13 12:25:38 -07:00
Martijn Coenen
4bcd592df7 Merge "Support for setting the NfcA transceive timeout (API)." 2011-06-13 12:19:01 -07:00
Dan Morrill
308a3f179e Fix merge conflict for 'c2e1e329'. 
Conflicts:
	core/res/res/values/config.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

Change-Id: I5898fe2cbfb3a4bdcb28c27adb51d2aa93138f99
 2011-06-13 11:59:38 -07:00
Fabrice Di Meglio
e568a00d65 Merge "Update Configuration for renaming and fixes" 2011-06-13 11:43:12 -07:00
Jamie Gennis
72f6af8630 Merge changes I56779420,I044e44e1,Ic5adfa29,Ied541ab8 
* changes:
  SurfaceTexture: add some GL->GL tests.
  SurfaceTexture: fix up a comment.
  SurfaceTexture: add getTransformMatrix tests.
  SurfaceTexture: fix a getTransformMatrix crash.
 2011-06-13 11:14:57 -07:00
Philip Milne
1033f1dc02 Merge "Bugfix for GridLayout assuming that the x value of last column index is maximal. This is not the case when column indexes are defined incorrectly and GridLayout should still work in this case." 2011-06-13 11:13:09 -07:00
John Reck
51b0bb40ad Merge "Tweaks for webview snap" 2011-06-13 11:12:03 -07:00
Irfan Sheriff
75a41685a0 Merge "Fix driver start/stop handling" 2011-06-13 11:10:57 -07:00
Teng-Hui Zhu
eb237381a9 Merge "Fix a NPE if the Chrome Client is not setup" 2011-06-13 11:07:38 -07:00
Jamie Gennis
5451d15ee2 SurfaceTexture: add some GL->GL tests. 
This change adds some tests to verify streaming images from one GL
thread to another via SurfaceTexture.  Currently the tests do not
validate the correctness of the streamed images, but rather simply
verify that this streaming does not cause a deadlock.  3 of the 4 tests
are currently disabled because they do cause deadlocks on some devices.

Change-Id: I5677942053190063b97f370dba96c116711bc3bb
 2011-06-13 10:50:13 -07:00
Jamie Gennis
ae468f4341 SurfaceTexture: fix up a comment. 
Change-Id: I044e44e17319e08af657a7ec9fa39100876fe862
 2011-06-13 10:50:13 -07:00
Jamie Gennis
5222604809 SurfaceTexture: add getTransformMatrix tests. 
This change adds a test verifying that with no transform set on the
SurfaceTextureClient, the SurfaceTexture will return an identity
transform matrix.  It also verifies this same effect in the presence of
an additional call to native_window_set_buffer_count just before the
call to getTransformMatrix.

Bug: 4490420
Change-Id: Ic5adfa29b5696cc2b451433834e3758ef20c5edd
 2011-06-13 10:50:13 -07:00
Jamie Gennis
736aa9573b SurfaceTexture: fix a getTransformMatrix crash. 
This change moves the computation of the transform matrix out of
getTransformMatrix and instead performs the computation when
updateTexImage gets called.  This is needed in order for
getTransformMatrix to succeed even if the buffers have been freed (e.g.
by changing the buffer count) because the computation depends upon the
properties of the current GraphicBuffer.

Change-Id: Ied541ab8747b7ad604f862717135f9a16a816be9
Bug: 4490420
 2011-06-13 10:50:12 -07:00
Ben Komalo
89fcdba6bc Merge "Open up setKeyManager/setTrustManager." 2011-06-13 10:32:26 -07:00
Glenn Kasten
c4a0feaaf4 Merge "Remove redundant memory barrier" 2011-06-13 10:30:29 -07:00
Daniel Sandler
a23a53296f Merge "Use the new animated notification layout on tablets." 2011-06-13 07:30:48 -07:00
Daniel Sandler
b8be6d9491 Merge "Rebuilt notification list using a new custom layout." 2011-06-13 07:29:39 -07:00
repo sync
052d012ccc Merge "Fix the issue of onNetwork in UI thread." 2011-06-13 03:09:27 -07:00
Debashish Chatterjee
14ce0f90c5 Merge "Made VoicemailContract classes non-instantiable." 2011-06-13 02:10:32 -07:00
Jeff Sharkey
3a62a45f8e Merge "Fix test-related build breakage." 2011-06-13 00:15:15 -07:00
Jeff Sharkey
cd5c0cc63a Merge "External mutation of full NetworkPolicy set." 2011-06-12 23:24:50 -07:00
Jeff Brown
d45ae3c679 Merge "Ensure the RemoteViewsAdapter cleans up its HandlerThread." 2011-06-12 15:25:14 -07:00
Dan Morrill
48014c7082 am 8688d470: Moving flag to a member field instead of a stack variable. 
* commit '8688d4708117db446d6ba2855f1d8ad715bb4d72':
  Moving flag to a member field instead of a stack variable.
 2011-06-11 09:52:50 -07:00
Jeff Sharkey
88181e1c3d Merge "Move data cycle methods to framework object." 2011-06-10 19:47:31 -07:00
Jeff Sharkey
ec4bdaed57 Merge "Interface-level network policy, persist policies." 2011-06-10 19:41:33 -07:00
Dianne Hackborn
f497b67940 Merge "resolved conflicts for merge of ed1a9c77 to master" 2011-06-10 19:24:49 -07:00