OSDN Git Service
Kenny Root [Wed, 13 Jul 2011 16:49:43 +0000 (09:49 -0700)]
Fix debugging for hwui caches
Debugging code attempted to delete a stack item.
Also, the flag fields weren't exactly clear, so rewrite it so it's
clear that kDebugMoreCaches is a combined flag.
Change-Id: If42b7f0f754919343301da5656aee5943cc9bd4a
Jeff Brown [Tue, 12 Jul 2011 19:15:07 +0000 (12:15 -0700)]
Merge "Remove the simulator target from all makefiles. Bug:
5010576"
Romain Guy [Tue, 12 Jul 2011 19:14:11 +0000 (12:14 -0700)]
Merge "Add test for bug #
4970944"
Xavier Ducrohet [Tue, 12 Jul 2011 19:03:23 +0000 (12:03 -0700)]
Merge "LayoutLib: Delegate for Display and IWindowManager implementation."
Chet Haase [Tue, 12 Jul 2011 18:58:58 +0000 (11:58 -0700)]
Merge "Fix Animator cancel() behavior"
Chet Haase [Tue, 12 Jul 2011 00:01:56 +0000 (17:01 -0700)]
Fix Animator cancel() behavior
Previously, calling cancel() on an Animator would cause onAnimationCancel
events to be sent to all listeners. This was confusing for listeners
that were keying off this event for performing other actions, when the original
animator wasn't truly canceled (because it wasn't even running, or had already
been canceled earlier). This change hinges listener notification on
the animator actually running; no events are sent otherwise.
Also added the first set of Animator tests to verify that this behavior
is correct.
Change-Id: I81ab56559b5c0343c8dc7880e1c8235f3020975b
Xavier Ducrohet [Tue, 12 Jul 2011 18:50:07 +0000 (11:50 -0700)]
Merge "new button graphics for layoutlib."
Xavier Ducrohet [Tue, 12 Jul 2011 18:39:27 +0000 (11:39 -0700)]
LayoutLib: Delegate for Display and IWindowManager implementation.
This allows ViewConfiguration to be properly implemented which is now
required for the rendering to happen.
Change-Id: I55629689fa8f5f874b43fcac2aa0789ce02d58f4
Dave Santoro [Tue, 12 Jul 2011 18:39:09 +0000 (11:39 -0700)]
Merge "Add data_set column for raw contacts and groups."
Adam Powell [Tue, 12 Jul 2011 18:36:43 +0000 (11:36 -0700)]
Merge "Fix bugs around restoring submenu state after activity teardown/restore"
Adam Powell [Tue, 12 Jul 2011 04:19:59 +0000 (21:19 -0700)]
Fix bugs around restoring submenu state after activity teardown/restore
Change-Id: I6cb5b3cad39b141dff84b8e0ca62f8f0a76a03b1
Jeff Sharkey [Tue, 12 Jul 2011 18:09:09 +0000 (11:09 -0700)]
Merge "Return stats from inactive ifaces, packet counts."
Fabrice Di Meglio [Tue, 12 Jul 2011 16:39:18 +0000 (09:39 -0700)]
Merge "Fix scrolling bug causing centered cursor."
Ben Murdoch [Tue, 12 Jul 2011 15:51:23 +0000 (08:51 -0700)]
Merge changes I829b5d24,I521c0989
* changes:
Add missing auto-fill strings.
Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
Ben Murdoch [Mon, 11 Jul 2011 10:17:10 +0000 (11:17 +0100)]
Add missing auto-fill strings.
These strings had a defintion native side, but no corresponding
definition java side which would lead to a crash. Strings taken from
chrome/app/generated_resources.grd - see
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/app/generated_resources.grd?r1=75912&r2=76117&pathrev=88489
Also note that credit_card_number_preview_format is no longer needed.
See also change Ib861245e26197938bb2c5cf0f99c1d797ab0fbf2
Change-Id: I829b5d24e6f9a04211ee91c3f670c8659c004cd9
Ben Murdoch [Tue, 12 Jul 2011 13:20:12 +0000 (14:20 +0100)]
Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
See diff from last update here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_resources.grd?r1=75368&r2=82248
Change-Id: I521c098932dfcfcb728ed2d96afd22b7926e88e9
Mark Brophy [Tue, 12 Jul 2011 09:57:16 +0000 (02:57 -0700)]
Merge "Expose app resume times to the ApplicationProvider."
satok [Tue, 12 Jul 2011 05:12:59 +0000 (22:12 -0700)]
Merge "Change IME picker dialog from Activity to Broadcast"
Jeff Brown [Tue, 12 Jul 2011 05:12:16 +0000 (22:12 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
Mathias Agopian [Tue, 12 Jul 2011 01:30:41 +0000 (18:30 -0700)]
Merge "fix a weird use of Vector::appendVector()"
Mathias Agopian [Tue, 12 Jul 2011 01:30:29 +0000 (18:30 -0700)]
Merge "Fix typo in an assert's log"
Romain Guy [Tue, 12 Jul 2011 01:23:09 +0000 (18:23 -0700)]
Add test for bug #
4970944
Change-Id: I3e7287bc406ff497a49cf823cee53b1a943a74a9
Doug Felt [Mon, 11 Jul 2011 20:48:37 +0000 (13:48 -0700)]
Fix scrolling bug causing centered cursor.
Change-Id: I792a2c4d291e2ac5f0d1ed6e74f5e2ecb395c010
Dave Santoro [Fri, 24 Jun 2011 22:39:39 +0000 (15:39 -0700)]
Add data_set column for raw contacts and groups.
This provides a way for multiple sync adapters to exist for a single
account type. Internally, for example, we can use these new columns
to support separate sync adapters (and sourced data) for Focus,
Emerald Sea, and Latitude.
Change-Id: I1b8dfd79e9fb2dfcee6ac6d4adb947093f5c2324
Jamie Gennis [Tue, 12 Jul 2011 00:14:33 +0000 (17:14 -0700)]
Merge changes I002177a6,Ibaff52fe
* changes:
Add the EGL_ANDROID_recordable spec.
Add the spec for EGL_ANDROID_blob_cache.
Jamie Gennis [Sat, 9 Jul 2011 01:11:49 +0000 (18:11 -0700)]
Add the EGL_ANDROID_recordable spec.
Change-Id: I002177a68fafd6bb941aa64445c85fd5ff56223a
Robert Greenwalt [Mon, 11 Jul 2011 23:47:25 +0000 (16:47 -0700)]
Merge "Fix wifi tethering."
Guang Zhu [Mon, 11 Jul 2011 23:45:35 +0000 (16:45 -0700)]
Merge "allow Uri as intent extra in am command"
satok [Mon, 11 Jul 2011 23:28:52 +0000 (08:28 +0900)]
Change IME picker dialog from Activity to Broadcast
Change-Id: I4822899f34a2951d2f2a1258d1adcc7d8fccbb12
Mathias Agopian [Mon, 11 Jul 2011 23:26:36 +0000 (16:26 -0700)]
fix a weird use of Vector::appendVector()
operator= is way more efficient.
Change-Id: I61c9adb1413bed230801a77151b8f7000fd11471
Mathias Agopian [Mon, 11 Jul 2011 23:26:18 +0000 (16:26 -0700)]
Fix typo in an assert's log
Change-Id: I94883a23a0a92eaf3e4976f942f747a2137499ac
Jeff Brown [Mon, 11 Jul 2011 23:00:11 +0000 (16:00 -0700)]
Merge "Increase activity timeouts when using a wrapper process."
Jeff Brown [Sat, 9 Jul 2011 03:02:19 +0000 (20:02 -0700)]
Increase activity timeouts when using a wrapper process.
This patch enables the Zygote to tell the ActivityManager when
it has started a process with a wrapper attached so that the
ActivityManager can allow it extra time to start up or process
events.
This is useful when wrapping an app with Valgrind or other tools
which add significant runtime overhead.
Bug:
4584468
Change-Id: I5db6f2f15cd30b0ec40f547d2fadfa216de2926d
Mike Lockwood [Mon, 11 Jul 2011 22:52:30 +0000 (15:52 -0700)]
Merge "UsbDeviceManager: Include kernel USB state in dumpsys output"
Mike Lockwood [Mon, 11 Jul 2011 22:52:06 +0000 (15:52 -0700)]
Merge "UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state"
Jason Sams [Mon, 11 Jul 2011 22:47:36 +0000 (15:47 -0700)]
Merge "Add error checks for AllocationAdapters being used in unsupported ways."
Jamie Gennis [Mon, 11 Jul 2011 22:47:20 +0000 (15:47 -0700)]
Merge "EGL: fix the ANativeWindow size/fmt override"
Romain Guy [Mon, 11 Jul 2011 22:37:24 +0000 (15:37 -0700)]
Merge "Always make GL calls with a valid EGL context. Bug #
5010760"
Romain Guy [Mon, 11 Jul 2011 22:33:51 +0000 (15:33 -0700)]
Always make GL calls with a valid EGL context.
Bug #
5010760
Change-Id: If7500ef69683948e727df1406f458f18b11259d1
Robert Greenwalt [Mon, 11 Jul 2011 22:16:32 +0000 (15:16 -0700)]
Fix wifi tethering.
The new link-status netlink monitor is a bit chatty and we were getting race conditions.
The wl0.1 soft-ap interface was getting created, but in the off state. We would report
it available (link-added always reports it) causing wifi to start tethering, but then
we'd sometimes get a link-status-down notification and a link-status-up, causing wifi
to freak out with these two requests.
The simple fix was to not listen to the new link-status notifications. This should be
redesigned in the future.
bug:
4983942
Change-Id: Ica4f34d8bf2a07fc19b35a1e15283a7f8022165e
Mike Lockwood [Sun, 10 Jul 2011 16:01:16 +0000 (12:01 -0400)]
UsbDeviceManager: Include kernel USB state in dumpsys output
Change-Id: Ia7f015057e24f376e285a40e583644f9d0b9213e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Sun, 10 Jul 2011 15:48:18 +0000 (11:48 -0400)]
UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state
This makes it more robust when recovering from runtime restarts
Bug:
4986841
Change-Id: I54b94213447130ca881c66da2d0ce490242f0c96
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eric Laurent [Mon, 11 Jul 2011 22:20:27 +0000 (15:20 -0700)]
Merge "Audio Effect API: process reverse stream function"
Daniel Lehmann [Mon, 11 Jul 2011 22:10:04 +0000 (15:10 -0700)]
Merge "Remove restricted white-listing"
Jaikumar Ganesh [Mon, 11 Jul 2011 21:41:02 +0000 (14:41 -0700)]
Merge "Query the correct Extra for BT intents."
Xavier Ducrohet [Mon, 11 Jul 2011 21:32:26 +0000 (14:32 -0700)]
new button graphics for layoutlib.
Change-Id: I12a6bf9df87552321452ca3344449814cd3102bb
Shimeng (Simon) Wang [Mon, 11 Jul 2011 21:40:04 +0000 (14:40 -0700)]
Merge "Set mActualScale when initialScale is set."
Jeff Sharkey [Mon, 11 Jul 2011 21:36:15 +0000 (14:36 -0700)]
Return stats from inactive ifaces, packet counts.
When an iface goes inactive, xt_qtaguid maintains historical counters
instead of discarding. Now reading and returning those values in
NetworkManagementService summary calls. Tests to verify stats are
returned.
Modify NetworkStats to include rxPackets and txPackets values, and
move to Entry to eventually hide internal storage details.
Bug:
4984539
Change-Id: I1ba0bb5580c62e946d9dff2cc2a6f64aff403efc
Jaikumar Ganesh [Mon, 11 Jul 2011 21:34:34 +0000 (14:34 -0700)]
Query the correct Extra for BT intents.
The extra being queried for wrong for the CONNECTION_STATE_CHANGED
intent. Thus, the status bar icon was never getting updated.
Change-Id: I88892c3acb7cf5aecfd92524e53371a3d43cf5fd
Jaikumar Ganesh [Mon, 11 Jul 2011 21:17:57 +0000 (14:17 -0700)]
Merge "Bluetooth Health APIs"
Shimeng (Simon) Wang [Mon, 11 Jul 2011 21:13:17 +0000 (14:13 -0700)]
Set mActualScale when initialScale is set.
This sets mActualScale to be correct value if initialScale is set.
issue:
4982074
Change-Id: I69d12d185710e89fc91a3a6bdf566c7092f059b7
Jeff Brown [Mon, 11 Jul 2011 20:41:26 +0000 (13:41 -0700)]
Merge "Remove more simulator support code. Bug:
5010576"
Adam Powell [Mon, 11 Jul 2011 20:39:45 +0000 (13:39 -0700)]
Merge "New assets from UX for dialogs/menu frames"
Jeff Brown [Mon, 11 Jul 2011 20:37:53 +0000 (13:37 -0700)]
Merge "Eliminate single-process mode. Bug:
5010576"
Jeff Brown [Mon, 11 Jul 2011 20:04:53 +0000 (13:04 -0700)]
Remove more simulator support code.
Bug:
5010576
Change-Id: Ie6c8665306bf4e822693b76f25c3a0f05c12d42d
James Dong [Mon, 11 Jul 2011 19:56:11 +0000 (12:56 -0700)]
Merge "Do not wait for unlaunched threads in stop()"
James Dong [Fri, 8 Jul 2011 23:51:16 +0000 (16:51 -0700)]
Do not wait for unlaunched threads in stop()
Change-Id: If681749753bb96ee98c1539658cfd919eeb0cb65
James Dong [Mon, 11 Jul 2011 19:46:35 +0000 (12:46 -0700)]
Merge "Release camera if CameraSource::start() has not been called"
Jamie Gennis [Fri, 1 Jul 2011 20:12:07 +0000 (13:12 -0700)]
EGL: fix the ANativeWindow size/fmt override
This change fixes how the Android EGL layer overrides the size and
format of an ANativeWindow in eglCreateWindowSurface. The new behavior
is to leave the size untouched when overriding the format. The previous
behavior was to reset the ANativeWindow to use the default size set by
the ANativeWindow implementation.
It also adds two new 'perform' methods to the ANativeWindow interface:
set_buffers_dimensions and set_buffers_format, and redefines the
behavior of set_buffers_geometry to be the combination of these two new
methods.
Additionally, this change adds an error check for the return value of
the new native_window_set_buffers_format call, which required adding a
(stub) handler for to FramebufferNativeWindow.
Change-Id: I805c7ccd8d4730dfb132d10d8bc3fb058a0b9df1
Mike Lockwood [Mon, 11 Jul 2011 19:15:21 +0000 (12:15 -0700)]
Merge "Remove unnecessary locking from MediaScanner JNI code"
Mike Lockwood [Sun, 10 Jul 2011 18:22:31 +0000 (14:22 -0400)]
Remove unnecessary locking from MediaScanner JNI code
There is nothing in this file that requires a global lock.
Furthermore, the lock can cause timeouts in native_finalize if one instance
is being garbage collected while another is busy in processDirectory
Bug:
5002520
Change-Id: I8717f8edeb932200d9f76b3d98915cfbe18b6ec6
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jamie Gennis [Fri, 8 Jul 2011 20:59:43 +0000 (13:59 -0700)]
Add the spec for EGL_ANDROID_blob_cache.
Change-Id: Ibaff52fee5c856283536ad37251cc80a9f3f938b
Adam Powell [Mon, 11 Jul 2011 18:50:31 +0000 (11:50 -0700)]
New assets from UX for dialogs/menu frames
Change-Id: If23f37f1aadb90af175664bdd2ddc485559e6781
Eric Laurent [Sat, 18 Jun 2011 01:54:16 +0000 (18:54 -0700)]
Audio Effect API: process reverse stream function
Added function to audio effect interface for processing of
a reverse stream.
This is necessary for audio pre processes like echo cancellation.
Change-Id: I6e12d79dbbed6376acdfc79304b8c0ab3f705eae
Jaikumar Ganesh [Thu, 7 Jul 2011 00:37:02 +0000 (17:37 -0700)]
Bluetooth Health APIs
1. Remove the check of configs in BluetoothHealth.
This check is useless since BluetoothHealth is a proxy.
2. Add a wrapper and a callback class. We shouldn't expose
Binder interfaces as public APIs.
Change-Id: If62620b4251cf93f3f97d2fe63099e40fae7da4d
Elliott Hughes [Mon, 11 Jul 2011 18:24:54 +0000 (11:24 -0700)]
Merge "SDK_INT is not "current" on unreleased builds."
Andy McFadden [Mon, 11 Jul 2011 18:24:23 +0000 (11:24 -0700)]
Merge "Relocate common Calendar classes"
Fabrice Di Meglio [Mon, 11 Jul 2011 17:52:09 +0000 (10:52 -0700)]
Merge "Fix View reset of layoutDirection and textDirection"
Freeman Ng [Mon, 11 Jul 2011 17:46:12 +0000 (10:46 -0700)]
Merge "remove old style button bar look"
Mike Lockwood [Mon, 11 Jul 2011 17:41:52 +0000 (10:41 -0700)]
Merge "UsbDeviceManager: Fix indentation"
Mike Lockwood [Mon, 11 Jul 2011 17:41:08 +0000 (10:41 -0700)]
Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system"
Mike Lockwood [Mon, 11 Jul 2011 14:34:35 +0000 (10:34 -0400)]
UsbDeviceManager: Fix indentation
Change-Id: I3eb1d407bdb4bf885d1765eedbfb30555f558b3b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Mon, 11 Jul 2011 13:18:03 +0000 (09:18 -0400)]
MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system
Bug:
4561836
Change-Id: I2bffb93b032038f6c220c24c752ccd7ca66c23a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Fabrice Di Meglio [Fri, 1 Jul 2011 22:09:24 +0000 (15:09 -0700)]
Fix View reset of layoutDirection and textDirection
- do it in onDetachedFromWindow()
- make naming consistent too
- update unit tests
Change-Id: I320fcdbf75166bae793c4409e7344608b696667f
Mike Lockwood [Mon, 11 Jul 2011 16:12:21 +0000 (09:12 -0700)]
Merge "MediaScanner: Use bulk inserts when in batch mode"
Mike Lockwood [Sun, 10 Jul 2011 22:09:34 +0000 (18:09 -0400)]
MediaScanner: Use bulk inserts when in batch mode
To do this we need to move the logic for determining media type to MediaProvider
Make some things in MediaFile public so they can be used from MediaProvider
Bug:
4948188
Change-Id: I6ab168b6b4d45b2fc91ea8bd52ca58283b0efc14
Signed-off-by: Mike Lockwood <lockwood@android.com>
Logan Chien [Mon, 11 Jul 2011 07:32:24 +0000 (15:32 +0800)]
Use resource entry name instead of mangled name.
Change-Id: I833fa1b529fe505ce20ede12b7f4b5952a6ac1f0
Elliott Hughes [Mon, 11 Jul 2011 02:08:44 +0000 (19:08 -0700)]
SDK_INT is not "current" on unreleased builds.
This change (in combination with a dalvik change) ensures that system_server
doesn't run with JNI app workarounds turned on.
Bug:
4772166
Change-Id: Ia015aa56b5684a176de3c123e8aec7f35e7ecac5
Freeman Ng [Mon, 11 Jul 2011 01:35:19 +0000 (18:35 -0700)]
remove old style button bar look
bug:
4524233
Change-Id: Ie41f760258b7b673264d802c7dcc554b226e0e6e
Logan Chien [Sun, 10 Jul 2011 11:39:03 +0000 (19:39 +0800)]
Fix typo: mFieldCount -> mPragmaCount.
Change-Id: I081a521c13a78bc5ec1bf9faecb066bed5ca8ab4
Jeff Sharkey [Sun, 10 Jul 2011 23:18:58 +0000 (16:18 -0700)]
Merge "Cached NTP time for system services."
Daniel Lehmann [Sun, 10 Jul 2011 22:06:25 +0000 (15:06 -0700)]
Remove restricted white-listing
Commit after provider changes
Bug:
4974334
Change-Id: I66bc3c13165ea86725b769c287475dec396841e2
Jim Miller [Sun, 10 Jul 2011 21:35:32 +0000 (14:35 -0700)]
Merge "Fix
4942542,
4590542: Password unlock fixes"
Jeff Sharkey [Sun, 10 Jul 2011 21:20:41 +0000 (14:20 -0700)]
Cached NTP time for system services.
Uses NTP server and timeout from secure settings, or fallback to
defaults in resources. Update various system services to use cached
NTP time when fresh enough, or force updates as needed.
Bug:
4517273
Change-Id: Ie1c4c4883836013d02ca0bbd850cf8949f93b34b
James Dong [Sat, 9 Jul 2011 00:59:29 +0000 (17:59 -0700)]
Release camera if CameraSource::start() has not been called
Change-Id: I2f7e4b8501db3d80b9aa6f99d896d778bec29e8c
Mark Brophy [Fri, 1 Jul 2011 15:56:24 +0000 (16:56 +0100)]
Expose app resume times to the ApplicationProvider.
Add ActivityManager.getAllPackageUsageStats which returns
the PkgUsageStats object for all packages.
In UsageStatsService, remember the last resume time of each component, and
add that info to PkgUsageStats instances.
ApplicationProvider will use getAllPackageUsageStats and the new field
in PkgUsageStats to set the new SearchManager column
SUGGEST_COLUMN_LAST_USAGE_HINT for requests with the GLOBAL_SEARCH
permission.
Change-Id: I80e9b127410ed0d528515d2256787f30a953e9b0
Jim Miller [Sat, 9 Jul 2011 02:09:55 +0000 (19:09 -0700)]
Fix
4689527: Fix positioning bug with RecentHorizontalScrollView, minor tweaks.
This fixes a bug where RecentsHorizontalScrollView wasn't scrolling to the most
recent app.
Contains some minor tweaks to the layout so that it doesn't overlap the notification
bad as well as starting alpha fades while draging items sooner.
Change-Id: I94df309673f316c55b2f44aff60fd3aee746b6de
Jeff Brown [Sat, 9 Jul 2011 01:52:57 +0000 (18:52 -0700)]
Eliminate single-process mode.
Bug:
5010576
Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
Jim Miller [Sat, 9 Jul 2011 02:15:51 +0000 (19:15 -0700)]
Fix
4942542,
4590542: Password unlock fixes
Fixes issue where hint text was inappropriately shown on password unlock screen.
This was caused by TextView.setKeyListener() clearing the inputType flags. The
workaround is to change the order of these calls. TextView.setKeyListener()
should probably not be clearing existing inputType flags.
Fixes wake issue caused by IME events not poking the wakelock. It now correctly pokes
the wakelock whenever the password text field changes.
Change-Id: I746b21117492c4a176f6627e7d33150e6104495e
Elliott Hughes [Sat, 9 Jul 2011 01:11:41 +0000 (18:11 -0700)]
Merge "Pass the targetSdkVersion through to the zygote-forked dalvik."
Robert Ly [Sat, 9 Jul 2011 00:53:12 +0000 (17:53 -0700)]
am
d9f91425: am
6b98e712: am
3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '
d9f91425fc740bc85a8629a27b68b48acaf85962':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Joe Malin [Sat, 9 Jul 2011 00:53:09 +0000 (17:53 -0700)]
am
f84bb997: am
230ef987: am
0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '
f84bb997717501e0af8672608c9d5bd89abe5334':
DOC CHANGE: Change GTV info on intro page
Joe Fernandez [Sat, 9 Jul 2011 00:53:06 +0000 (17:53 -0700)]
am
d1c15f96: am
20f65201: am
0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '
d1c15f96dd2e3b07da6968ea54f6f2bdebe8e190':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Wink Saville [Sat, 9 Jul 2011 00:52:56 +0000 (17:52 -0700)]
am
3ef341cd: am
7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
* commit '
3ef341cda51d5bc35b0bc919f7514653ec194410':
Disconnect ApnContexts in INITING state when error.
Wink Saville [Sat, 9 Jul 2011 00:48:37 +0000 (17:48 -0700)]
Merge "resolved conflicts for merge of
e4a56a32 to master"
Rajneesh Chowdury [Sat, 9 Jul 2011 00:00:08 +0000 (17:00 -0700)]
Merge "Fix for issue
5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn"
Elliott Hughes [Fri, 8 Jul 2011 18:08:07 +0000 (11:08 -0700)]
Pass the targetSdkVersion through to the zygote-forked dalvik.
This will let dalvik implement backwards-compatibile behaviors based on
an app's targetSdkVersion.
Bug:
4772166
Change-Id: I935c5ea9144e8b4e6e21089547287486e2234b7f
Romain Guy [Fri, 8 Jul 2011 23:53:23 +0000 (16:53 -0700)]
Merge "Align paths on pixel boundaries when rasterizing in bitmaps. Bug #
5003739"
Romain Guy [Fri, 8 Jul 2011 23:50:15 +0000 (16:50 -0700)]
Align paths on pixel boundaries when rasterizing in bitmaps.
Bug #
5003739
Change-Id: I3dfbf4eb92e2c870f33c96947a7d6439e3730965
Shimeng (Simon) Wang [Fri, 8 Jul 2011 23:48:23 +0000 (16:48 -0700)]
Merge "Prevent set mInitialScale being overridden by mDefaultScale."