OSDN Git Service
Romain Guy [Thu, 28 Jan 2010 00:20:49 +0000 (16:20 -0800)]
resolved conflicts for merge of
176a88ff to master
Romain Guy [Wed, 27 Jan 2010 23:54:06 +0000 (15:54 -0800)]
Merge "New View.dispatchDisplayHint() API. Bug #
2399147"
Romain Guy [Wed, 27 Jan 2010 21:53:55 +0000 (13:53 -0800)]
New View.dispatchDisplayHint() API.
Bug #
2399147
This new API will be used by scrollable containers to tell children that they
are/are not displayed. This will allow lists to hide their filter popup window
for instance.
Ying Wang [Wed, 27 Jan 2010 23:53:20 +0000 (15:53 -0800)]
am
6efe03b1: am
6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair
Merge commit '
6efe03b19e0734361b262f9a0be4d225088d7f9e'
* commit '
6efe03b19e0734361b262f9a0be4d225088d7f9e':
Find layout classes in all "layout-*" dirs.
Owen Lin [Wed, 27 Jan 2010 23:48:26 +0000 (15:48 -0800)]
Merge "Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two functions in preference manager."
Suchi Amalapurapu [Wed, 27 Jan 2010 23:46:32 +0000 (15:46 -0800)]
Merge "Add asec permission to DefaultContainerService"
Neal Nguyen [Wed, 27 Jan 2010 23:33:31 +0000 (15:33 -0800)]
Merge "Phase 2 of test file cleanup: relocating test files from FrameworkTest closer to their sources in core."
Dan Egnor [Wed, 27 Jan 2010 23:06:06 +0000 (15:06 -0800)]
Merge "Report tombstone (native crash) data to the dropbox."
Suchi Amalapurapu [Wed, 27 Jan 2010 23:02:41 +0000 (15:02 -0800)]
Add asec permission to DefaultContainerService
Dan Egnor [Wed, 27 Jan 2010 22:52:57 +0000 (14:52 -0800)]
Report tombstone (native crash) data to the dropbox.
Also uses a shared_prefs file to keep track of which files have been
logged, instead of polluting Settings.Secure with this data.
Jason Sams [Wed, 27 Jan 2010 22:48:29 +0000 (14:48 -0800)]
Merge "Fix some minor bugs with GL state setup that were exposed by Droids driver."
Jason Sams [Wed, 27 Jan 2010 22:41:43 +0000 (14:41 -0800)]
Fix some minor bugs with GL state setup that were exposed by Droids driver.
Eric Laurent [Wed, 27 Jan 2010 22:21:20 +0000 (14:21 -0800)]
Merge "Fix issue
2285561: New AudioFlinger and audio driver API needed for A/V sync"
Neal Nguyen [Tue, 12 Jan 2010 21:26:10 +0000 (13:26 -0800)]
Phase 2 of test file cleanup: relocating test files from FrameworkTest closer to their sources in core.
In addition to the file moves, the package names of the tests have been updated and adjusted to match their new locations.
Neal Nguyen [Wed, 27 Jan 2010 22:03:34 +0000 (14:03 -0800)]
Merge "Moving framework core tests closer to their source files."
Dianne Hackborn [Wed, 27 Jan 2010 02:01:04 +0000 (18:01 -0800)]
More work on device admins:
- You can now show a dynamic message to the user when asking to
have your DeviceAdmin added.
- A DeviceAdmin can now provide a warning message that is displayed
before a user disables it.
- Better ordering (and text) of the policy warnings.
- New API to set the maximum failed password attempts before the device
wipes itself.
- We now store the number of failed unlock attempts in persistent
storage.
- New managed dialog APIs that will be used by the settings app.
Also a little bit of cleanup as I was working on this - removed the
long unused MailboxNotAvailableException, fixed a java doc in Messenger.
Grace Kloba [Wed, 27 Jan 2010 21:41:39 +0000 (13:41 -0800)]
Merge "Add request header support for the Browser/WebView. QSB can use this instead of POST to send the location data. After QSB makes the switch, we should also remove the POST_DATA intent which is hidden."
Neal Nguyen [Thu, 7 Jan 2010 18:14:05 +0000 (10:14 -0800)]
Moving framework core tests closer to their source files.
Phase 2 of test case cleanup; distributing CoreTests files closer to their respective sources under frameworks.
Andreas Huber [Wed, 27 Jan 2010 21:31:36 +0000 (13:31 -0800)]
Merge "Attempt to fix the build ... again."
Andreas Huber [Wed, 27 Jan 2010 21:28:08 +0000 (13:28 -0800)]
Attempt to fix the build ... again.
Elliott Hughes [Wed, 27 Jan 2010 21:23:45 +0000 (13:23 -0800)]
Merge "Remove about-to-be-renamed class from preload list."
Andreas Huber [Wed, 27 Jan 2010 21:12:58 +0000 (13:12 -0800)]
Merge "Do not hold onto the master lock while reading data from the datasource. This would prevent consumers from reading cached data immediately if it is available."
Ken Shirriff [Wed, 27 Jan 2010 21:08:01 +0000 (13:08 -0800)]
Merge "Fix ExtendedProperties EntityIterator."
Amith Yamasani [Wed, 27 Jan 2010 20:45:23 +0000 (12:45 -0800)]
Merge "Move Search dialog out of system process into current activity."
Andreas Huber [Wed, 27 Jan 2010 20:39:39 +0000 (12:39 -0800)]
Fixing the build. Why is this suddenly necessary and didn't break the build before???
Ken Shirriff [Wed, 27 Jan 2010 20:27:28 +0000 (12:27 -0800)]
Fix ExtendedProperties EntityIterator.
The iterator was using the wrong cursor.
bug
2399618
Grace Kloba [Wed, 27 Jan 2010 02:08:28 +0000 (18:08 -0800)]
Add request header support for the Browser/WebView.
QSB can use this instead of POST to send the location
data. After QSB makes the switch, we should also
remove the POST_DATA intent which is hidden.
Add loadUrl(String url, HashMap extraHeaders) to
WebView so that the caller can send the extra http
headers.
Remove "inline:" as no one is using it and it is a
hidden feature.
Part 1 of 3-project checkin.
Elliott Hughes [Wed, 27 Jan 2010 20:22:16 +0000 (12:22 -0800)]
Remove about-to-be-renamed class from preload list.
(Safer than tracking the rename here, since the class is in the dalvik/libcore
repo.)
Amith Yamasani [Mon, 25 Jan 2010 17:15:50 +0000 (09:15 -0800)]
Move Search dialog out of system process into current activity.
SearchManager now manages the SearchDialog, in-process.
Nuked SearchDialogWrapper
SearchManagerService now just holds the Searchables information.
Hitting Search when in the local Search dialog will launch the QSB.
Vasu Nori [Wed, 27 Jan 2010 20:10:56 +0000 (12:10 -0800)]
Merge "dont use sqlite_stmt_journals dir"
Vasu Nori [Wed, 27 Jan 2010 06:27:56 +0000 (22:27 -0800)]
dont use sqlite_stmt_journals dir
Andreas Huber [Wed, 27 Jan 2010 20:08:25 +0000 (12:08 -0800)]
Do not hold onto the master lock while reading data from the datasource. This would prevent consumers from reading cached data immediately if it is available.
related-to-bug:
2295438
Elliott Hughes [Wed, 27 Jan 2010 19:17:19 +0000 (11:17 -0800)]
Remove another scheduled-for-deletion class from the preload list.
Suchi Amalapurapu [Wed, 27 Jan 2010 18:40:26 +0000 (10:40 -0800)]
Merge "AppsOnSd feature - Add default container"
Yu Shan Emily Lau [Wed, 27 Jan 2010 18:28:51 +0000 (10:28 -0800)]
Merge "Add the new golden thumbnail image as the PV and stagefright implementations in capturing thumbnail is different."
Suchi Amalapurapu [Mon, 25 Jan 2010 20:19:12 +0000 (12:19 -0800)]
AppsOnSd feature - Add default container
Add new remote interface to do temporary copies. The new
remote stub handling is done on mHandler thread and doesn't need locking
for now.
Add new InstallArgs class and subclasses to isolate cases for installation.
Move resource deletion for failed installs/upgrades to later on in installation
cycle.
Fix code path for forward locked apps when using scanPackageLI
TODO's
Fix installation paths to completely use InstallArgs based design later on.
Get rid of using flags in various install/uninstall code paths.
Ideally InstallArgs should be created using these flags and used in the
rest of the code.
Function renames.
Revisit mount api's.
Doug Zongker [Wed, 27 Jan 2010 17:40:23 +0000 (09:40 -0800)]
Merge "update javadoc for Settings.Secure.ANDROID_ID"
Doug Zongker [Tue, 26 Jan 2010 20:29:44 +0000 (12:29 -0800)]
update javadoc for Settings.Secure.ANDROID_ID
Remove reference to GoogleLoginService, explain what this value is now.
Change-Id: I2359bd21d9c250245c01e26d660b133f4e469759
Evan Millar [Wed, 27 Jan 2010 17:26:24 +0000 (09:26 -0800)]
Merge "b/
2383073 Add fine-grained status codes for failed downloads."
Andreas Huber [Wed, 27 Jan 2010 17:24:43 +0000 (09:24 -0800)]
Merge "Better support for HTTP streaming media content, fixes to the way HTTPDataSource streams the data, prefetcher implementation."
Chih-Chung Chang [Wed, 27 Jan 2010 17:20:19 +0000 (09:20 -0800)]
Merge "Add support for setting camera display orientation."
San Mehat [Tue, 26 Jan 2010 23:18:08 +0000 (15:18 -0800)]
MountService: Introduce new @hide permissions to protect secure containers.
Signed-off-by: San Mehat <san@google.com>
Wei-Ta Chen [Wed, 27 Jan 2010 04:23:22 +0000 (20:23 -0800)]
Merge "Add a Java API that converts yuv data to a jpeg."
Dan Egnor [Wed, 27 Jan 2010 04:05:20 +0000 (20:05 -0800)]
Merge changes Iea11654e,I2242da5a,I66c40e73
* changes:
Use six dashes instead of five.
Include more verbose device information with kernel dumps (hardware, bootloader, etc.), and separate the device info headers from the actual dump with a blank line.
Add package information to dropbox reports for ANR, crash, etc. (Notably including package version codes, to help when we're shipping out-of-cycle unbundled app updates.)
Wei-Ta Chen [Mon, 30 Nov 2009 09:52:05 +0000 (17:52 +0800)]
Add a Java API that converts yuv data to a jpeg.
The compression is done in the native layer via calling libjpeg.
Bug:
2285598
Eric Laurent [Wed, 20 Jan 2010 01:37:09 +0000 (17:37 -0800)]
Fix issue
2285561: New AudioFlinger and audio driver API needed for A/V sync
Added getRenderPosition() API to IAudioFlinger to retreive number of audio frames
written by AudioFlinger to audio HAL and by DSP to DAC.
Added getRenderPosition() API to AudioHardwareInterface to retreive number of audio frames
written by DSP to DAC.
Exposed AudioTrack::getPosition() to AudioSink() to make it available to media player.
Removed excessive log in AudioHardwareGeneric.
Elliott Hughes [Wed, 27 Jan 2010 01:46:16 +0000 (17:46 -0800)]
Merge "Track removal of a class."
Elliott Hughes [Wed, 27 Jan 2010 01:17:26 +0000 (17:17 -0800)]
Track removal of a class.
Romain Guy [Wed, 27 Jan 2010 01:05:11 +0000 (17:05 -0800)]
Fix the build.
Dan Egnor [Wed, 27 Jan 2010 01:04:26 +0000 (17:04 -0800)]
Use six dashes instead of five.
Dan Egnor [Wed, 27 Jan 2010 01:00:36 +0000 (17:00 -0800)]
Include more verbose device information with kernel dumps
(hardware, bootloader, etc.), and separate the device info
headers from the actual dump with a blank line.
San Mehat [Wed, 27 Jan 2010 00:52:49 +0000 (16:52 -0800)]
Merge "MountService: Don't update the storage status when we're unmounted"
San Mehat [Wed, 27 Jan 2010 00:51:35 +0000 (16:51 -0800)]
MountService: Don't update the storage status when we're unmounted
Signed-off-by: San Mehat <san@google.com>
Eugene Koh [Wed, 27 Jan 2010 00:48:52 +0000 (16:48 -0800)]
Merge "Modify the interface of HanziToPinyin class to make it generic and add test class"
Dan Egnor [Wed, 27 Jan 2010 00:23:11 +0000 (16:23 -0800)]
Add package information to dropbox reports for ANR, crash, etc.
(Notably including package version codes, to help when we're shipping
out-of-cycle unbundled app updates.)
Andreas Huber [Wed, 27 Jan 2010 00:20:10 +0000 (16:20 -0800)]
Better support for HTTP streaming media content, fixes to the way HTTPDataSource streams the data, prefetcher implementation.
related-to-bug:
2295438
Scott Main [Tue, 26 Jan 2010 23:42:15 +0000 (15:42 -0800)]
Merge "remove @deprecated from dropDownHeight and dropDownWidth"
Scott Main [Tue, 26 Jan 2010 23:34:02 +0000 (15:34 -0800)]
remove @deprecated from dropDownHeight and dropDownWidth
Scott Main [Tue, 26 Jan 2010 23:32:02 +0000 (15:32 -0800)]
Merge "remove @deprecated tag from "fill_parent" because it bubbles up and declares the entire attribute as deprecated."
Scott Main [Tue, 26 Jan 2010 23:27:54 +0000 (15:27 -0800)]
remove @deprecated tag from "fill_parent" because it bubbles up
and declares the entire attribute as deprecated.
Attila Bodis [Tue, 26 Jan 2010 22:52:32 +0000 (14:52 -0800)]
b/
2383073 Add fine-grained status codes for failed downloads.
Introduces new download status codes (STATUS_DEVICE_NOT_FOUND_ERROR and
STATUS_INSUFFICIENT_SPACE_ERROR) to allow apps to show more accurate and
informative error messages upon failed downloads.
San Mehat [Tue, 26 Jan 2010 22:18:47 +0000 (14:18 -0800)]
Merge "MountService: Explicitly query volume state on startup"
San Mehat [Tue, 26 Jan 2010 21:38:41 +0000 (13:38 -0800)]
Merge "NativeDaemonConnector: fix doListCommand() to return *all* list elements"
San Mehat [Tue, 26 Jan 2010 21:28:50 +0000 (13:28 -0800)]
MountService: Explicitly query volume state on startup
Signed-off-by: San Mehat <san@google.com>
San Mehat [Tue, 26 Jan 2010 20:48:39 +0000 (12:48 -0800)]
NativeDaemonConnector: fix doListCommand() to return *all* list elements
Signed-off-by: San Mehat <san@google.com>
Chris Tate [Tue, 26 Jan 2010 20:29:13 +0000 (12:29 -0800)]
Merge "Move towards a formal public API for backup and restore"
Dianne Hackborn [Fri, 22 Jan 2010 19:31:30 +0000 (11:31 -0800)]
More device admin work: description, policy control.
There is now a description attribute associated with all components,
that can supply user-visible information about what the component does.
We use this to show such information about device admins, and wallpapers
are also updated to be able to show this in addition to the existing
description in their meta-data.
This also defines security control for admins, requiring that they
declare the policies they will touch, and enforcing that they do
so to be able to use various APIs.
Mike Reed [Tue, 26 Jan 2010 20:20:43 +0000 (12:20 -0800)]
Merge "add API to change default config on image decoders."
Chih-Chung Chang [Sat, 23 Jan 2010 02:10:53 +0000 (18:10 -0800)]
Unhide brightness constants to help unbundle Camera.
Mike Lockwood [Tue, 26 Jan 2010 19:36:41 +0000 (11:36 -0800)]
Merge "Unhide the secure setting for LocationProviderEnabled"
Jason Sams [Tue, 26 Jan 2010 19:34:48 +0000 (11:34 -0800)]
Merge "Turn the debugging back on."
Jason Sams [Tue, 26 Jan 2010 19:34:09 +0000 (11:34 -0800)]
Turn the debugging back on.
David Turner [Tue, 26 Jan 2010 19:24:47 +0000 (11:24 -0800)]
Merge "Make PackageManager unpack gdbserver binaries at installation time."
Chih-Chung Chang [Sat, 23 Jan 2010 01:49:48 +0000 (17:49 -0800)]
Add support for setting camera display orientation.
Nicolas Roard [Tue, 26 Jan 2010 18:38:42 +0000 (10:38 -0800)]
Merge "Fix memory leak with layers. This fix bug b/
2394813 This is a two-parts CL (needs C++ modifs)"
Nicolas Roard [Tue, 19 Jan 2010 21:08:49 +0000 (21:08 +0000)]
Fix memory leak with layers.
This fix bug http://b/
2394813
This is a two-parts CL (needs C++ modifs)
Nick Pelly [Tue, 26 Jan 2010 18:36:44 +0000 (10:36 -0800)]
Merge "Revert "Fix failure to open AVRCP input device due to EPERM.""
Nick Pelly [Tue, 26 Jan 2010 18:27:15 +0000 (10:27 -0800)]
Revert "Fix failure to open AVRCP input device due to EPERM."
This reverts commit
e6b1bbd8acca3f6e174c24cf4eb23a66db2d08a2.
Patrick Scott [Tue, 26 Jan 2010 18:27:12 +0000 (10:27 -0800)]
am
5b7ea014: (-s ours) am
e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Merge commit '
5b7ea0146dcfd5564d894d4cf0104919775feb36'
* commit '
5b7ea0146dcfd5564d894d4cf0104919775feb36':
DO NOT MERGE
Grace Kloba [Tue, 26 Jan 2010 18:27:06 +0000 (10:27 -0800)]
am
c811cd91: am
caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up)
Merge commit '
c811cd916f7264f11ba4c96fcd8b88e5d58e04db'
* commit '
c811cd916f7264f11ba4c96fcd8b88e5d58e04db':
Delay resetting mPreventDrag flags so that the Plugin
Grace Kloba [Tue, 26 Jan 2010 18:26:57 +0000 (10:26 -0800)]
am
cf0957ce: am
77dc179b: As embedded and full screen shares the same view, we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout.
Merge commit '
cf0957ce4b0ba45b6c66c726710a5126c6a57542'
* commit '
cf0957ce4b0ba45b6c66c726710a5126c6a57542':
As embedded and full screen shares the same view,
Patrick Scott [Tue, 26 Jan 2010 18:11:30 +0000 (10:11 -0800)]
am
e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Merge commit '
e7b2845d685a583e8e84de369b6acfa1bebeabf4' into eclair-mr2-plus-aosp
* commit '
e7b2845d685a583e8e84de369b6acfa1bebeabf4':
DO NOT MERGE
Robert Greenwalt [Tue, 26 Jan 2010 18:09:52 +0000 (10:09 -0800)]
resolved conflicts for merge of
1f2f23bd to master
Grace Kloba [Tue, 26 Jan 2010 18:09:52 +0000 (10:09 -0800)]
am
caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up)
Merge commit '
caf0ce3ca2b3deba4bcff6c920740bafd87f2b62' into eclair-mr2-plus-aosp
* commit '
caf0ce3ca2b3deba4bcff6c920740bafd87f2b62':
Delay resetting mPreventDrag flags so that the Plugin
Grace Kloba [Tue, 26 Jan 2010 18:09:39 +0000 (10:09 -0800)]
am
77dc179b: As embedded and full screen shares the same view, we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout.
Merge commit '
77dc179baa7b8fb405633fd46324e336285d10e2' into eclair-mr2-plus-aosp
* commit '
77dc179baa7b8fb405633fd46324e336285d10e2':
As embedded and full screen shares the same view,
Patrick Scott [Tue, 26 Jan 2010 18:07:23 +0000 (10:07 -0800)]
Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Andreas Huber [Mon, 25 Jan 2010 23:30:31 +0000 (15:30 -0800)]
Support for audio recording into AMR NB/WB files as well as audio tracks in MPEG4 files.
related-to-bug:
2295449
Mark Vandevoorde [Tue, 26 Jan 2010 16:42:10 +0000 (08:42 -0800)]
Unhide the secure setting for LocationProviderEnabled
The unbundled NetworkLocationProvider needs to get/set the enabled bit
from the settings database.
San Mehat [Tue, 26 Jan 2010 15:59:08 +0000 (07:59 -0800)]
Merge "NetworkManagementService: Start service when SystemServer starts up"
San Mehat [Tue, 26 Jan 2010 14:17:26 +0000 (06:17 -0800)]
NetworkManagementService: Start service when SystemServer starts up
Signed-off-by: San Mehat <san@google.com>
Mike Reed [Tue, 26 Jan 2010 15:13:53 +0000 (10:13 -0500)]
add API to change default config on image decoders.
May be called by the browser to get high-quality images when running in a 32bit window
Patrick Scott [Tue, 26 Jan 2010 15:08:17 +0000 (07:08 -0800)]
Merge "Set a flag that indicates a response is pending."
Daniel Sandler [Sat, 23 Jan 2010 01:50:15 +0000 (20:50 -0500)]
Add android.provider.Settings.ACTION_DEVICE_INFO_SETTINGS.
Maps to "android.settings.DEVICE_INFO_SETTINGS", which
launches the DeviceInfoSettings activity in Settings.
San Mehat [Tue, 26 Jan 2010 14:19:21 +0000 (06:19 -0800)]
Merge "MountService: Add support for renaming secure containers"
Patrick Scott [Fri, 15 Jan 2010 13:12:15 +0000 (08:12 -0500)]
Set a flag that indicates a response is pending.
This will keep track of multiple calls to proceed/cancel. If an error has
occurred and the client calls proceed or cancel more than once, the loader may
be null. Set the flag during the callback and reset after a response.
Bug:
2371305
Valentin Kravtsov [Fri, 15 Jan 2010 11:56:03 +0000 (11:56 +0000)]
Adding Recognition Service and Listener wrappers
Change-Id: Ib5068fb6d42b6752d09b0828964b6cbe92d015d3
Yu Shan Emily Lau [Tue, 26 Jan 2010 04:49:08 +0000 (20:49 -0800)]
Add the new golden thumbnail image as the PV and stagefright implementations in capturing thumbnail is different.
Christopher Tate [Tue, 26 Jan 2010 03:37:47 +0000 (19:37 -0800)]
Move towards a formal public API for backup and restore
This commit makes a few changes towards establishing a formal application
interface for interacting with the backup/restore mechanism:
1. Introduce public wrapper classes around the various binder interfaces; 3rd
party code will never see the binders directly.
2. Progress update callbacks during a restore sequence now occur on the main
thread, not in a binder thread [and not with system-process permissions!].
3. Rename the BackupManagerService's inner "RestoreSession" class to avoid
ambiguity with the new public "RestoreSession" class.
Irfan Sheriff [Tue, 26 Jan 2010 03:10:31 +0000 (19:10 -0800)]
resolved conflicts for merge of
d0514347 to master
Mike LeBeau [Tue, 26 Jan 2010 02:31:09 +0000 (21:31 -0500)]
Unhide RecognizerIntent.ACTION_VOICE_SEARCH_SETTINGS, which our voice search
(or other voice search implementations) can use to implement settings in the
system settings.