Commit Graph

35687 Commits

Author SHA1 Message Date
Wink Saville
1f27373432 Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 2011-06-14 14:44:31 -07:00
Wink Saville
d404170880 Merge "Make APN re-connect delay configuable" into honeycomb-LTE 2011-06-14 14:44:23 -07:00
Wink Saville
cf26b3e7f9 Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE 2011-06-14 14:44:12 -07:00
Jamie Gennis
389ece6803 Merge changes I47f147f8,Id09915c9,Iabc6d27c
* changes:
  SurfaceTexture: increase the test's Surface layer.
  SurfaceTexture: add some RGBA_8888 tests.
  SurfaceTextureClient: minor test refactoring.
2011-06-14 14:15:11 -07:00
Adam Powell
83fa7dc68d Merge "Fix bug 4551701 - com.android.browser: java.lang.IllegalStateException" 2011-06-14 13:47:45 -07:00
Jamie Gennis
5dd0c4fd7e SurfaceTexture: increase the test's Surface layer.
This change increases the Surface layer used for displaying the test
results so that the tests will be visible over other windows in the
system.

Change-Id: I47f147f8743ff2a39d57d551811668371202bd31
2011-06-14 13:45:53 -07:00
Jamie Gennis
1876d13e45 SurfaceTexture: add some RGBA_8888 tests.
Change-Id: Id09915c98a00eca1209b7dab32039a06d260908e
2011-06-14 13:45:53 -07:00
Jamie Gennis
8b69defa2f SurfaceTextureClient: minor test refactoring.
Change-Id: Iabc6d27ca35d30d896c6aef65c4f1b5a1eed47b8
2011-06-14 13:45:52 -07:00
Doug Zongker
d8a30d31c8 Merge "deprecate RADIO constant, add getRadioVersion method" 2011-06-14 13:39:36 -07:00
Jamie Gennis
135abde4c2 Merge "SurfaceTexture: add a format querying test." 2011-06-14 13:39:05 -07:00
Mathias Agopian
fbb8272db3 am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit 'a9007fbdae6671f66535da4b9dad04b19aaf9186':
  DO NOT MERGE. may fix build on some version of gcc
2011-06-14 13:30:34 -07:00
Mathias Agopian
901d53f4d3 am 69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '69b4587bfbb3e98f793959d9123340360fa233a2':
  DO NOT MERGE. may fix build on some version of gcc
2011-06-14 13:26:38 -07:00
RoboErik
84fa4e0f95 Merge "Rename Calendar.java to CalendarContract.java" 2011-06-14 13:24:40 -07:00
Alex Sakhartchouk
13a6923566 Merge "Allocation copy functions." 2011-06-14 13:14:57 -07:00
Dianne Hackborn
ca4891903f resolved conflicts for merge of 77fc8b80 to master
Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d
2011-06-14 12:17:35 -07:00
Mathias Agopian
7b1ef58d56 DO NOT MERGE. may fix build on some version of gcc
Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
2011-06-14 12:05:42 -07:00
Mathias Agopian
f852a4522f Merge "may fix build on some version of gcc" 2011-06-14 11:51:24 -07:00
Mathias Agopian
7a87ec7115 may fix build on some version of gcc
Change-Id: Ia88787c0432ec84d51fe505fd6a2b6f98ebe8f33
2011-06-14 11:50:22 -07:00
Dianne Hackborn
c2c025415f am 74c48f2b: am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '74c48f2b2b7084e1bfddb2dddf7587b0cf821ea6':
  Update resources documentation with new qualifiers.
2011-06-14 11:42:09 -07:00
Dianne Hackborn
c1bea69030 am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit '6c0533f994e7991b3bd60cab48362e8e2e6d86f0':
  Add new landscape and portrait orientation features.
2011-06-14 11:40:06 -07:00
Dianne Hackborn
8d37f0002a am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '700a1f25719138b94c453beb6325e627a11a9883':
  Update resources documentation with new qualifiers.
2011-06-14 11:38:01 -07:00
Dianne Hackborn
fa1afdb42f am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit 'c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
  Add new landscape and portrait orientation features.
