OSDN Git Service
Mike Reed [Thu, 25 Mar 2010 18:02:40 +0000 (14:02 -0400)]
update dox that we ignore the exact parameter on computeBounds
Change-Id: I6051210ea2a73b4d1c6cd631a285209ab130b4e5
Amith Yamasani [Wed, 24 Mar 2010 19:43:28 +0000 (12:43 -0700)]
Merge "Asset update for key feedback bubble - removes edge artifact."
Amith Yamasani [Wed, 24 Mar 2010 19:40:19 +0000 (12:40 -0700)]
Asset update for key feedback bubble - removes edge artifact.
Bug:
2511111
Leon Scroggins [Wed, 24 Mar 2010 18:44:04 +0000 (14:44 -0400)]
Do not provide a way to use an AsyncTask from a non main thread.
Fix for http://b/issue?id=
2539948
This public API can be called from any thread, so do not use an
AsyncTask. In a separate changelist, the caller now uses an
AsyncTask instead.
Change-Id: I646950964323f8c749f9aa2176226561c6f2b21f
Dianne Hackborn [Wed, 24 Mar 2010 19:10:31 +0000 (12:10 -0700)]
Merge "Maybe fix #
2422586: Native crash in android_os_Parcel_closeFileDescriptor() killed the phone process"
Patrick Scott [Wed, 24 Mar 2010 18:20:18 +0000 (14:20 -0400)]
Remove old asset.
Change-Id: I5b4bdb6b038bba3eb2f03c6f53541d99fab0bad5
Steve Block [Wed, 24 Mar 2010 16:24:25 +0000 (16:24 +0000)]
Fixes XHR requests to use the username and password supplied from JavaScript
Currently, the browser does not use the credentials supplied from JavaScript.
If a request returns a 401 Unauthorized, the browser always prompts the user.
This violates http://www.w3.org/TR/XMLHttpRequest/#the-send-method
Bug:
2533522
Change-Id: I8e72c1a0be187d193c4ad6b2ca8a624c7ae06fa1
Steve Block [Wed, 24 Mar 2010 18:07:59 +0000 (11:07 -0700)]
Merge "Fixes synchronous XHR requests which require authentication to complete synchronously"
Andreas Huber [Wed, 24 Mar 2010 18:05:46 +0000 (11:05 -0700)]
Merge "Enable early termination of the prefetcher's preparation phase."
Steve Block [Wed, 24 Mar 2010 16:41:31 +0000 (16:41 +0000)]
Fixes synchronous XHR requests which require authentication to complete synchronously
Bug:
2540515
Change-Id: I58eebdf2db9388f66c75d86dc26b8055f513b038
Brad Fitzpatrick [Wed, 24 Mar 2010 05:22:16 +0000 (22:22 -0700)]
Log database lock contention as well (as seperate pseudo-queries).
This also makes the 500ms logging threshold (over which is always
logged, and under which is sub-sampled) configurable via a
SystemProperty, which is mostly useful for interactive debugging when
lock contention is suspected, but could also be useful in the future
as a quick way to adjust this threshold for dogfooders, without code
changes.
Change-Id: I769069d8d870331d89a4aa3239ba50db806fe4d4
Suchi Amalapurapu [Wed, 24 Mar 2010 17:43:59 +0000 (10:43 -0700)]
Merge "Clean up stale containers if needed at install time. This is needed when restoring applications installed on sdcard via Market after a data wipe. The stale containers need to be cleaned up before reinstalling again. Add a test case for installing when a stale container exists."
Fred Quintana [Wed, 24 Mar 2010 17:39:28 +0000 (10:39 -0700)]
Merge "fix bug where sync settings set lost upon upgrade from donut and eclair to froyo"
Fred Quintana [Wed, 24 Mar 2010 00:57:03 +0000 (17:57 -0700)]
fix bug where sync settings set lost upon upgrade from donut and eclair
to froyo
- intepret a missing syncavble attribute from donut as "unsynced"
rather than the traditional "true"
- copy the sync settings from the authorities "contacts" and "calendar"
to "com.android.contacts" and "com.android.calendar" if the latter
don't already have settings
- delay the database cleanup until after boot completed, which will give
the GoogleLoginService accounts migration code a chance to run; this
was causing all the settings to get removed upon a donut to froyo upgrade
Change-Id: I8795e97ba0c9b930d1a50784229ca9ab15dff9d2
http://b/issue?id=
2531359
Suchi Amalapurapu [Wed, 24 Mar 2010 16:27:19 +0000 (09:27 -0700)]
Clean up stale containers if needed at install time.
This is needed when restoring applications installed on sdcard
via Market after a data wipe. The stale containers need to be cleaned up before
reinstalling again.
Add a test case for installing when a stale container exists.
Change-Id: I20c30b3003e85fb31531dd3cf9cb59962fe8fe5f
Vasu Nori [Wed, 24 Mar 2010 17:11:19 +0000 (10:11 -0700)]
Merge "when corruption occurs, log a warning before closing db"
Mike Lockwood [Wed, 24 Mar 2010 16:53:03 +0000 (09:53 -0700)]
Merge "Wait until GpsLocationProvider is fully initialized before returning from the constructor."
Mike Reed [Wed, 24 Mar 2010 16:45:58 +0000 (09:45 -0700)]
Merge "If we detect a 9patch chunk, force the config chooser to avoid 565, with its pre-dithering madness"
Andreas Huber [Wed, 24 Mar 2010 16:24:40 +0000 (09:24 -0700)]
Enable early termination of the prefetcher's preparation phase.
Change-Id: I929ac9b0fd0b6ebd98c1bc56be18ac8f8378d48c
related-to-bug:
2537407
Mike Lockwood [Wed, 24 Mar 2010 14:14:55 +0000 (10:14 -0400)]
Wait until GpsLocationProvider is fully initialized before returning from the constructor.
Otherwise we are left with a race condition that might result in the provider
being called before it is ready.
BUG:
2539392
Change-Id: I05f4a2501c43d5fa95c0e68f5a963015cf9c6e8f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Suchi Amalapurapu [Wed, 24 Mar 2010 15:34:31 +0000 (08:34 -0700)]
Merge "Add new activity manager method to get list of running applications installed on sdcard. Use new method in UsbStorageActivity. Fix moving dex files. moveDex should be suffixed with LI since it uses Installer"
Leon Scroggins [Tue, 23 Mar 2010 19:39:46 +0000 (15:39 -0400)]
If failUrl(now historyUrl) is null, use "about:blank" instead of "".
This prevents a crash that is caused by calling
WebView.loadDataWithBaseUrl with a null failUrl (which I have renamed
to historyUrl). Also update the docs to be more accurate.
Fixes the general case of bug
2522457
Change-Id: I832351ce1e0016b00e924a2f9b0097ae15fba34a
Mike Reed [Wed, 24 Mar 2010 14:08:50 +0000 (10:08 -0400)]
If we detect a 9patch chunk, force the config chooser to avoid 565, with its pre-dithering madness
Change-Id: I0a2d1b094ccb16d479524779acec0216dc7a80ee
Leon Clarke [Wed, 24 Mar 2010 12:09:53 +0000 (05:09 -0700)]
Merge "Fix for when flash loads cached crossdomain.xml files. Cache the x-permitted-cross-domain-policies header. b/issue?id=
2519669"
Dianne Hackborn [Wed, 24 Mar 2010 05:10:55 +0000 (22:10 -0700)]
Maybe fix #
2422586: Native crash in android_os_Parcel_closeFileDescriptor()
killed the phone process
Try to make sure we never have a ParcelFileDescriptor with a null
FileDescriptor. That is just wrong.
Change-Id: Ib779ad1852dd239827797cd8f93505bfe6157e58
Jack Palevich [Wed, 24 Mar 2010 04:20:42 +0000 (21:20 -0700)]
Merge "GLSurfaceView: Log egl failures"
Mathias Agopian [Wed, 24 Mar 2010 03:17:13 +0000 (20:17 -0700)]
Merge "another small step towards fixing [
2501808] sapphire: OOM in GPU Surface area"
Neal Nguyen [Wed, 24 Mar 2010 01:31:26 +0000 (18:31 -0700)]
Merge "Adding some automated tests for apps on SD (and their corresponding apps)."
Neal Nguyen [Mon, 22 Mar 2010 20:14:25 +0000 (13:14 -0700)]
Adding some automated tests for apps on SD (and their corresponding apps).
Change-Id: I3af1a2d8fb658087c6945b2eb2b4233becb6053f
Jack Palevich [Tue, 23 Mar 2010 22:22:03 +0000 (15:22 -0700)]
GLSurfaceView: Log egl failures
Decode the EGL error code when throwing exceptions.
Mathias Agopian [Tue, 23 Mar 2010 23:44:27 +0000 (16:44 -0700)]
another small step towards fixing [
2501808] sapphire: OOM in GPU Surface area
release the Surface in SurfaceView when it's not visible, after it comes back from relayout(),
it should not be holding buffers at this point, but it's cleaner to have it in the released state.
also log a warning in Surface.finalize() when there is work to do, as it means Surface.release() wasn't
called when it should have.
Change-Id: Id637d4ec2916d8fd800b0344d8dec6cecce02051
Adam Powell [Wed, 24 Mar 2010 00:40:02 +0000 (17:40 -0700)]
Merge "Fix bug
2531732 - DateTimeView explodes on bad system date format."
Adam Powell [Wed, 24 Mar 2010 00:32:41 +0000 (17:32 -0700)]
Fix bug
2531732 - DateTimeView explodes on bad system date format.
Fall back to a default date format instead of throwing an exception.
Change-Id: I827a81d9610ea7f9243c1c33579e7a5d3b423692
Christopher Tate [Wed, 24 Mar 2010 00:26:09 +0000 (17:26 -0700)]
Merge "Return the right thing from Context.getApplicationContext()"
Christopher Tate [Wed, 24 Mar 2010 00:14:36 +0000 (17:14 -0700)]
Return the right thing from Context.getApplicationContext()
Previously, this would always return the app context for the first application
ever instantiated in the process. Usually this is fine, since usually there
will be one process per application, but in the case of shared-process apps,
it causes activities/views to try to access the wrong set of resources, be
unable to access their proper derived-class Application objects, etc.
Fixes bug #
2513901
Change-Id: Ie19f2a86583c5d927db4d84a4262077450e37539
Suchi Amalapurapu [Tue, 23 Mar 2010 17:34:28 +0000 (10:34 -0700)]
Add new activity manager method to get list of running applications installed on sdcard.
Use new method in UsbStorageActivity.
Fix moving dex files.
moveDex should be suffixed with LI since it uses Installer
Change-Id: Id5ef0254578e84b9aae2c2ac44f722eb5a0fda1c
Dianne Hackborn [Tue, 23 Mar 2010 23:44:48 +0000 (16:44 -0700)]
Merge "Fix issue #
2538211: system server crash"
Adam Powell [Tue, 23 Mar 2010 23:40:36 +0000 (16:40 -0700)]
Merge "Make WebView scroll bars compress during overscroll."
Adam Powell [Tue, 23 Mar 2010 22:15:44 +0000 (15:15 -0700)]
Make WebView scroll bars compress during overscroll.
Change-Id: Ia0caaf67088134efa78b5a0c87fea7a9be93f467
Dianne Hackborn [Tue, 23 Mar 2010 23:34:20 +0000 (16:34 -0700)]
Fix issue #
2538211: system server crash
Change-Id: Ib440650129ca35e25c8c770113af21fef239178d
ClassCastException: com.android.internal.widget.PointerLocationView
Mathias Agopian [Tue, 23 Mar 2010 23:29:03 +0000 (16:29 -0700)]
Merge "one step toward fixing [
2501808] sapphire: OOM in GPU Surface area"
Vasu Nori [Tue, 23 Mar 2010 18:41:44 +0000 (11:41 -0700)]
when corruption occurs, log a warning before closing db
and database.close() should NOT set mPath to null.
a few other minor changes included in this CL
1. if it is memory database, no need to delete any file
2. if 2 threads are sharing the same connection, and if corruption occurs
on it, one thread closes the db and deletes db - while the other
thread is still using it. this can cause SQLITE_MISUSE error.
to prevent this, every method in SQLiteDatabse should make sure
db is open before exec'ing sql statements. bug:
2531172
Change-Id: I4cb5ab8539f46d7f8b26c3f830d799adf46444b6
Xia Wang [Tue, 23 Mar 2010 22:37:32 +0000 (15:37 -0700)]
Merge " * Move connectivity manager test closer to source. * Add license header to java files * Remove google related information from the test"
Andreas Huber [Tue, 23 Mar 2010 22:34:18 +0000 (15:34 -0700)]
Merge "Clear the local prefetcher strong reference before signalling that prepare() was cancelled early in order to avoid a race condition that occasionally triggered an assertion from the main thread."
Mathias Agopian [Tue, 23 Mar 2010 22:31:21 +0000 (15:31 -0700)]
one step toward fixing [
2501808] sapphire: OOM in GPU Surface area
when a surface was returned from a remote process through the binder we
would leak its resources until a GC happened.
implement writeToParcel to release the source when PARCELABLE_WRITE_RETURN_VALUE
is set
Change-Id: I6a9fa369b0d164a9ca1229b8a2944d3c132a3720
Andreas Huber [Tue, 23 Mar 2010 22:30:57 +0000 (15:30 -0700)]
Clear the local prefetcher strong reference before signalling that prepare() was cancelled early in order to avoid a race condition that occasionally triggered an assertion from the main thread.
Change-Id: I0db198fe5fd0fbe9a6c90a8e5924a2df05432c4c
related-to-bug:
2538486
Xia Wang [Tue, 23 Mar 2010 19:17:06 +0000 (12:17 -0700)]
* Move connectivity manager test closer to source.
* Add license header to java files
* Remove google related information from the test
Change-Id: I2e57960f9ac963cdf3591385e21ed68832f74bd0
Adam Powell [Tue, 23 Mar 2010 21:10:50 +0000 (14:10 -0700)]
Adam Powell [Tue, 23 Mar 2010 21:10:00 +0000 (14:10 -0700)]
Adam Powell [Tue, 23 Mar 2010 20:47:19 +0000 (13:47 -0700)]
Fix bug
2537626.
Awaken scroll bars in onOverscrolled instead of based on the timing
reported by the Scroller's animation.
Change-Id: I8510b92b9fdf471fc8d6f8f089681eb23d10f190
Patrick Scott [Mon, 22 Mar 2010 14:20:45 +0000 (10:20 -0400)]
Add on-demand setting for plugins.
Deprecate the old apis for enabling plugins in favor of the multi-state plugin
flag. Add the assets for WebView to display the plugin placeholder for on-demand
plugins.
Bug:
2411524
Change-Id: I5a35cc6d0afced1489f54d4dcb8bb92d36de52d8
Adam Powell [Tue, 23 Mar 2010 20:29:34 +0000 (13:29 -0700)]
Fix bug
2495033.
AutoCompleteTextView now uses different logic to expand the dropdown
list of completion choices to cover the IME if present. Previously
this would happen whenever a touch down event occurred. Resizing the
dropdown could cause the parent view to animate a scroll and thereby
move the completion list up the screen. When this happened with a
finger down it would initiate a touch scroll on the completion
list. Prior to froyo this wasn't a problem since a list positioned at
the top could not scroll up, but with the addition of overscroll this
caused undesired behavior.
The completion list now will not expand to cover the IME on initial
touch down. Instead it will only expand if the user leaves a finger in
place for the duration of a timeout (currently 250ms) or if the user
explicitly begins a touch scroll on the completion list. This also has
a nice side effect where tapping a completion choice in the initial,
smaller list does not cause a split-second list expansion before the
list is dismissed.
Change-Id: If0994c68a91b3bfc3dcef660c67fde667a9727f9
Vasu Nori [Tue, 23 Mar 2010 20:03:43 +0000 (13:03 -0700)]
Merge "print finalizer warning before closing the cursor in finalize"
Romain Guy [Tue, 23 Mar 2010 19:44:13 +0000 (12:44 -0700)]
Merge "Correctly bind spinner data to TextView. Bug code.google.com/p/android/issues/detail?id=7251"
Romain Guy [Tue, 23 Mar 2010 19:42:51 +0000 (12:42 -0700)]
Correctly bind spinner data to TextView.
Bug http://code.google.com/p/android/issues/detail?id=7251
Previously, a spinner using checkable list items would try to bind data as booleans
instead of text. This change takes this use case into account.
Change-Id: Ie4ced01e3c0235138e1dd68426d6a748c2843a9c
Derek Sollenberger [Tue, 23 Mar 2010 19:35:35 +0000 (12:35 -0700)]
Merge "fixing problem with allocating too much memory to a surface by fixing the size of the surface when it exceeds a threshold and resizing the surface when it falls beneath the threshold."
Patrick Scott [Tue, 23 Mar 2010 19:34:53 +0000 (12:34 -0700)]
Merge "Fix rebuilding of these two apks."
Derek Sollenberger [Mon, 22 Mar 2010 20:11:38 +0000 (16:11 -0400)]
fixing problem with allocating too much memory to a surface by fixing
the size of the surface when it exceeds a threshold and resizing the
surface when it falls beneath the threshold.
This change also causes the surface to fix its size while it is
being zoomed in order to prevent the surface from getting multiple
surfaceChangedEvents as the result of a zoom. This also allows us
to have a smooth zoom animation for the surface.
Change-Id: I30e208f98d3a32660032bf1df9de77d0a813d756
Gilles Debunne [Tue, 23 Mar 2010 01:41:18 +0000 (18:41 -0700)]
New edge effect when OverScrolled.
The constant force that was applied has been replaced by a spring force
when the OverScroller goes beyond valid position values.
Bounce coefficient can be set for each directions.
Change-Id: If7d506d3f35b3451f590c54d6c04a1deb8d9ca95
Vasu Nori [Tue, 23 Mar 2010 17:17:48 +0000 (10:17 -0700)]
print finalizer warning before closing the cursor in finalize
this will let us know which cursor is being finalized.
if the heapworker gets wedbed due to the close bug:
2536922
then we will never see the warning and never know which cursor
caused this problem
Change-Id: I595cc1014ff7a1114079b33665c092c6a2f3a907
Dianne Hackborn [Tue, 23 Mar 2010 18:54:09 +0000 (11:54 -0700)]
Merge "Improve switching to car mode, retain night mode option."
Dianne Hackborn [Tue, 23 Mar 2010 18:53:12 +0000 (11:53 -0700)]
Merge "Don't use dim behind for the search box."
Dianne Hackborn [Tue, 23 Mar 2010 18:52:14 +0000 (11:52 -0700)]
Merge "Fix bug where group IDs were not being assigned during boot."
Dianne Hackborn [Tue, 23 Mar 2010 18:49:59 +0000 (11:49 -0700)]
Fix bug where group IDs were not being assigned during boot.
Change-Id: Ic735e98b106932eef2c2458d73fa016274fd796f
Jean-Baptiste Queru [Tue, 23 Mar 2010 18:49:54 +0000 (11:49 -0700)]
Merge "Make DownloadBase public"
Jean-Baptiste Queru [Tue, 23 Mar 2010 18:37:15 +0000 (11:37 -0700)]
Make DownloadBase public
It's the base class for some public classes, so it needs to be public
as well according to the CTS rules.
Bug:
2537352
Change-Id: Ie2f8141d56907e1d0f4a3a040204b7b14d1fd79a
Leon Clarke [Tue, 23 Mar 2010 18:35:04 +0000 (18:35 +0000)]
Fix for when flash loads cached crossdomain.xml files.
Cache the x-permitted-cross-domain-policies header.
http://b/issue?id=
2519669
San Mehat [Tue, 23 Mar 2010 18:25:31 +0000 (11:25 -0700)]
Merge "Asec: Add new 'StorageNotFound' response code handling for container paths"
Daniel Lehmann [Tue, 23 Mar 2010 03:35:02 +0000 (20:35 -0700)]
Small speedup in getAsString and comment fix
Change-Id: I19744983bbc0f4b9060de326bd539137e373415b
San Mehat [Tue, 23 Mar 2010 18:12:52 +0000 (11:12 -0700)]
Asec: Add new 'StorageNotFound' response code handling for container paths
Change-Id: I45d113f77b9f0e519087356b70fc6c4b5c290935
Signed-off-by: San Mehat <san@google.com>
Mike Lockwood [Tue, 23 Mar 2010 17:53:25 +0000 (10:53 -0700)]
Merge "LocationTracker: Fix default values for debug and signal strength logging."
Dianne Hackborn [Tue, 23 Mar 2010 17:38:46 +0000 (10:38 -0700)]
Don't use dim behind for the search box.
This causes ugly artifacts, such as when dismissing, the full white
completions window disappears into the dimmed background and then
the dimmed background immediately starts undimming. Likewise when
being displayed, the content behind dims down and then the full
white completions window appears on top.
Change-Id: Id33fb7a172796412143d84e4b3d8915624565f7d
Suchi Amalapurapu [Tue, 23 Mar 2010 17:27:51 +0000 (10:27 -0700)]
Merge "Don't delete stale containers on sdcard. Comment out flaky test"
Vasu Nori [Tue, 23 Mar 2010 17:16:38 +0000 (10:16 -0700)]
Merge "close SQLiteStatement objects in finally block"
Mike Lockwood [Tue, 23 Mar 2010 16:27:38 +0000 (12:27 -0400)]
LocationTracker: Fix default values for debug and signal strength logging.
Set default to false to match the checkbox values in the preference resource.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Suchi Amalapurapu [Tue, 23 Mar 2010 16:46:22 +0000 (09:46 -0700)]
Don't delete stale containers on sdcard.
Comment out flaky test
Change-Id: Ic7da6421c1a1980c19f7f1c929976432245479fa
Robert Greenwalt [Tue, 23 Mar 2010 16:52:07 +0000 (09:52 -0700)]
Merge "Fix Tethering when DUN is required but wifi is ok"
Mike Reed [Tue, 23 Mar 2010 15:51:11 +0000 (11:51 -0400)]
refresh from ascender, w/ hints
Change-Id: I50e56741c5c808257f00bc274ea608f64b3a737f
Patrick Scott [Tue, 23 Mar 2010 15:41:05 +0000 (11:41 -0400)]
Fix rebuilding of these two apks.
Add a dummy string so that a R.stamp file will be written.
Change-Id: I939f97d2d4214e2c2186c3802b606c8bfd0e3468
Mike Reed [Tue, 23 Mar 2010 14:29:37 +0000 (10:29 -0400)]
only send new visiblerect and size on onscrollchanged if we're not in overscroll mode
Change-Id: Ifa290121db8f0a3612f40c40bab4f92494ce93df
Kenny Root [Tue, 23 Mar 2010 15:07:47 +0000 (08:07 -0700)]
Merge "Compact when NativeDaemonConnector hits buffer limit"
Mike Lockwood [Tue, 23 Mar 2010 11:54:18 +0000 (04:54 -0700)]
Merge "GpsLocationProvider: Do our work in a Handler running in a separate thread."
Kenny Root [Tue, 23 Mar 2010 06:18:52 +0000 (23:18 -0700)]
Merge "Advance encodedKeySearchIndex if encodedKey matches a suffix of a parameter."
satok [Tue, 23 Mar 2010 05:40:10 +0000 (22:40 -0700)]
Merge "Call super.close() in MargeCursor"
Dianne Hackborn [Mon, 22 Mar 2010 18:12:48 +0000 (11:12 -0700)]
Fix issue #
2530103: ActivePassword data in Device Policy Manager needs to be persisted
Also fixes how the quality vs. mode is handled to be more consistent, which also
required introducing a new "alphabetic" quality since it is possible for the user
to enter such a password.
The current password quality and length is stored in the DPM, since at boot it
couldn't figure this out from the stored password.
Change-Id: I519d9b76dd0b4431bcf42920c34dda38c9f1136e
Dianne Hackborn [Tue, 23 Mar 2010 04:49:15 +0000 (21:49 -0700)]
Improve switching to car mode, retain night mode option.
Fiddle with how we go into car mode to try to ensure we get a clean
transition. Also have the system take care of remembering the night
mode setting so it will stay at what you want.
Change-Id: Icb94fdd961c7a192f7707ec71544485a1ea12455
satok [Fri, 19 Mar 2010 12:02:37 +0000 (21:02 +0900)]
Call super.close() in MargeCursor
Bug:
2524465
Change-Id: I1927940b4e3a9417b36ec6169da00475662b6004
Romain Guy [Tue, 23 Mar 2010 02:08:22 +0000 (19:08 -0700)]
Merge "Improve export to bitmap layers for HierarchyViewer."
Romain Guy [Tue, 23 Mar 2010 01:58:21 +0000 (18:58 -0700)]
Improve export to bitmap layers for HierarchyViewer.
- Do not show layers with an invisible parent
- Correctly draw extras from dispatchDraw() (ListView's dividers for instance)
Change-Id: Id2e24ae9d52879290dffbf1cc446c5eda9522fbb
Dianne Hackborn [Tue, 23 Mar 2010 01:19:10 +0000 (18:19 -0700)]
Merge "Fix restoring of permissions after a reboot."
Dianne Hackborn [Tue, 23 Mar 2010 01:08:07 +0000 (18:08 -0700)]
Fix restoring of permissions after a reboot.
It turns out the whole loadedPermissions thing was pointless at this
point, and causing the problem: we would write out the granted
permissions, then at boot load them into loaded permissions, and
never actually put them in granted.
Just remove loadedPermissions. The grantedPermissions (that is
the permissions the user has approved be granted to the app) are
all we care about.
Change-Id: I54d9dc418d6277ae0b35b8c1fc4b9c11f34f86f0
Kenny Root [Tue, 23 Mar 2010 01:02:45 +0000 (18:02 -0700)]
Compact when NativeDaemonConnector hits buffer limit
If NativeDaemonConnector hits its buffer limit, it would truncate the
data and lose some information. This change compacts the buffer and then
retries to read the rest of the data.
Change-Id: I0d5fee097bdd6808212ef3ad6fb4abbc6310fd4a
Shimeng (Simon) Wang [Tue, 23 Mar 2010 00:21:48 +0000 (17:21 -0700)]
Merge "Check mWebViewCore to prevent potential NPE."
Shimeng (Simon) Wang [Tue, 23 Mar 2010 00:06:17 +0000 (17:06 -0700)]
Check mWebViewCore to prevent potential NPE.
Bug:
2532493
Change-Id: I917c57dced8638f36252638bb9814e26cdbc2768
Irfan Sheriff [Mon, 22 Mar 2010 21:55:34 +0000 (14:55 -0700)]
Use a single mWifiState instance
mWifiState was split up to speed up access
of wifi state when things are synchronized.
Use a single atomic state variable throughout.
Change-Id: I345981e3ffa3d2b0b7e70a5c6efc43185cba9062
The Android Open Source Project [Mon, 22 Mar 2010 22:55:38 +0000 (15:55 -0700)]
merge from open-source master
Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e
Eric Laurent [Mon, 22 Mar 2010 22:48:42 +0000 (15:48 -0700)]
Merge "Fix issue
2472495: Phone cannot be set to silent mode via volume keys while Driveabout is taking."
Jake Hamby [Mon, 22 Mar 2010 22:47:37 +0000 (15:47 -0700)]
Merge "Fix some typos and logging of calls to CDMA methods."
Eric Laurent [Sat, 20 Mar 2010 03:02:21 +0000 (20:02 -0700)]
Fix issue
2472495: Phone cannot be set to silent mode via volume keys while Driveabout is taking.
The problem is that AudioService.adjustStreamVolume() only handles the ringer mode change when the
STREAM_RING volume changes from 1 to 0 or 0 to 1. If another stream is soloed, the STREAM_RING stream
volume is forced to 0 and then never transits from 0 to 0 when volume down key is pressed.
The fix consists in considering the saved value instead of current value when ajusting or setting
the volume of a muted stream: only the saved value is adjusted too, leaving the stream muted but updating
the value that will be restored when it will be unmuted.
Also changed implementation of stream volume control by setRingerModeInt() to use stream mute feature
instead of direct volume control.
Change-Id: Id85d76450b36d61a0fe8195eb4bffe63ffbd427c
Robert Greenwalt [Mon, 22 Mar 2010 17:35:53 +0000 (10:35 -0700)]
Fix Tethering when DUN is required but wifi is ok
If the phone is configured to require a DUN connection when on mobile but also accepts
wifi upstream connections, there was a bug in the logic and you'd be left with no
upstream connection.
bug:
2533914
Change-Id: I30d44764f578be4cf2c29ee90d39e8563dda06fb