52659 Commits

Author SHA1 Message Date
Chia-chi Yeh
328958c1b0 Merge "VPN: fix a bad optimization of zeroing ifr_flags lately." 2011-06-13 16:11:58 -07:00
Chia-chi Yeh
6ddd57491a VPN: fix a bad optimization of zeroing ifr_flags lately.
Change-Id: Ib7d89422ef0a9159ba912cf32b678821cb72a25a
2011-06-13 16:08:01 -07:00
Derek Sollenberger
10e78c9df0 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
72171ad337 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
c9a7f1d0c5 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
fa56409156 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
0b6cca4d6f Merge "VPN: set IFF_NO_PI on TUN interface." 2011-06-13 15:38:20 -07:00
Chia-chi Yeh
6224b5ec38 VPN: set IFF_NO_PI on TUN interface.
Packet info header (struct tun_pi) was required to support IPv6
in kernel prior to 2.6.26. Setting IFF_NO_PI will remove the header
from the packets sent/recieved via TUN file descriptor, so now they
are just raw IP packets.

Change-Id: I0b4ae9db23d3bc10995a00eb053527b499ad6eb6
2011-06-13 15:26:51 -07:00
Chia-chi Yeh
26cfe80fe1 Merge "VPN: add MTU support." 2011-06-13 15:08:43 -07:00
Derek Sollenberger
f11c52d246 Updates resulting from the Skia merge (revision 1327)
Change-Id: I1d2cecbad6c30e6ebc9579093404742f17e14e84
2011-06-13 15:07:30 -07:00
Chia-chi Yeh
3663227a8b VPN: add MTU support.
Change-Id: Ia2f06ae1fcf065bde7dafd212b84b37a34f1a47e
2011-06-13 15:05:37 -07:00
Jamie Gennis
716a38adcb 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
49edc107b5 Merge "VPN: use ParcelFileDescriptor.adoptFd() instead of doing it in JNI." 2011-06-13 14:35:12 -07:00
Chia-chi Yeh
3667369807 VPN: use ParcelFileDescriptor.adoptFd() instead of doing it in JNI.
This removes the dependency of android_util_Binder.h.
This change also removes some redundant zeroing.

Change-Id: Ie9fedd471dfa198f9a3261e03651f945cefbbf61
2011-06-13 14:32:18 -07:00
Svetoslav Ganov
c282401b57 Merge "Final polish of the interrogation feature." 2011-06-13 14:30:30 -07:00
Mathias Agopian
c031afc8e9 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
77079399fc 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
2f911b7461 Merge "Remove @hide on SyncColumns, make them protected" 2011-06-13 13:59:38 -07:00
RoboErik
0025860b61 Remove @hide on SyncColumns, make them protected
Change-Id: I375f6ca9a0ebe03b256bdb089c943571d06c9e6d
2011-06-13 13:47:59 -07:00
Mathias Agopian
a9c9a4baf2 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
323badd7dd 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
43bdc23b13 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
0fe7b26aa2 Merge "Make interfaces protected so they get included in api" 2011-06-13 13:32:17 -07:00
RoboErik
b2c75603b3 Make interfaces protected so they get included in api
Private interfaces do not get included in the api for classes
that implement them. We need to make them at least protected
before they will show up in the apis.

Change-Id: Ie90d2b58c7f123e734f0a6af5ec6402be6984f82
2011-06-13 12:53:48 -07:00
Jamie Gennis
dfc7958a2e Merge "libutils: add a binary blob cache implementation." 2011-06-13 12:32:46 -07:00
Jean-Baptiste Queru
c793f521e5 Merge/Ignore 653fd9cf
Change-Id: Ia17ee5cace2d97d87de821a82d4412f6e60aac65
2011-06-13 12:25:38 -07:00
Martijn Coenen
fde45f5864 Merge "Support for setting the NfcA transceive timeout (API)." 2011-06-13 12:19:01 -07:00
Dan Morrill
74e646cab9 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
9d9f237270 Merge "Update Configuration for renaming and fixes" 2011-06-13 11:43:12 -07:00
Jamie Gennis
bd3e537980 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
28b6711c4c 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
7abf5a6215 Merge "Tweaks for webview snap" 2011-06-13 11:12:03 -07:00
Irfan Sheriff
ee32eed474 Merge "Fix driver start/stop handling" 2011-06-13 11:10:57 -07:00
Teng-Hui Zhu
3159886ede Merge "Fix a NPE if the Chrome Client is not setup" 2011-06-13 11:07:38 -07:00
Jamie Gennis
9deb930ebf 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
4e03d327d6 SurfaceTexture: fix up a comment.
Change-Id: I044e44e17319e08af657a7ec9fa39100876fe862
2011-06-13 10:50:13 -07:00
Jamie Gennis
15e0d9f5e0 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
eadfb673e7 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
Philip Milne
51f17d5461 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.
Change-Id: I5deb3fb43ed1dd16dd20868854b96ebae4d30623
2011-06-13 10:44:49 -07:00
John Reck
2664d85f58 Tweaks for webview snap
Changed weighted average
 Increase horizontal snap

Change-Id: I7ed50e13b0b0ba409a8e655d38c704f72a3f2f78
2011-06-13 10:38:55 -07:00
Ben Komalo
1775a0c866 Merge "Open up setKeyManager/setTrustManager." 2011-06-13 10:32:26 -07:00
Glenn Kasten
041120754a Merge "Remove redundant memory barrier" 2011-06-13 10:30:29 -07:00
Teng-Hui Zhu
592b2a65b0 Fix a NPE if the Chrome Client is not setup
This can happen when applications are using WebView to show HTML5 video in
full screen mode while not setting up WebChromeClient correctly.

Change-Id: I6575e3364f04f6eaf800f854d60992fe6c3be651
2011-06-13 10:10:51 -07:00
Ben Komalo
193bc6d606 Open up setKeyManager/setTrustManager.
The improved keystore will allow clients (Email not the least of them)
to establish SSL connections using custom client certificates. In order
to do this properly, the socket factories they use to establish these
connections need to be able to customize their behavior.

Change-Id: I6e0fa04dd01bd6481dfdad5a71a63e0371d0ad8c
2011-06-13 10:04:36 -07:00
Martijn Coenen
112fdf612d Support for setting the NfcA transceive timeout (API).
Change-Id: I2c40fbc7e9101462afae18125feba30cf76ea5f2
2011-06-13 18:22:57 +02:00
Daniel Sandler
622d544197 Merge "Use the new animated notification layout on tablets." 2011-06-13 07:30:48 -07:00
Daniel Sandler
e0b4fe59f7 Merge "Rebuilt notification list using a new custom layout." 2011-06-13 07:29:39 -07:00
Daniel Sandler
08d08f667e Use the new animated notification layout on tablets.
(See change Ib46b2d3e.)

Change-Id: I46635ed97596bf1ebe65cd29ef80f3b189102d8a
2011-06-13 10:28:28 -04:00
repo sync
5891f55a16 Merge "Fix the issue of onNetwork in UI thread." 2011-06-13 03:09:27 -07:00
repo sync
c133781723 Fix the issue of onNetwork in UI thread.
bug:458435

This will temporarily start a thread for answering calls, we are
going to add a handler thread to handle this soon.

Change-Id: I9079038d671e1b1631c6e663fc2c3de297d97428
2011-06-13 17:46:41 +08:00