OSDN Git Service
Dianne Hackborn [Tue, 6 Apr 2010 01:35:42 +0000 (18:35 -0700)]
Fix issue #
2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
This is a quick and dirty solution to re-assign permissions after booting
from a platform update. It is not great, because it means that an app
can have permissions that the user didn't get to see when they originally
installed it. Unfortunately it's not clear what else to do here, nor is
there time to do anything significant.
Change-Id: I82faba141b5883c87212afa7febecf9860a413e3
Irfan Sheriff [Mon, 5 Apr 2010 18:57:56 +0000 (11:57 -0700)]
Disable tethering when airplane mode is enabled
Tethering should be disabled when
airplane mode is enabled. Additionally,
we should restore Wifi (if it was on
before tethering was enabled) when
airplane mode is disabled.
Bug:
2567099
Change-Id: Iba2031f5ecb207954fd155c47134b39ed0167fa0
Bjorn Bringert [Tue, 6 Apr 2010 15:53:12 +0000 (08:53 -0700)]
Merge "Guard against NPE in SearchManagerService" into froyo
Joe Onorato [Tue, 6 Apr 2010 15:32:07 +0000 (08:32 -0700)]
Merge "Redo the look of the recent apps switcher" into froyo
Joe Onorato [Mon, 5 Apr 2010 21:16:15 +0000 (16:16 -0500)]
Redo the look of the recent apps switcher
Change-Id: I913c3f68f487e7ccf20a014c26ab85119e991484
Bjorn Bringert [Tue, 6 Apr 2010 13:48:41 +0000 (14:48 +0100)]
Guard against NPE in SearchManagerService
Bug http://b/issue?id=
2570569
Change-Id: I72395f847b3dbc699c73358e14421d624f40fcf3
Dianne Hackborn [Mon, 5 Apr 2010 21:33:01 +0000 (14:33 -0700)]
2568467 System crash when installing corrupt APK
Also fix another crash I just saw in the package manager, when a
permission got left around from a previous install but as no
longer defined.
Change-Id: I33b87420f0c59e24b8b77fab8b0316461d99e048
Dianne Hackborn [Tue, 6 Apr 2010 01:35:11 +0000 (18:35 -0700)]
Merge "Fix issue #
2564479: Favorite Recipes App Installation Fail" into froyo
Jim Miller [Tue, 6 Apr 2010 00:16:00 +0000 (17:16 -0700)]
Merge "Fix
2325549: Allow up to 4 lines of summary text in Settings" into froyo
Jim Miller [Sat, 3 Apr 2010 01:47:17 +0000 (18:47 -0700)]
Fix
2325549: Allow up to 4 lines of summary text in Settings
This fixes a number of screens in Settings (see the bug for examples).
Though it seems like a scary change, it should be safe since
the added line doesn't affect layout unless it's used, in which
case the view is slightly taller.
Change-Id: I13d04efadee19b407febabfae7825aedf66e8744
Dirk Dougherty [Mon, 5 Apr 2010 23:37:07 +0000 (16:37 -0700)]
Merge "docs: add manifest documentation for installLocation" into froyo
Scott Main [Mon, 5 Apr 2010 22:47:54 +0000 (15:47 -0700)]
docs: add manifest documentation for installLocation
Change-Id: Id52e3460bd1ada86b6b32a47dd020829d65ac5f8
Wei Huang [Mon, 5 Apr 2010 22:36:40 +0000 (15:36 -0700)]
Merge "bug
2542580: fix bad icon." into froyo
Doug Zongker [Mon, 5 Apr 2010 22:16:12 +0000 (15:16 -0700)]
Merge "remove OTA packages from the old (pre-froyo) updater" into froyo
Doug Zongker [Mon, 5 Apr 2010 22:07:36 +0000 (15:07 -0700)]
remove OTA packages from the old (pre-froyo) updater
The old updater ran in the system process, so only that UID can delete
its downloads. Do this on startup in case we've just upgraded from
something before froyo and need to clean up those packages.
b/
2571619 - eclair -> froyo update package not deleted
Change-Id: I0a5e7834c3ecd2cc2f6fd73052b3a38e1294b5d5
Wei Huang [Mon, 5 Apr 2010 22:09:52 +0000 (15:09 -0700)]
bug
2542580: fix bad icon.
- borrow hdpi asset instead (for now), until I get a new icon from UX.
Change-Id: I6425698b02a3bcb53448db05f9939d48a2078c26
Dan Morrill [Mon, 5 Apr 2010 21:56:03 +0000 (14:56 -0700)]
Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Kenny Root [Mon, 5 Apr 2010 21:55:10 +0000 (14:55 -0700)]
Merge "Revert to previous text selection behavior" into froyo
Kenny Root [Mon, 5 Apr 2010 21:27:59 +0000 (14:27 -0700)]
Revert to previous text selection behavior
There was a new behavior that starting "Select text" would allow you to
swipe from beginning to end and immediately copy that. This change
reverts to the previous behavior that "Select text" will start where
your cursor is currently and any tap will extend the selection from that
origin to the point of the tap.
Change-Id: Ib955cc8d62a652f518435953da2f54e810d9dfb0
Jaikumar Ganesh [Mon, 5 Apr 2010 21:45:27 +0000 (14:45 -0700)]
Merge "Add an extra for the Disconnect Headset State." into froyo
Jaikumar Ganesh [Fri, 2 Apr 2010 21:44:43 +0000 (14:44 -0700)]
Add an extra for the Disconnect Headset State.
This extra tells as to who initiated the disconnection.
Bug:
2568119
Change-Id: Iea706ad69f79ae0257604dfa84d49126fb851cca
Dan Morrill [Mon, 5 Apr 2010 21:43:58 +0000 (14:43 -0700)]
Adding a feature definition for touchscreens that was overlooked in the last
round.
Change-Id: I8f30676a7b468a9868503b05f366709d5534a44e
Wei Huang [Mon, 5 Apr 2010 21:36:47 +0000 (14:36 -0700)]
Merge "bug #
2542580: fix stat_notify_chat icon for mdpi resource." into froyo
Wei Huang [Mon, 5 Apr 2010 21:18:55 +0000 (14:18 -0700)]
bug #
2542580: fix stat_notify_chat icon for mdpi resource.
Change-Id: Id6a14f76077334ad2925aeecb04fd0f69209c91f
Amith Yamasani [Mon, 5 Apr 2010 21:17:55 +0000 (14:17 -0700)]
Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Ray Chen [Mon, 5 Apr 2010 18:26:40 +0000 (11:26 -0700)]
Make createVideoThumbnail and createImageThumbnail look consistent.
Change-Id: I9a4798fefe3968ac847d46100036a6dde39791c9
Amith Yamasani [Mon, 5 Apr 2010 19:43:44 +0000 (12:43 -0700)]
Fix a crash in BatteryStatsImpl, due to a previous fix.
This is probably the real fix for the original bug. The last line was probably not
well formed and resulted in an overrun in the native code.
Bug:
2564824
Change-Id: I8a9cc267f8045a61eff4b5d532258afa32a8b837
Cary Clark [Mon, 5 Apr 2010 19:05:59 +0000 (15:05 -0400)]
check for webviewcore before reading settings
In setActive(), the WebViewCore instance may
have already been destroyed before the settings
object can be read.
Change-Id: I46b2a57b2d92fc7216b1c984f7044fea1fc2409e
http://b/
2570700
Leon Scroggins [Wed, 31 Mar 2010 19:32:36 +0000 (15:32 -0400)]
Only include WEB_EDIT if there are more textfields.
Fixes http://b/issue?id=
2559070
Requires a change to external/webkit.
Change-Id: I411a04d260c781a91d16832704bb5c34e9751bc1
San Mehat [Mon, 5 Apr 2010 17:35:56 +0000 (10:35 -0700)]
Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo
Christopher Tate [Mon, 5 Apr 2010 00:45:35 +0000 (17:45 -0700)]
Fix 'dumpsys backup'
"for (Type foo : mSetOfType)" doesn't work when mSetOfType is null.
Change-Id: Iac667c7309f99b12d3147830e166b542b29cba5f
Christopher Tate [Sat, 3 Apr 2010 02:14:58 +0000 (19:14 -0700)]
Merge "Fix "incall in landscape sometimes" bug #
2523942" into froyo
Christopher Tate [Sat, 3 Apr 2010 02:08:30 +0000 (19:08 -0700)]
Fix "incall in landscape sometimes" bug #
2523942
The problem turns out to have been a deep weirdness in the way that keyguard
and incall interact. Incall gets relaunched when the keyboard is opened/closed,
which transiently exposes keyguard with its nosensor orientation demands, and
that plus the long keyguard-hide animation was leaving incall in a bad state
from which the window manager didn't try to recover.
We now disregard animating-towards-hidden windows [i.e. keyguard] when running
through the app tokens to determine what orientation should be, and do not do
configuration calculations at all while the display is frozen. There can still
be a transient state in which incall is drawn in landscape, but things proceed
from there to relaunch it back into the proper portrait orientation, and it
ends up in the right state in the end.
Change-Id: I0d74ee19064b6d7f65600976f1b5b16b7ec36f31
Dirk Dougherty [Sat, 3 Apr 2010 01:37:10 +0000 (18:37 -0700)]
Merge "doc change: miscellaneous small fixes." into froyo
Dirk Dougherty [Thu, 1 Apr 2010 16:50:15 +0000 (09:50 -0700)]
doc change: miscellaneous small fixes.
Change-Id: Iaa317261bdc20cefa38e022dfc275fea3acd97a2
Amith Yamasani [Sat, 3 Apr 2010 00:20:53 +0000 (17:20 -0700)]
Merge "Potential fix for bug:
2564824 : Device runtime restart in BatteryService" into froyo
Dianne Hackborn [Fri, 2 Apr 2010 23:51:26 +0000 (16:51 -0700)]
Fix issue #
2564479: Favorite Recipes App Installation Fail
Change-Id: Ide1045e3f6bef9ed2a2fee08bfeda8c58feb685f
Grace Kloba [Fri, 2 Apr 2010 23:41:13 +0000 (16:41 -0700)]
Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo
Adam Powell [Fri, 2 Apr 2010 23:05:20 +0000 (16:05 -0700)]
Fix bug
2185026 - back button in context menu now calls onContextMenuClosed()
Change-Id: I6c16879a8ad8e4651d21f639a620a936bf991f8d
Grace Kloba [Fri, 2 Apr 2010 22:38:55 +0000 (15:38 -0700)]
Make sure when WebView modified mScrollX/Y directly,
onScrollChanged() is called so that the View system
can do what it needs to adjust.
As WebView's onScrollChanged will call sendOurVisibleRect(),
we don't need to call it explicitly any more.
Fix http://b/issue?id=
2438457
Amith Yamasani [Fri, 2 Apr 2010 20:46:49 +0000 (13:46 -0700)]
Potential fix for bug:
2564824 : Device runtime restart in BatteryService
Look for corrupted bytes and replace with ?
If the problem is in the parsing code, then this will not help.
Change-Id: If33643f126a4099d4113e37760c6ef74683fe97e
Andreas Huber [Fri, 2 Apr 2010 21:03:46 +0000 (14:03 -0700)]
Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo
Charles Chen [Tue, 30 Mar 2010 18:15:05 +0000 (11:15 -0700)]
Unhiding TTS API constants and methods needed for TTS plugin support.
This is a fix for bug #
2548048
Change-Id: Ieb60979098c1d2e82618204882bd523d271a8784
Dianne Hackborn [Fri, 2 Apr 2010 20:35:59 +0000 (13:35 -0700)]
Merge "Add a new intent category used for activities running in carmode." into froyo
Andreas Huber [Fri, 2 Apr 2010 19:49:54 +0000 (12:49 -0700)]
Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
Change-Id: I90c7db6656a53339c5d454336548c4f00d0d9064
related-to-bug:
2548426
Irfan Sheriff [Fri, 2 Apr 2010 19:47:45 +0000 (12:47 -0700)]
Merge "Dont start wifi if in airplane mode" into froyo
Suchi Amalapurapu [Fri, 2 Apr 2010 19:46:38 +0000 (12:46 -0700)]
Merge "Handle exceptions when doing dexopt." into froyo
Irfan Sheriff [Fri, 2 Apr 2010 19:18:45 +0000 (12:18 -0700)]
Dont start wifi if in airplane mode
Now that wifi start is asynchronous
at the time of bring up, make sure
Wifi is not started if in airplane
mode.
Bug:
2567652
Change-Id: I947b7c8480029973bcbf028f6143aabbc88c9793
San Mehat [Fri, 2 Apr 2010 18:50:05 +0000 (11:50 -0700)]
NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
Change-Id: I1d6816c9754801504a988802118a2167e0eb8690
Signed-off-by: San Mehat <san@google.com>
Andreas Huber [Fri, 2 Apr 2010 18:18:32 +0000 (11:18 -0700)]
Merge "Support another kind of iso mpeg4 file." into froyo
Bernd Holzhey [Wed, 31 Mar 2010 07:46:13 +0000 (09:46 +0200)]
Add a new intent category used for activities running in carmode.
Change-Id: I4702538c9f53cc0b64eae72298e27232cdfb3548
Adam Powell [Fri, 2 Apr 2010 18:02:21 +0000 (11:02 -0700)]
Merge "Fix AbsListView scrolling behavior at edges." into froyo
Daniel Sandler [Fri, 2 Apr 2010 17:54:57 +0000 (10:54 -0700)]
Merge "Make desk mode work again." into froyo
Fred Quintana [Fri, 2 Apr 2010 17:47:11 +0000 (10:47 -0700)]
Merge "revert the stripping of System Group: from the names of google system groups" into froyo
Brett Chabot [Fri, 2 Apr 2010 17:24:00 +0000 (10:24 -0700)]
Merge "Add test annotations to frameworks common tests." into froyo
Adam Powell [Fri, 2 Apr 2010 17:21:55 +0000 (10:21 -0700)]
Fix AbsListView scrolling behavior at edges.
Allow the user to start scrolling back into content immediately
after dragging past the end of content.
Remove some dead code.
Change-Id: Ife8f60499ac58179ba1e2500ca8745916392a4bc
Grace Kloba [Fri, 2 Apr 2010 16:14:39 +0000 (09:14 -0700)]
Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window's main WebView. It is only non-null if the WebView's window has the focus." into froyo
Jean-Michel Trivi [Fri, 2 Apr 2010 15:53:42 +0000 (08:53 -0700)]
Merge "Fix bug
2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo
Brett Chabot [Fri, 2 Apr 2010 15:53:22 +0000 (08:53 -0700)]
Add test annotations to frameworks common tests.
Change-Id: Iaf5af2cbd49015ac8f1bf23a4d20f055ac9a000e
Dave Sparks [Fri, 2 Apr 2010 14:56:44 +0000 (07:56 -0700)]
Merge "Use local lock for most MediaMetadataRetriever methods. Bug
2560834." into froyo
Daniel Sandler [Fri, 2 Apr 2010 14:15:09 +0000 (10:15 -0400)]
Make desk mode work again.
Bug:
2564612
Change-Id: I858a86d14a6840f5f587343a64c5d0c4bc5d5263
Brett Chabot [Fri, 2 Apr 2010 04:45:41 +0000 (21:45 -0700)]
Merge "More framework tests cleanup." into froyo
Mike Lockwood [Fri, 2 Apr 2010 04:08:53 +0000 (21:08 -0700)]
Merge "Vibrate before shutting down." into froyo
Mike Lockwood [Fri, 2 Apr 2010 03:01:44 +0000 (20:01 -0700)]
Vibrate before shutting down.
BUG:
2439291
Change-Id: I0f5abba34a14f1dd1cbe2077122d6f3e940b4d90
Signed-off-by: Mike Lockwood <lockwood@android.com>
Suchi Amalapurapu [Thu, 1 Apr 2010 23:31:31 +0000 (16:31 -0700)]
Handle exceptions when doing dexopt.
Change-Id: Iaeba98ef9fef2f1dbf3dbe2e8e4497dae8d0fe7f
Jim Miller [Thu, 1 Apr 2010 01:15:27 +0000 (18:15 -0700)]
Fix
2538826: Allow aspect of LockPatternView to be customized.
This fixes a problem where the pattern unlock area shrank on
mdpi devices.
This change is required since some devices (mdpi) don't have
enough vertical room to show a square LockPatternView and shrink
the area to match the minimum of width and height. To fix the
problem and minimize changes to existing platforms, the parameter
is configurable and has a default in values/donottranslate that
emulates the old behavior. New behavior for mdpi devices is
specified in values-port-mdpi/donottranslate, which is the
only place we currently see the problem.
Tested:
mdpi device in both orientations
hdpi device in both orientations
hdpi device in both orientations with keyboard open/closed
Change-Id: I3b9a5ef1d9b5e70f7b1823c9f48a3938f52cc7a4
Brett Chabot [Fri, 2 Apr 2010 01:21:38 +0000 (18:21 -0700)]
More framework tests cleanup.
Move all tests for android.* classes from tests/AndroidTests and
tests/CoreTests into framework/base/<core|graphics>/tests.
Consolidate all tests for java.* classes to tests/CoreTests.
Eventually hopefully these will be moved to dalvik/ somewhere.
Remove tests/AndroidTests entirely.
Change-Id: I86584d086ab7bd045bb38a10b699907805298a95
Mike LeBeau [Fri, 2 Apr 2010 01:11:43 +0000 (18:11 -0700)]
Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentName.unflattenFromString." into froyo
Mike LeBeau [Fri, 2 Apr 2010 01:08:34 +0000 (18:08 -0700)]
Use flattenToShortString instead of toShortString on ComponentNames to
be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have
been using toShortString because that includes curly braces and is not
correctly parsed by ComponentName.unflattenFromString.
This was needed as part of http://b/
2546173
Change-Id: If34a9273cbcae13a75347be0b6b7ef307134ed40
Dave Sparks [Fri, 2 Apr 2010 01:00:58 +0000 (18:00 -0700)]
Use local lock for most MediaMetadataRetriever methods. Bug
2560834.
MediaMetadataRetriever uses a single static lock for all operations.
This effectively serializes all metadata retrieval operations in a
single process. This patch uses the object level lock for all normal
operations and only uses the static lock to serialize calls to
release.
Change-Id: I81c9f234c2f0007a26d18e1398c709b41a4dbbd7
Charles Chen [Fri, 2 Apr 2010 00:56:47 +0000 (17:56 -0700)]
Merge "Fix for bug
2564771 - pitch setting between apps can interfere with one another." into froyo
Jean-Michel Trivi [Fri, 2 Apr 2010 00:40:58 +0000 (17:40 -0700)]
Fix bug
2565463 Ensure an object cannot appear twice in the
AudioFocus stack.
Enforce parameter check in AudioManager.requestAudioFocus()
Typo correction in AudioService.unregisterMediaButtonEventReceiver()
Change-Id: Iedd6081a2a096bd7effbaeb9f888a31691201b3b
Grace Kloba [Thu, 1 Apr 2010 23:07:30 +0000 (16:07 -0700)]
Instead of holding an ApplicationContext, JWebCoreJavaBridge
will have a reference of the current window's main
WebView. It is only non-null if the WebView's window
has the focus.
Extract setActive() from onWindowFocusChanged() so
that onAttachedToWindow() can call it directly. The
old way has a mis-matching call to onWindowFocusChanged.
Fix http://b/issue?id=
2559152
Charles Chen [Fri, 2 Apr 2010 00:16:28 +0000 (17:16 -0700)]
Fix for bug
2564771 - pitch setting between apps can
interfere with one another.
Root cause was not caching all the params that were needed.
This change fixes that bug as well as related bugs for remembering
the default engine and for making sure that the right engine is
loaded when checking for language availability.
Change-Id: I2a76da8faec8112036e68d27539db444c53a1509
Yu Shan Emily Lau [Thu, 1 Apr 2010 23:10:23 +0000 (16:10 -0700)]
Add the test template for the media audio manager test.
Change-Id: I55b5de0c55dbfded8d972f7378da3c19a613978c
Mike LeBeau [Thu, 1 Apr 2010 22:30:51 +0000 (15:30 -0700)]
Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of b/
2546173" into froyo
Mike LeBeau [Thu, 1 Apr 2010 21:49:58 +0000 (14:49 -0700)]
Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
search (not just for in-app search). Needed as part of http://b/
2546173
Change-Id: I661ff52bace754459651eacd369a19e97364c3c6
Gilles Debunne [Thu, 1 Apr 2010 21:47:00 +0000 (14:47 -0700)]
Merge "Refactor in PositionTesterContextMenuListener." into froyo
Brett Chabot [Thu, 1 Apr 2010 21:36:36 +0000 (14:36 -0700)]
Merge "Remove FrameworkTest package." into froyo
Fred Quintana [Thu, 1 Apr 2010 21:27:00 +0000 (14:27 -0700)]
Merge "allow null authtokens to invalidateAuthToken" into froyo
Fred Quintana [Thu, 1 Apr 2010 18:36:00 +0000 (11:36 -0700)]
allow null authtokens to invalidateAuthToken
Change-Id: I78e91ef2f43503e13386894851f0d781583a4943
http://b/issue?id=
2561519
Brett Chabot [Thu, 1 Apr 2010 18:53:05 +0000 (11:53 -0700)]
Remove FrameworkTest package.
The only remaining test here was RingtonePickerActivityTes, which has been
suppressed since pre-donut.
Change-Id: I74c08c9c9447b67252430db3b462373af879bd1d
Derek Sollenberger [Thu, 1 Apr 2010 18:28:08 +0000 (14:28 -0400)]
Match RFC requirement that the domain portion of a cookie should be case-insensitive.
fixes bug #
2549818.
Change-Id: I1372171568828545e78690f1ddc0ddcf25ddd428
Fred Quintana [Thu, 1 Apr 2010 18:42:28 +0000 (11:42 -0700)]
revert the stripping of System Group:
from the names of google system groups
Change-Id: I677a7abb42a0c3d70d7e7009325f76a4644f1cb1
http://b/issue?id=
2558197
Andreas Huber [Thu, 1 Apr 2010 18:42:50 +0000 (11:42 -0700)]
Support another kind of iso mpeg4 file.
Change-Id: I052aa1c971c577e50679b6a9263acd32895906c7
related-to-bug:
2558114
Gilles Debunne [Fri, 26 Mar 2010 00:46:25 +0000 (17:46 -0700)]
Refactor in PositionTesterContextMenuListener.
The asserts were removed from that class and replaced by a status String object.
This allows ExpandableListTester to do the asserts instead.
These tests passed on a sapphire and passion devices as well as in the emulator.
The asserts in the main thread are expected to make these tests pass during the
continuous build too.
This is
7fbddb1db1beeac7c6762fb7a11612e348f6ff90 cherrypicked to froyo.
http://b/issue?id=
2525846
Dirk Dougherty [Thu, 1 Apr 2010 17:35:21 +0000 (10:35 -0700)]
Merge "doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
James Dong [Thu, 1 Apr 2010 17:33:45 +0000 (10:33 -0700)]
Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
Robert Greenwalt [Thu, 1 Apr 2010 17:19:57 +0000 (10:19 -0700)]
Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
Kristian Monsen [Thu, 1 Apr 2010 16:54:47 +0000 (09:54 -0700)]
Merge "Fix for bug
2558156: Encodig is null" into froyo
Kristian Monsen [Thu, 1 Apr 2010 16:04:27 +0000 (17:04 +0100)]
Fix for bug
2558156: Encodig is null
This does not actually pass the test since the test has wrong expectations, but it is at least doing the right thing.
Change-Id: I7da29a3f101647bb628805514cf2bdef24864e50
Dirk Dougherty [Thu, 25 Mar 2010 23:33:33 +0000 (16:33 -0700)]
doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
Change-Id: I1d2b80b8dc3f8b2e3c1befcbb7c4c522d78a2db8
Dave Sparks [Thu, 1 Apr 2010 00:44:00 +0000 (17:44 -0700)]
Update AMR codec.
Change-Id: I8ecd2712863f6962b762f26898002912d1c77afb
Ben Murdoch [Thu, 1 Apr 2010 15:42:14 +0000 (08:42 -0700)]
Merge changes Ic9531e3c,I3f04433b into froyo
* changes:
Cherry pick from master.
Cherry pick from master.
Steve Block [Thu, 25 Mar 2010 14:48:13 +0000 (14:48 +0000)]
Cherry pick from master.
Fixes DumpRenderTree to re-use HTTP authentication credentials
This is required for layout test http/tests/appcache/auth.html
Bug:
2098423
Change-Id: Ic9531e3c23a2fa9ebfab70cde3172550f572a404
San Mehat [Wed, 31 Mar 2010 21:31:36 +0000 (14:31 -0700)]
NetworkManagementService: Add interface counters & throttle API
Change-Id: I4976549cdbb027ba7859335e69bf866e738961c9
Signed-off-by: San Mehat <san@google.com>
Steve Block [Fri, 26 Mar 2010 09:10:58 +0000 (09:10 +0000)]
Cherry pick from master.
This change forwards to the WebView HTTP authentication credentials that
are supplied to an XHR from JavaScript. This allows the WebView to store these
credentials for use with later requests.
This is a re-working of https://android-git.corp.google.com/g/46430
Bug:
2544330
Change-Id: I3f04433b00233d7b7bf4f7e3471d8d15d8817f93
Grace Kloba [Thu, 1 Apr 2010 15:15:09 +0000 (08:15 -0700)]
Merge "As we don't support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
James Dong [Wed, 31 Mar 2010 20:56:29 +0000 (13:56 -0700)]
Public API changes for CameraProfile and CamcorderProfile classes
1. CamcorderProfile: “@see” links are broken; Remove m prefix from fields; remove “final”
2. CamcorderProfile.Quality: use an int rather than an enum
3. Add API on MediaRecorder to pass in a CamcorderProfile
4. CameraProfile.getImageEncodingQualityLevels @hide or make it consistent with CamcorderProfile
5. Remove a convenient method and instead let the (mms) app do that task
bug -
2553862
Change-Id: I759215c7892f772aeddf3651d17038489c6fbc50
Eric Laurent [Thu, 1 Apr 2010 06:33:52 +0000 (23:33 -0700)]
Merge "Fix isssue
2548710: Native AudioTrack resources never freed." into froyo