OSDN Git Service
Dianne Hackborn [Tue, 19 Jul 2011 21:07:54 +0000 (14:07 -0700)]
Merge "Fix issue #
4869092: ResolverActivity occasionally fails to display"
Mathias Agopian [Tue, 19 Jul 2011 21:05:45 +0000 (14:05 -0700)]
Merge changes I4d50e985,Iaa2baa66
* changes:
use SurfaceTexture new scaling mode in SF
Add set_scaling_mode() to ANativeWindow.
Fabrice Di Meglio [Tue, 19 Jul 2011 21:04:28 +0000 (14:04 -0700)]
Merge "Code cleaning"
Gilles Debunne [Tue, 19 Jul 2011 20:42:54 +0000 (13:42 -0700)]
Merge "Layout changes in Settings"
Colin Cross [Tue, 19 Jul 2011 20:26:30 +0000 (13:26 -0700)]
Merge "Allow BoardConfig.mk to define an extension to dumpstate"
Russell Brenner [Tue, 19 Jul 2011 20:08:14 +0000 (13:08 -0700)]
Merge "Include DroidSansEthiopic-Regular as fallback font"
Mathias Agopian [Mon, 18 Jul 2011 23:15:08 +0000 (16:15 -0700)]
use SurfaceTexture new scaling mode in SF
SF now obeys SurfaceTexture's scaling mode instead
of inferring it from the buffer's size
Change-Id: I4d50e9851abedd7e64bfcfc8af9eefb9fb668529
Mathias Agopian [Wed, 13 Jul 2011 22:24:42 +0000 (15:24 -0700)]
Add set_scaling_mode() to ANativeWindow.
This allows to specify the scaling mode independently from
the buffer size.
Change-Id: Iaa2baa660445531a97d3fac192e580f4929c5d3b
Doug Zongker [Tue, 19 Jul 2011 20:00:30 +0000 (13:00 -0700)]
Merge "add rebootWipeCache call to RecoverySystem API"
Chris Craik [Tue, 19 Jul 2011 19:47:35 +0000 (12:47 -0700)]
Merge "Added TileBenchmark"
Wink Saville [Tue, 19 Jul 2011 19:42:01 +0000 (12:42 -0700)]
am
57aebc61: am
f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
* commit '
57aebc6109f2059ba335a02bf95928a494cff4ba':
Fix FeatureUser leak in ConnectivityService
Kazuhiro Ondo [Tue, 19 Jul 2011 19:41:58 +0000 (12:41 -0700)]
am
5abddc73: am
bf361b59: Return IMEI SV if CDMA-LTE mode is used
* commit '
5abddc73a57da304029b6034b13f69079dcbd83a':
Return IMEI SV if CDMA-LTE mode is used
Wink Saville [Tue, 19 Jul 2011 19:39:42 +0000 (12:39 -0700)]
am
f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
* commit '
f679d4cb92b6d1c193a154abb5ae8fb3a786fc43':
Fix FeatureUser leak in ConnectivityService
Kazuhiro Ondo [Tue, 19 Jul 2011 19:39:39 +0000 (12:39 -0700)]
am
bf361b59: Return IMEI SV if CDMA-LTE mode is used
* commit '
bf361b59e4e6c1c7c710e73260a77e9937f1fb59':
Return IMEI SV if CDMA-LTE mode is used
Wink Saville [Tue, 19 Jul 2011 19:37:18 +0000 (12:37 -0700)]
Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
Chet Haase [Tue, 19 Jul 2011 18:40:34 +0000 (11:40 -0700)]
Merge "Don't constrain invalidation rect when not clipping children"
Wu-cheng Li [Tue, 19 Jul 2011 18:16:20 +0000 (11:16 -0700)]
Merge "Add camera new picture and new video broadcast intents."
Shimeng (Simon) Wang [Tue, 19 Jul 2011 18:15:49 +0000 (11:15 -0700)]
Merge "Change log msg since viewport can be changed before first layout."
James Dong [Tue, 19 Jul 2011 18:00:50 +0000 (11:00 -0700)]
Merge "Remove PV AVC decoder"
Philip Milne [Tue, 19 Jul 2011 17:36:46 +0000 (10:36 -0700)]
Merge "Fix build breakage."
Shimeng (Simon) Wang [Tue, 19 Jul 2011 17:31:52 +0000 (10:31 -0700)]
Merge "Add in i18n TLDs and new TLDs to the URL RegEx matcher."
Xavier Ducrohet [Tue, 19 Jul 2011 17:23:19 +0000 (10:23 -0700)]
am
9139868b: am
ba6c98db: am
82943ecf: am
d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '
9139868b6c5cb29b3665984225dceb0193fec31d':
Add dependency generation to Aapt for R.java
Xavier Ducrohet [Tue, 19 Jul 2011 17:23:16 +0000 (10:23 -0700)]
am
bf31250b: am
d5431ed5: am
2e659ae5: am
42755155: Merge "Copy once-created R.java into library projects"
* commit '
bf31250ba0858a2e72a3906a1f0216846683bc2e':
Copy once-created R.java into library projects
Xavier Ducrohet [Tue, 19 Jul 2011 17:18:28 +0000 (10:18 -0700)]
am
ba6c98db: am
82943ecf: am
d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '
ba6c98db8f21016f81ecac35bb0ea3c433044bb7':
Add dependency generation to Aapt for R.java
Xavier Ducrohet [Tue, 19 Jul 2011 17:18:25 +0000 (10:18 -0700)]
am
d5431ed5: am
2e659ae5: am
42755155: Merge "Copy once-created R.java into library projects"
* commit '
d5431ed5505a42e5e33c8bf7cc2ff72792979be9':
Copy once-created R.java into library projects
Fabrice Di Meglio [Tue, 19 Jul 2011 17:16:04 +0000 (10:16 -0700)]
Merge "Test Gallery layout direction."
Xavier Ducrohet [Tue, 19 Jul 2011 17:15:11 +0000 (10:15 -0700)]
am
82943ecf: am
d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '
82943ecfe2c4266cf3db50326240825fefcaa38f':
Add dependency generation to Aapt for R.java
Xavier Ducrohet [Tue, 19 Jul 2011 17:15:09 +0000 (10:15 -0700)]
am
2e659ae5: am
42755155: Merge "Copy once-created R.java into library projects"
* commit '
2e659ae59c17a0c0584d35b8c400a294c9d49e12':
Copy once-created R.java into library projects
Xavier Ducrohet [Tue, 19 Jul 2011 17:10:17 +0000 (10:10 -0700)]
am
d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '
d40c93f61ca5b3f2351b8db716f67b58f1625e85':
Add dependency generation to Aapt for R.java
Xavier Ducrohet [Tue, 19 Jul 2011 17:10:15 +0000 (10:10 -0700)]
am
42755155: Merge "Copy once-created R.java into library projects"
* commit '
42755155d6e8ddc3201b08def2bf262a64fa25f2':
Copy once-created R.java into library projects
Philip Milne [Tue, 19 Jul 2011 17:03:43 +0000 (10:03 -0700)]
Merge "Gather View's hierarchy notifications into methods that can easily be overidden."
Xavier Ducrohet [Tue, 19 Jul 2011 17:03:16 +0000 (10:03 -0700)]
Merge "Add dependency generation to Aapt for R.java"
Xavier Ducrohet [Tue, 19 Jul 2011 17:03:05 +0000 (10:03 -0700)]
Merge "Copy once-created R.java into library projects"
Narayan Kamath [Tue, 19 Jul 2011 17:01:05 +0000 (10:01 -0700)]
Merge "Fix a threading issue in AudioPlaybackHandler"
Narayan Kamath [Tue, 19 Jul 2011 17:00:58 +0000 (10:00 -0700)]
Merge "Return the play stayed locked."
Chet Haase [Tue, 19 Jul 2011 14:21:03 +0000 (07:21 -0700)]
Merge "Don't recreate view's display list when size hasn't changed"
satok [Tue, 19 Jul 2011 03:43:24 +0000 (20:43 -0700)]
Merge "Hide "Configure input method" button when the screen is locked."
satok [Tue, 19 Jul 2011 03:42:54 +0000 (20:42 -0700)]
Merge "Enable IMEs to set additional subtypes in background"
Jeff Brown [Tue, 19 Jul 2011 03:08:48 +0000 (20:08 -0700)]
Merge "Fix drag and drop regression. Bug:
5032496"
Jeff Brown [Tue, 19 Jul 2011 02:47:10 +0000 (19:47 -0700)]
Merge "Remove an unnecessary finalizer."
Bart Sears [Tue, 19 Jul 2011 02:45:33 +0000 (19:45 -0700)]
Merge "Revert "Add in i18n TLDs and new TLDs to the URL RegEx matcher.""
Adam Powell [Tue, 19 Jul 2011 02:40:17 +0000 (19:40 -0700)]
Merge "Fix bug
5031652 - offer a way to associate metadata with an ActionMode"
Todor Kalaydjiev [Tue, 19 Jul 2011 01:45:36 +0000 (18:45 -0700)]
Merge "Manually bring change Ie8fb8162 to master ("Add images to ERI icon list"). Fixes b/
4604593."
Wink Saville [Tue, 19 Jul 2011 01:42:41 +0000 (18:42 -0700)]
am
6e8c7dd2: am
cd4636ec: Add LteOnCdmaDevice system property.
* commit '
6e8c7dd2128b2a46f5d56ed46d4d530af6ad38f5':
Add LteOnCdmaDevice system property.
Wink Saville [Tue, 19 Jul 2011 01:39:41 +0000 (18:39 -0700)]
am
cd4636ec: Add LteOnCdmaDevice system property.
* commit '
cd4636ec08a50ab890acab0cf0c3c3f07f91896a':
Add LteOnCdmaDevice system property.
Shimeng (Simon) Wang [Tue, 19 Jul 2011 01:04:51 +0000 (18:04 -0700)]
Merge "Add in i18n TLDs and new TLDs to the URL RegEx matcher."
Romain Guy [Tue, 19 Jul 2011 00:51:59 +0000 (17:51 -0700)]
Merge "Update TextureView.lockCanvas() test."
Fabrice Di Meglio [Tue, 19 Jul 2011 00:43:11 +0000 (17:43 -0700)]
Merge "Add unit tests for bug #
5037425 Canvas.drawText can't handle Right-to-Left text and text composing"
Doug Kwan [Tue, 19 Jul 2011 00:02:55 +0000 (17:02 -0700)]
Merge "Add C code to use BDADDR_ANY macro properly. The macro expands into code that is not valid C++. So we need to use a C helper."
Conley Owens [Mon, 18 Jul 2011 23:57:04 +0000 (16:57 -0700)]
am
e5143d6c: am
a4aef41a: am
a74774fd: am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
e5143d6c09f0e9a960661a2b0a5916c33fcafc4d':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:55:33 +0000 (16:55 -0700)]
am
a4aef41a: am
a74774fd: am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
a4aef41a74a69b0296b88361ffb33d0470a26362':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:53:41 +0000 (16:53 -0700)]
am
a74774fd: am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
a74774fd9146aa22801487d3652dc18e9e328b8e':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:52:26 +0000 (16:52 -0700)]
am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:49:43 +0000 (16:49 -0700)]
Merge "stagefright aacenc: Mark codeWord as UWord16"
Adam Powell [Mon, 18 Jul 2011 23:29:53 +0000 (16:29 -0700)]
Merge "Make the theme attribute actionModeStyle public."
Romain Guy [Mon, 18 Jul 2011 23:06:31 +0000 (16:06 -0700)]
Merge "Trim OpenGLRenderer's memory usage whenever possible"
Dianne Hackborn [Mon, 18 Jul 2011 23:03:08 +0000 (16:03 -0700)]
Merge "Fix issue #
5017868: Twitter crashes on start:"
Mike Lockwood [Mon, 18 Jul 2011 22:59:35 +0000 (15:59 -0700)]
Merge "UsbManager: document that passing null setCurrentFunction restores default function"
Deckard Autoverifier [Mon, 18 Jul 2011 22:46:26 +0000 (15:46 -0700)]
am
3ab6ccda: am
2acddc54: am
89bac182: am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
3ab6ccda447c605c35c8854a2ec8c49c2a0653a6':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:46:21 +0000 (15:46 -0700)]
am
b32af642: am
31140598: am
16db83c2: am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
b32af642454f3113cb1539821eb3b0dbf4174974':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:46:18 +0000 (15:46 -0700)]
am
d4dee1a5: am
29fd8cdb: am
80ef1745: am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
d4dee1a57fdcd1bd1e7c621163e89039cf88d9f9':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:46:14 +0000 (15:46 -0700)]
am
b7f0d825: am
691257b1: am
68e37dac: am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
b7f0d825c56dced10bb7df7cfc624ef9ebffe21c':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:44:03 +0000 (15:44 -0700)]
am
2acddc54: am
89bac182: am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:44:01 +0000 (15:44 -0700)]
am
31140598: am
16db83c2: am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
31140598866c668047fc6dede7944e146aa21a0a':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:43:58 +0000 (15:43 -0700)]
am
29fd8cdb: am
80ef1745: am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:43:54 +0000 (15:43 -0700)]
am
691257b1: am
68e37dac: am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
691257b1812ffd8172b01c17b9ba23a48eb76594':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:31 +0000 (15:41 -0700)]
am
89bac182: am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
89bac1820f3788d655ae293ec9a65c18226e09ee':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:29 +0000 (15:41 -0700)]
am
16db83c2: am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
16db83c26442f5e25b6aad77a37b612fa0be9862':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:26 +0000 (15:41 -0700)]
am
80ef1745: am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
80ef1745d00c235b117e389e56e58210cf88e5c8':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:24 +0000 (15:41 -0700)]
am
68e37dac: am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
68e37dacc065eebb971d443722b7a8413ff403d6':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:30 +0000 (15:38 -0700)]
am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
88409911aebed6c3663e51d51fca67f527c0c2fb':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:27 +0000 (15:38 -0700)]
am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
eb07c531498f4dc881ad2b4d1a32cacab25950ff':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:25 +0000 (15:38 -0700)]
am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:22 +0000 (15:38 -0700)]
am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
55f115a3214343c826acf27fcbc4bf2927049083':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:41 +0000 (15:23 -0700)]
Merge "stagefright: Include stdlib.h for malloc/free"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:31 +0000 (15:23 -0700)]
Merge "stagefright amrwbenc: Remove a duplicate, unused file"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:20 +0000 (15:23 -0700)]
Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:09 +0000 (15:23 -0700)]
Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
Jamie Gennis [Mon, 18 Jul 2011 22:19:20 +0000 (15:19 -0700)]
Merge "CameraService: (dis)connect from preview windows"
Jamie Gennis [Mon, 18 Jul 2011 22:18:43 +0000 (15:18 -0700)]
Merge "MediaPlayer: add ANativeWindow (dis)connect calls"
Philip Milne [Mon, 18 Jul 2011 22:17:06 +0000 (15:17 -0700)]
Merge "Derive GridLayout's 'gap' constants from new "default_gap" entry in dimens.xml."
Jamie Gennis [Mon, 18 Jul 2011 22:00:54 +0000 (15:00 -0700)]
Merge "SurfaceTexture: add a multi-SurfaceTexture test"
Mathias Agopian [Mon, 18 Jul 2011 21:55:58 +0000 (14:55 -0700)]
Merge "move lock/unlock implementaion outside of Surface into SurfaceTextureClient"
Chet Haase [Mon, 18 Jul 2011 21:40:54 +0000 (14:40 -0700)]
Merge "Fix leftover artifacts from sliding Recents items out"
Jesse Wilson [Mon, 18 Jul 2011 21:39:39 +0000 (14:39 -0700)]
Merge "Track line and column when parsing JSON."
Jesse Wilson [Mon, 18 Jul 2011 21:27:31 +0000 (14:27 -0700)]
Merge "Always escape chars that JavaScript treats as newlines."
Fabrice Di Meglio [Mon, 18 Jul 2011 21:26:45 +0000 (14:26 -0700)]
Merge "Fix resolution padding glitch"
Fabrice Di Meglio [Mon, 18 Jul 2011 21:26:34 +0000 (14:26 -0700)]
Merge "Clean test APIs for Harfbuzz support"
Jamie Gennis [Mon, 18 Jul 2011 20:36:19 +0000 (13:36 -0700)]
Merge "EGL: update EGL_ANDROID_recordable extension."
Chet Haase [Mon, 18 Jul 2011 20:07:34 +0000 (13:07 -0700)]
Merge "Fixed animation ordering bug in LayoutTransition."
Jim Miller [Mon, 18 Jul 2011 19:59:36 +0000 (12:59 -0700)]
Merge "Fix
5023708,
4689527: Add popups and overlays to recents. Misc bug fixes."
Svetoslav Ganov [Mon, 18 Jul 2011 19:57:02 +0000 (12:57 -0700)]
Merge "Touch exploration separate setting and API to poll the latter state."
Conley Owens [Mon, 18 Jul 2011 19:55:22 +0000 (12:55 -0700)]
am
f139965e: (-s ours) am
45ddd425: am
3edba93f: am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
f139965e4acc8eadb57f1d18d34ea3a89ab622d0':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:47:50 +0000 (12:47 -0700)]
am
45ddd425: am
3edba93f: am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
45ddd42544167494cee7213ecddcb6f8057c86c0':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:44:57 +0000 (12:44 -0700)]
am
3edba93f: am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
3edba93fd9bff8e2b22486271e6e816e3b233ae9':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:42:42 +0000 (12:42 -0700)]
am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:37:16 +0000 (12:37 -0700)]
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
Dianne Hackborn [Mon, 18 Jul 2011 18:30:16 +0000 (11:30 -0700)]
Merge "Work on death recipient leaks in Activity Manager and Content Service."
Jean-Michel Trivi [Mon, 18 Jul 2011 18:07:47 +0000 (11:07 -0700)]
Merge "Add option to query hardware decoders only"
Mike Lockwood [Mon, 18 Jul 2011 17:27:42 +0000 (10:27 -0700)]
Merge "NetInitiatedActivity: support AUTO response feature for SUPL IOT"
OSDN Git Service
