OSDN Git Service
Guang Zhu [Mon, 11 Jul 2011 23:45:35 +0000 (16:45 -0700)]
Merge "allow Uri as intent extra in am command"
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
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."
Shimeng (Simon) Wang [Mon, 11 Jul 2011 21:40:04 +0000 (14:40 -0700)]
Merge "Set mActualScale when initialScale is set."
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>
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
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."
Romain Guy [Fri, 8 Jul 2011 23:27:47 +0000 (16:27 -0700)]
Merge "Correctly render nested rectangles with different winding rules."
Romain Guy [Fri, 8 Jul 2011 23:27:02 +0000 (16:27 -0700)]
Correctly render nested rectangles with different winding rules.
Change-Id: I331d9dc1c17aee62a2fa213692c62a5ba1bb079a
Andy McFadden [Wed, 6 Jul 2011 22:18:49 +0000 (15:18 -0700)]
Relocate common Calendar classes
Move some classes from android.pim to com.android.calendarcommon.
Bug
4575374
Change-Id: Iab09cb331a0a74f6b951ab5e5b7c207e8f1b939c
Gilles Debunne [Fri, 8 Jul 2011 23:02:36 +0000 (16:02 -0700)]
Merge "Fleshed up SuggestionSpan documentation. Bug
4553472"
Romain Guy [Fri, 8 Jul 2011 22:54:10 +0000 (15:54 -0700)]
Merge "Always redraw the UI on orientation change Bug #
4994715"
Romain Guy [Fri, 8 Jul 2011 22:49:50 +0000 (15:49 -0700)]
Always redraw the UI on orientation change
Bug #
4994715
In some cases, on some architectures, the hardware renderer could fail
to properly render a window after an orientation change. The fix is
to force the GL driver to drop any existing buffer to make sure the
next buffer used to draw has the correct geometry.
This change also fixes an issue that was preventing partial screen
updates from being properly enabled.
Change-Id: I874a48590845a8624425130af7db8e20022895dd
Adam Powell [Fri, 8 Jul 2011 22:38:31 +0000 (15:38 -0700)]
Merge "The COLORS!!"
Adam Powell [Fri, 8 Jul 2011 22:28:29 +0000 (15:28 -0700)]
The COLORS!!
Add theme attributes and public color resources. Apps can now query
the current theme's various highlight colors. Commonly used color
values for Holo are now available.
Change-Id: If24dc9ee243e740e8caaddf0b78590783fa228c8
Mathias Agopian [Fri, 8 Jul 2011 22:34:50 +0000 (15:34 -0700)]
Merge "fix screen on/off animation (again)"
Mathias Agopian [Fri, 8 Jul 2011 22:34:33 +0000 (15:34 -0700)]
Merge "Add a simple EGL test"
Mathias Agopian [Fri, 8 Jul 2011 22:34:23 +0000 (15:34 -0700)]
Merge "Fix EGLUtils::selectConfigForPixelFormat()"
RoboErik [Fri, 8 Jul 2011 22:28:26 +0000 (15:28 -0700)]
Merge "Unhide CalendarContract apis"
Gilles Debunne [Fri, 8 Jul 2011 18:45:39 +0000 (11:45 -0700)]
Fleshed up SuggestionSpan documentation. Bug
4553472
Change-Id: I3b5be9a6da79398b03d98eb33eb61a55fd702960
RoboErik [Tue, 14 Jun 2011 21:01:15 +0000 (14:01 -0700)]
Unhide CalendarContract apis
This exposes the set of apis necessary to unbundle the Calendar
app and sync adapters as well as allowing third party developers
to officially access the calendar provider. This is the current
final set of apis to expose, though changes may occur if we
discover new issues. The documentation and CTS tests are still
in progress.
Change-Id: If77f9a1d49a26725b44b1014e8d088be7ffbc707
Jaikumar Ganesh [Fri, 8 Jul 2011 22:01:18 +0000 (15:01 -0700)]
Merge "Get server's listening channel"
Gilles Debunne [Fri, 8 Jul 2011 21:56:14 +0000 (14:56 -0700)]
Merge "Animation settings reset to default"
Rajneesh Chowdury [Fri, 8 Jul 2011 21:56:06 +0000 (14:56 -0700)]
Fix for issue
5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn
Change-Id: Ic8b4360cdabb157fa7739552b73e3c3daab88129
Mathias Agopian [Thu, 7 Jul 2011 21:54:30 +0000 (14:54 -0700)]
Add a simple EGL test
currently it just tests EGLConfig selection
Change-Id: Id9d9971012d733147dd7dc02fa2054307960235e
Shimeng (Simon) Wang [Fri, 8 Jul 2011 21:33:11 +0000 (14:33 -0700)]
Prevent set mInitialScale being overridden by mDefaultScale.
If mInitialScale is set, use it as the default scale; otherwise,
it'll be overridden by default density in case of book app where
mobile fixed viewport is used; since today the default scale is used
to calculate the mobile fixed viewport.
issue:
4982074
Change-Id: I21c2bf41478bb97351cb3fb1cc3735ab7d75e164
Mathias Agopian [Fri, 8 Jul 2011 00:30:31 +0000 (17:30 -0700)]
fix screen on/off animation (again)
- surfaceflinger now uses the GL-convention of
placing the origin in the left-bottom corner
- map texture coordinates of the screen capture
properly
- add the ability to control the animation
speed through a debug property
Bug:
4989276
Change-Id: Ifb3297bb578078b47146fff666c01f85417e0d6f
Mathias Agopian [Wed, 6 Jul 2011 23:35:30 +0000 (16:35 -0700)]
Fix EGLUtils::selectConfigForPixelFormat()
- renderscript now calls EGL directly instead of relying on this function
- surfaceflinger also does its own EGLConfig selection
- selectConfigForPixelFormat stays for legacy reason (many tests use it) but
it now only tries to match the alpha channel of the format rather than the
format itself.
this will allow implementations who don't support the exact formats
defined in the HAL to work properly.
Bug:
4998223
Change-Id: Ic664dfc14d5072a514b6f77a115d1521bfc1578f
Ben Dodson [Fri, 8 Jul 2011 21:36:42 +0000 (14:36 -0700)]
Get server's listening channel
Change-Id: Ia1cb3486a4ba502185efdcf6d7bcf0f37bb55261
James Dong [Fri, 8 Jul 2011 21:17:16 +0000 (14:17 -0700)]
Merge "Use advertised h264 encoding parameters by default if the profile is not baseline"
Glenn Kasten [Fri, 8 Jul 2011 21:06:24 +0000 (14:06 -0700)]
Merge "Fix build warning; LOG_TAG was misplaced"
RoboErik [Fri, 8 Jul 2011 21:05:42 +0000 (14:05 -0700)]
Merge "Pseudo-final api fixes to CalendarContract"
Jason Sams [Fri, 8 Jul 2011 20:52:30 +0000 (13:52 -0700)]
Add error checks for AllocationAdapters being used in unsupported ways.
Change-Id: If6506e04d65a7b3d79203ac7a20a7961368ef04f
RoboErik [Fri, 8 Jul 2011 20:39:05 +0000 (13:39 -0700)]
Pseudo-final api fixes to CalendarContract
This removes the public projections and makes them arguments
that are passed in instead.
Change-Id: Ic9807d4994a9f2798b0ecf9a63194193715931e0
Jim Miller [Fri, 8 Jul 2011 20:14:38 +0000 (13:14 -0700)]
Merge "Fix
4689527: Improved curation for Recents + misc cleanup"
Wink Saville [Fri, 8 Jul 2011 19:49:14 +0000 (12:49 -0700)]
resolved conflicts for merge of
e4a56a32 to master
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
Christopher Tate [Fri, 8 Jul 2011 19:48:48 +0000 (12:48 -0700)]
Merge "Can now restore a subset of apps from historical dataset"
John Reck [Fri, 8 Jul 2011 19:43:22 +0000 (12:43 -0700)]
Merge "NPE guard in setupViewport"
Christopher Tate [Thu, 7 Jul 2011 21:31:18 +0000 (14:31 -0700)]
Can now restore a subset of apps from historical dataset
Adds the ability to filter a restore of an historical dataset so that it
only restores certain apps' data regardless of what is actually present
in the dataset. This is currently only used by the bmgr command-line tool,
for debugging / developer support.
Bug
2021590
Change-Id: I7685e5d609b0f5506f71d70c26410602bb387659
Wink Saville [Fri, 8 Jul 2011 19:28:27 +0000 (12:28 -0700)]
am
a736cd54: am
848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit '
a736cd54e1de62e84a7a49a3c68c56fc6d9bfc00':
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Romain Guy [Fri, 8 Jul 2011 18:58:18 +0000 (11:58 -0700)]
Merge "Correctly position layers."
Romain Guy [Fri, 8 Jul 2011 18:57:29 +0000 (11:57 -0700)]
Correctly position layers.
Change-Id: I1678b1c5bdab140b44e56556c50ab8329255f18a