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

35525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
RoboErik
6ac2ba7aae Merge "Remove @hide on SyncColumns, make them protected" 2011-06-13 13:59:38 -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
Dianne Hackborn
24da0e5f3a resolved conflicts for merge of ed1a9c77 to master 
Change-Id: I0ecf8ca6deaee165eea3cc9012f8ae139f52ea0c
 2011-06-10 19:23:49 -07:00
Jeff Brown
c31d5be0c6 Merge "Optimize StrictMode activity instance count check." 2011-06-10 19:01:11 -07:00
Jeff Brown
3745a0d8a4 Merge "Always clear the Message when recycled." 2011-06-10 19:00:28 -07:00
Jeff Brown
e7be32b838 Merge "Optimize orientation changes." 2011-06-10 18:59:21 -07:00
Jeff Brown
b1963be02a Merge "Make orientation changes happen sooner." 2011-06-10 18:58:46 -07:00
Dianne Hackborn
ff66c00bc6 am fc441bff: am fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2 
* commit 'fc441bfff9eb68be08eb922ea05c78c5d6fba27a':
  Fix some problems with moving in and out of detached state.
 2011-06-10 18:42:12 -07:00
Dianne Hackborn
37cb1b9f25 am fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2 
* commit 'fd63814abe8e81d5e1e0eb75b5a5a18034e9b4c6':
  Fix some problems with moving in and out of detached state.
 2011-06-10 18:39:48 -07:00
Dianne Hackborn
fcd83591ff Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2 2011-06-10 18:37:22 -07:00
Fabrice Di Meglio
80a743c936 Merge "Refactor BiDiTest unit tests app" 2011-06-10 18:22:55 -07:00
Jim Miller
3d14211912 am db26be1f: am 5fe24ec7: am 8daefb9c: Fix layout issue on table when device thinks there\'s a SIM. 
* commit 'db26be1fa63e838b83e060a5e8a102321b9385fb':
  Fix layout issue on table when device thinks there's a SIM.
 2011-06-10 17:47:44 -07:00
Jim Miller
56eba87a32 am 5fe24ec7: am 8daefb9c: Fix layout issue on table when device thinks there\'s a SIM. 
* commit '5fe24ec77d183774dfb06262b80b32be608480c7':
  Fix layout issue on table when device thinks there's a SIM.
 2011-06-10 17:43:37 -07:00
Jim Miller
ad83ca0f9d am 8daefb9c: Fix layout issue on table when device thinks there\'s a SIM. 
* commit '8daefb9c63cce5e0a87ba38c40dd4f48be3809e1':
  Fix layout issue on table when device thinks there's a SIM.
 2011-06-10 17:41:20 -07:00