20447 Commits

Author SHA1 Message Date
Dianne Hackborn
85f2c9ce5a 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
2010-03-22 22:20:26 -07:00
Dianne Hackborn
2ccda4dc8d 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
2010-03-22 21:49:15 -07:00
satok
f68258f454 Call super.close() in MargeCursor
Bug: 2524465
Change-Id: I1927940b4e3a9417b36ec6169da00475662b6004
2010-03-23 11:15:28 +09:00
Romain Guy
1a26c9aa0b Merge "Improve export to bitmap layers for HierarchyViewer." 2010-03-22 19:08:22 -07:00
Romain Guy
65554f2785 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
2010-03-22 18:58:21 -07:00
Dianne Hackborn
464bf23688 Merge "Fix restoring of permissions after a reboot." 2010-03-22 18:19:10 -07:00
Dianne Hackborn
f657b63c1c 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
2010-03-22 18:08:07 -07:00
Kenny Root
961aa8c887 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
2010-03-22 18:02:45 -07:00
Shimeng (Simon) Wang
c021e02fd4 Merge "Check mWebViewCore to prevent potential NPE." 2010-03-22 17:21:48 -07:00
Shimeng (Simon) Wang
4d8ef42003 Check mWebViewCore to prevent potential NPE.
Bug:2532493
Change-Id: I917c57dced8638f36252638bb9814e26cdbc2768
2010-03-22 17:06:17 -07:00
Irfan Sheriff
49de491379 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
2010-03-22 16:13:07 -07:00
The Android Open Source Project
02034d3568 merge from open-source master
Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e
2010-03-22 15:55:38 -07:00
Eric Laurent
19eca316ca Merge "Fix issue 2472495: Phone cannot be set to silent mode via volume keys while Driveabout is taking." 2010-03-22 15:48:42 -07:00
Jake Hamby
23007a0f9b Merge "Fix some typos and logging of calls to CDMA methods." 2010-03-22 15:47:37 -07:00
Eric Laurent
5b4e654d0c 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
2010-03-22 15:46:58 -07:00
Robert Greenwalt
77e638dee8 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
2010-03-22 15:28:09 -07:00
Jake Hamby
633dfb6da6 Fix some typos and logging of calls to CDMA methods.
Fixed some comment typos and cleaned up logging of unexpected calls to
CDMA-specific methods on a non-CDMA device.

Change-Id: Ia6e5fba765122cbf3186fd9fecca7a3931a76dcc
2010-03-22 14:41:43 -07:00
Mike Lockwood
92e77dd718 Merge "Improve wakelock debugging:" 2010-03-22 14:28:36 -07:00
Romain Guy
38390b4592 Merge "Fix possible NPE in AdapterView's OnItemClickListener clients. Bug #2533718" 2010-03-22 14:20:15 -07:00
Romain Guy
45b3dcd07e Fix possible NPE in AdapterView's OnItemClickListener clients.
Bug #2533718

Change-Id: I32e72e29a7b4bb8331f2492f5c5b5507d1b3993a
2010-03-22 14:12:43 -07:00
Mike Lockwood
f5bd092b50 Improve wakelock debugging:
Throw NullPointerException if tag is null in PowerManager.newWakelock()
Print wakelock owner's uid and pid in dumpsys power output.

BUG: 2522675

Change-Id: I462c7f8c49f9896b2f58cef5a678ebd2c062a8f7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-03-22 17:10:15 -04:00
Vasu Nori
89206fdb3b close SQLiteStatement objects in finally block
unclosed SQLiteStatement objects cause finalizer warnings.
nix them by closing this object in finally block.

Change-Id: Iea86ff169f935bb743aa0c32aa4aeb0cb4fcd4ad
2010-03-22 14:05:38 -07:00
Jean-Michel Trivi
d6e2cb0525 Merge "Unhide the MediaButton receiver API in android.media.AudioManager" 2010-03-22 13:59:09 -07:00
Ben Murdoch
5b494c1ca4 Add an API on the Java side to allow WebKit to pause the current load. This is used when the plugin is streaming data but it's
buffer is full. In that case, WebCore instructs the laoder to pause loading to give the plugin a chance to clear it's buffer and
continue.

Requires an external/webkit change.

Change-Id: Iec96a6325d92e979cbdc53289c2a20cad940ded2
2010-03-22 20:50:16 +00:00
Jean-Michel Trivi
bbbb1dc3c3 Unhide the MediaButton receiver API in android.media.AudioManager
Change-Id: Ic9222b0bf6e2ff481c6aa5f16ac0259fa7a52355
2010-03-22 13:49:30 -07:00
Leon Scroggins
0fc140431d Close Cursors in finally blocks.
Fix for http://b/issue?id=2533750

Change-Id: I3ebcc6147e4035ce1c4bf6b76a359ce14196e357
2010-03-22 16:33:07 -04:00
Mathias Agopian
a2d776b2d3 Merge "Updated to WMM2010" 2010-03-22 13:17:50 -07:00
Derek Sollenberger
2f47989f65 Merge "Adding a hidden method to check if a surface is fixed in size." 2010-03-22 13:10:50 -07:00
Kenny Root
f030462c83 Make trying to remount an asec container non-fatal
If an asec container is already mounted for some reason, start tracking
it in the MountService's internal state and tell the caller we had
success mounting the secure container.