2011-06-14 11:36:05 -07:00
Daisuke Miyakawa
06e114816b Merge "Fix commment" 2011-06-14 11:30:47 -07:00
Dianne Hackborn
8cb535b11d Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 2011-06-14 11:27:09 -07:00
Dianne Hackborn
bfb01f297c Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 2011-06-14 11:24:29 -07:00
tedbo
98bd5fcc9a Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink." 2011-06-14 11:18:30 -07:00
Chia-chi Yeh
efa75af058 Merge "VPN: do not allow zero prefix length in routing rules." 2011-06-14 10:58:20 -07:00
Chia-chi Yeh
a2b97a9d38 Merge "VPN: do not use gateway in routing rules." 2011-06-14 10:58:10 -07:00
Glenn Kasten
f0c412513f Bug 4608375
Update priority and policy together for audio threads

Change-Id: Ib3b07b32586c222c4aacbf23414ae8b05db502be
2011-06-14 10:41:50 -07:00
RoboErik
5bc1aa5643 Merge "Update Calendar main comment" 2011-06-14 10:27:12 -07:00
John Wang
9c723adf2b am aabe5f46: am 49572479: Update sim missing message in lock screen.
* commit 'aabe5f46846a45163be874dca2d19910ce38c232':
  Update sim missing message in lock screen.
2011-06-14 10:17:51 -07:00
Gloria Wang
33219723e3 Merge "Duplicated fileDesc is not closed when input file is not forward-lock content. Fix for bug 4606053." 2011-06-14 10:05:55 -07:00
John Wang
a44cec8b7c am 49572479: Update sim missing message in lock screen.
* commit '49572479a9cb479f2b323f011c1a9f8142ec1a46':
  Update sim missing message in lock screen.
2011-06-14 10:05:40 -07:00
Mike J. Chen
db804f34fd Merge "Handle always present wired ethernet interfaces at boot." 2011-06-14 09:53:23 -07:00
Narayan Kamath
ed2ab6c61b Merge "A few TTS bug fixes" 2011-06-14 07:05:42 -07:00
Mathias Agopian
2584e49d56 Merge "cleanup Kalman filter parameters, add/fix comments/units" 2011-06-13 21:14:17 -07:00
Jeff Brown
a34ad61854 Merge "Allow touches to slide out of the navigation bar." 2011-06-13 20:30:09 -07:00
Mike Lockwood
2b4ae0f4b5 Merge "Settings: Remove unused USE_PTP_INTERFACE setting" 2011-06-13 19:50:37 -07:00
Dima Zavin
cd27ed7b79 Merge "audio: update for audio/audio_policy header names/locations" 2011-06-13 19:43:59 -07:00
Mike Lockwood
678d87c2d8 Merge "Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager" 2011-06-13 19:22:29 -07:00
Romain Guy
4c913a80c7 Merge "Batch glCopyTexImage() calls to get about 15 fps back on SGX." 2011-06-13 19:07:22 -07:00
James Dong
3790b9552e Merge "Add an option to force to use HW codec in stagefright cmd tool" 2011-06-13 18:47:20 -07:00
James Dong
5c54407319 Merge "Add B frame support for MPEG4Writer" 2011-06-13 18:47:03 -07:00
Adam Powell
67446ccaec Merge "Expose api on View to determine if the view can be scrolled." 2011-06-13 18:45:40 -07:00
Mathias Agopian
a08b0de436 Merge "fix RefBase so it retains binary-compatibility with gingerbread" 2011-06-13 18:44:20 -07:00
Jeff Brown
04c02ceb87 Merge "Mimic Zygote preload steps when using wrappers." 2011-06-13 18:41:20 -07:00
Jeff Brown
46d723ed58 Merge "Take advantage of updated linux/input.h kernel headers." 2011-06-13 18:40:50 -07:00
Mathias Agopian
ddc31c3e2b fix RefBase so it retains binary-compatibility with gingerbread
Bug: 4595257
Change-Id: I0d5e10f497e3f39868bff58f6ded510c38b44b12
2011-06-13 18:39:45 -07:00
David Brown
5eabb2c13c Merge "Add "geoDescription" to CallerInfo" 2011-06-13 18:11:16 -07:00
Mathias Agopian
80728d87c9 Merge changes I9b8e1962,I7bb843ca
* changes:
  Temporarily don't return the current buffer in synchronous mode
  unify SurfaceTexture and Surface
2011-06-13 17:20:53 -07:00