Change-Id: I5bb0f84b2bafc0cd2dba248c35a8d68fd53ef1b2
2010-03-22 13:08:52 -07:00
Brad Fitzpatrick
a990ef3abf Merge "Make getting wifi state lockless." 2010-03-22 12:49:25 -07:00
Mike Lockwood
62a8fc159a GpsLocationProvider: Do our work in a Handler running in a separate thread.
To avoid adding a new thread to the system, we take the functionality that was
in GpsNetworkThread for downloading NTP time and XTRA data and include this in
the new thread as well.

BUG: 2531728

Change-Id: I2a26b7f0aae0c60faceb36dc6bc29c915c039ae6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-03-22 15:14:31 -04:00
Brad Fitzpatrick
90dd21eff5 Make getting wifi state lockless.
Previous it was synchronized on the same lock that was held while
transitioning wifi states, effectively making it impossible to ever
find out about such states, and worse: making calls during transitions
block.

This manifested itself in a really laggy power control widget, which
I'm working on fixing in general in a separate change.

Change-Id: Ia34af98c73d7f5662e41360a213df87f6adaf130
2010-03-22 12:08:26 -07:00
Marco Nelissen
47b464a92b Merge "Fix Tabwidget copy/paste bug." 2010-03-22 12:03:37 -07:00
Mark Wagner
437e59a220 Merge "null check" 2010-03-22 11:51:51 -07:00
Mark Wagner
b054f27536 null check
Change-Id: I3ee3efb8588a5b6b7368b8c5b0e43a07d1427ad8
2010-03-22 11:43:24 -07:00
Derek Sollenberger
7179b8133d Adding a hidden method to check if a surface is fixed in size.
Change-Id: I5d719d436aa1475dfb25f26c258a6f417a9b5c1c
2010-03-22 14:27:35 -04:00
Marco Nelissen
db54ea0fb6 Fix Tabwidget copy/paste bug.
Change-Id: I8e75ec65353748ec794862cfb0e76653ba4fc428
2010-03-22 11:20:48 -07:00
Xia Wang
6460d6e7b9 Merge "Add connectivity manager automation test framework: - Create a dummy activity - ConnectivityManagerTestActivity - to listen to broadcast from connectivity manager, to control wifi, and to verify that connectivity information for different network types. This framework will be used for funcitonal tests and stress tests." 2010-03-22 11:16:16 -07:00
Marco Nelissen
8dfdf46fbf Merge "Fix javadoc copy/paste error." 2010-03-22 11:14:38 -07:00
Nick Kralevich
85861c7a6f Merge "Unittests for EntropyService. Make EntropyService more testable." 2010-03-22 11:14:25 -07:00
Marco Nelissen
189f65c12f Fix javadoc copy/paste error.
Change-Id: I6a504176e96b8dc54356305cc00acfe3d1e5b1ed
2010-03-22 10:59:00 -07:00
Suchi Amalapurapu
e99bb5f10b Add new method call back in MountService.
PackageManager invokes this call back when its done handling
the media status update.
Add new uid check for updateExternalMediaStatus
Change killPids method in ActivityManager.
Remove mountsd command in Pm.java We cannot arbitrarily enable/disable
packages in PackageManager now.

Change-Id: I28dcba4afd2b4486f68abdaa1628a31b66544c91
2010-03-22 10:49:49 -07:00
San Mehat
cbf953ed09 Permissions: Change ASEC permissions from 'dangerous' -> 'signature'
Change-Id: I5e495332c45f718178486f2e07d37031e6fa5afc
Signed-off-by: San Mehat <san@google.com>
2010-03-22 10:31:12 -07:00
San Mehat
7897d1b615 Merge "MountService: Handle volumes shared on startup" 2010-03-22 10:30:27 -07:00
San Mehat
6a25440323 MountService: Handle volumes shared on startup
Change-Id: I7c38607adee7c89f27c24285a7ace2b9c87e7f30
Signed-off-by: San Mehat <san@google.com>
2010-03-22 10:21:00 -07:00
Brad Fitzpatrick
2e805b19cd Grammar fixes.
Change-Id: I77672d2260c26aee146bb6a853137c14e3db1f28
2010-03-22 10:10:51 -07:00
Cary Clark
ac96fa575f use the stream instead of the cursor data to return its size
Most content providers set up the data size in the cursor that
provides the file name, but sound recorder does not. Use the
stream size instead, which will work with all sources and
probably is no slower.

fixes http://b/2529352 http://b/2524574

Change-Id: I32d101d07ca1d0fa2ff17c3c68393356902096d3
2010-03-22 11:12:46 -04:00
Nick Pelly
82d8b2806b Merge "Everytime Bluetooth was turned off two file descriptors were not closed" 2010-03-22 07:07:15 -07:00
Steve Block
fb0de34a47 Implements layoutTestController.overridePreference()
This change provides the infrastructure for
layoutTestController.overridePreference(). Currently, we only provide an
implementation for the preference 'WebKitOfflineWebApplicationCacheEnabled',
which is required by the layout test http/tests/appcache/disabled.html.

Change-Id: I8552f2f4e23b982db2d067ffa20c052e56d8fb7f
2010-03-22 10:52:56 +00:00
Steve Block
cd90b15cb8 Removes most remaining appcache layout tests from the DumpRenderTree ignoreResults list
The server serving the layout tests has now been updated to to reflect the
current version of WebKit (r54731) so serveral more tests now pass.

Change-Id: I95afa0012bf3fed15c733b0317ecd4c03f7a158f
2010-03-22 10:52:56 +00:00