Commit Graph

5749 Commits

Author SHA1 Message Date
Jason Simmons
4fbb071fe8 resolved conflicts for merge of 661cd52e to ics-aah
Change-Id: I5eb4154ab969a5367e9f597595c09b5e499174d0
2011-08-22 16:39:16 -07:00
Dianne Hackborn
661cd52e0e Add progress dialog for booting after an upgrade.
This introduces a new facility for code during the boot process
to display messages to the user through a progress dialog.  This
is only for use when performing longer-than-usual post-upgrade
operations such as running dexopt on applications or upgrading
databases.

Change-Id: I0e78439ccec3850fb67872c22f235bf12a158dae
2011-08-22 13:42:05 -07:00
Jim Miller
78ba791878 am 95254800: Merge "Fix 4993068: Don\'t check password history when dpm sets the password"
* commit '9525480021e5f9385293a9e88fab40a2343fdbe8':
  Fix 4993068: Don't check password history when dpm sets the password
2011-08-22 13:31:18 -07:00
Jim Miller
0191bba17c Fix 4993068: Don't check password history when dpm sets the password
This fixes a crash caused by permission problems when we try to update
the password history and discover there's no password salt.  The code
attempts to create the salt, which triggers the exception.

This could be fixed by wrapping the call with a clearCallingIdentity()/
restoreCallingIdentity(ident).  However, while looking at it, it occurred to me
that this can cause unexpected failures if the DPM tries to set the
password twice or happens to set it to something in the password history.

Instead, we should *always* allow the DPM to reset the password to whatever it wants,
provided it passes the minimum password criteria.

Change-Id: I1505b24f9c097ee5c2c44e4bf378ba90095b113b
2011-08-21 14:47:59 -07:00
Christopher Tate
1c536f13cc am d6a2be3e: Merge "Allow Instrumentation to kill even persistent processes"
* commit 'd6a2be3ef75892d223bddc82db8a4b4f22d0ec20':
  Allow Instrumentation to kill even persistent processes
2011-08-19 15:23:13 -07:00
Christopher Tate
d6a2be3ef7 Merge "Allow Instrumentation to kill even persistent processes" 2011-08-19 15:21:43 -07:00
Christopher Tate
3dacd8470a Allow Instrumentation to kill even persistent processes
Fixes bug 5117630

Change-Id: Iff40145fbbdc1d81a60cf2ecc5b24321162f7897
2011-08-19 14:57:57 -07:00
Dianne Hackborn
ae070921fd am ace0be25: Merge "Fix issue #5187844: Query is misrouted to wrong content provider"
* commit 'ace0be25d8b1043c8f3d74f8daf20c485b7496ef':
  Fix issue #5187844: Query is misrouted to wrong content provider
2011-08-19 14:52:21 -07:00
Dianne Hackborn
1c9b260cf5 Fix issue #5187844: Query is misrouted to wrong content provider
Change-Id: I56834f41844990d67edc8af83273036b3d755e37
2011-08-19 14:08:43 -07:00
Dianne Hackborn
dccb1b0fc9 am 937ffc17: Merge "Fix issue #5180553: permission RECEIVE_BOOT_COMPLETED is not checked"
* commit '937ffc174c742c56d33f64c6f1129403445193fd':
  Fix issue #5180553: permission RECEIVE_BOOT_COMPLETED is not checked
2011-08-18 18:07:00 -07:00
Dianne Hackborn
937ffc174c Merge "Fix issue #5180553: permission RECEIVE_BOOT_COMPLETED is not checked" 2011-08-18 18:05:19 -07:00
Dianne Hackborn
d99b293d5f Fix issue #5180553: permission RECEIVE_BOOT_COMPLETED is not checked
Change-Id: I069673f2fbdf05e409c5e9ed99ccd1e15b4fe3ed
2011-08-18 16:02:41 -07:00
Jeff Sharkey
74e8ebb853 am 9a20fa54: Merge "Background data notification, API clean up."
* commit '9a20fa54c9ba4bd19f2afd6e8cc6e9954e7cb739':
  Background data notification, API clean up.
2011-08-18 15:03:51 -07:00
Jeff Sharkey
9a20fa54c9 Merge "Background data notification, API clean up." 2011-08-18 15:01:10 -07:00
Mike Lockwood
40a6d3917e Merge "SystemServer: Add support for disabling AudioService and MountService" into ics-aah 2011-08-18 09:34:16 -07:00
Kenny Root
47faa20e26 am d1106fc9: Merge "Default disable watchdog for vold connection"
* commit 'd1106fc9bff66ac4f93f9d6291f0d0136bb544e7':
  Default disable watchdog for vold connection
2011-08-18 09:22:24 -07:00
Kenny Root
d1106fc9bf Merge "Default disable watchdog for vold connection" 2011-08-18 09:20:47 -07:00
Mike Lockwood
7dafec932f SystemServer: Add support for disabling AudioService and MountService
Using the same convention in system_init.cpp, you can disable these
services by setting system properties:

	system_init.startaudioservice=0
	system_init.startmountservice=0

Change-Id: Ie6c0225bf6e204b0b5e3280b29c7d493d08b8a5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-18 06:32:03 -07:00
Dianne Hackborn
031057d845 am c7e6c479: Merge "Fix issue #5163456: logspam/tight loop in BatteryStatsImpl"
* commit 'c7e6c47952fdf5707cce1a2394a68c1dde59e5ca':
  Fix issue #5163456: logspam/tight loop in BatteryStatsImpl
2011-08-17 19:21:08 -07:00
Dianne Hackborn
e8c88e6f76 Fix issue #5163456: logspam/tight loop in BatteryStatsImpl
No longer use the old history code.

Change-Id: I878ffe16e0014453c46db6a4f7228a81468d8cb9
2011-08-17 19:09:23 -07:00
Kenny Root
07714d41e5 Default disable watchdog for vold connection
cryptfs has long-running operations that cause the Watchdog to fire
reliably when encrypting the filesystem. Disable Watchdog on
MountService for this reason.

Change-Id: Id03f5f60c704dcd74a8696ad9f32b5fba5381731
2011-08-17 17:49:30 -07:00
Jeff Sharkey
3a844fcf5a Background data notification, API clean up.
When restricting background data, show ongoing notification to give
easy access to re-enable. Deprecate getBackgroundDataSetting() API
to always return true, since NetworkInfo.isConnected() is new source
of truth. Handle upgrade path by reading from existing secure value,
and kick one last broadcast when changing value. Remove background
data code from ConnectivityService.

Remove warning alerts, since they push ifaces into restricted list;
should only happen when iface has limit.

Bug: 5163559, 5129421
Change-Id: I0064d9d643656a4d32aaae51d4a58bce49fe295f
2011-08-17 14:12:42 -07:00
Adam Cohen
a0062c0173 am 842d9de7: Merge "Getting rid of the (hidden) oldName parameter for widgets"
* commit '842d9de74f9eaaf8a7b89dbe8475faf014ddafb8':
  Getting rid of the (hidden) oldName parameter for widgets
2011-08-17 11:41:39 -07:00
Adam Cohen
842d9de74f Merge "Getting rid of the (hidden) oldName parameter for widgets" 2011-08-17 11:39:32 -07:00
Adam Cohen
bac26a1205 Getting rid of the (hidden) oldName parameter for widgets
Change-Id: I191cf64ed045fd7cb53e106f337cbeab5a914336
2011-08-17 11:37:58 -07:00
Dianne Hackborn
188abec55a am e518be30: am 51beb81a: am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit 'e518be3085c7457f3451a64fbea3f9499ae39bf5':
  Handle stopping of services with still bound applications.
2011-08-16 20:49:18 -07:00
Dianne Hackborn
e518be3085 am 51beb81a: am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit '51beb81a8e901020293b7a30a68b405bca71d258':
  Handle stopping of services with still bound applications.
2011-08-16 20:47:39 -07:00
Dianne Hackborn
51beb81a8e am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit 'ee93fd5c0d7b0296fca17363ec00dc2ee63a0841':
  Handle stopping of services with still bound applications.
2011-08-16 20:45:19 -07:00
Dianne Hackborn
baaf3ce638 Merge "Handle stopping of services with still bound applications." 2011-08-16 19:29:25 -07:00
Christopher Tate
f7a14376e2 am 755bd67a: Merge "Don\'t crash if a drag recipient throws an uncaught exception"
* commit '755bd67a5081727ae1bbee2d39863b464a8b4f35':
  Don't crash if a drag recipient throws an uncaught exception
2011-08-16 17:05:33 -07:00
Christopher Tate
755bd67a50 Merge "Don't crash if a drag recipient throws an uncaught exception" 2011-08-16 17:03:24 -07:00
Christopher Tate
d9be36c897 Don't crash if a drag recipient throws an uncaught exception
There turn out to be two distinct bugs leading to runtime restarts.

The first, dating from at least Android 3.1, is that following certain kinds
of app crashes we properly clean up the drag-state bookkeeping, but aren't
prepared in the case of the drag-target timeout clock firing with a now-
null drag state in effect.  We now catch that edge condition and don't NPE
(and note that there was already similar code around the separate timeout
when an app is *starting* the drag process).

The second bug is that some new-in-ICS code in the input channel management
wasn't prepared for certain cases where the current touch window could have
become unusable and its input channel torn down summarily in the case of the
aforesaid app crash during drag.  The code now makes sure that there really
is an input channel that needs to be flushed / cancelled prior to attempting
that operation.

Fixes bug 5173534

Change-Id: Idaae158ecfb4b93456ab1425769b669962893c00
2011-08-16 16:09:33 -07:00
repo sync
57878d2796 am 4a56c437: Merge "P2p enhancements"
* commit '4a56c437b6fd02dce06fa8565953964b01d21b5d':
  P2p enhancements
2011-08-16 14:53:02 -07:00
repo sync
4a56c437b6 Merge "P2p enhancements" 2011-08-16 14:50:56 -07:00
Chia-chi Yeh
442738e141 am 1db7f794: Merge "VPN: reset legacy VPN when resetting IPv4 addresses."
* commit '1db7f7940e24ad359a02aac07eb6b8b03f3f9804':
  VPN: reset legacy VPN when resetting IPv4 addresses.
2011-08-16 14:27:25 -07:00
Chia-chi Yeh
1db7f7940e Merge "VPN: reset legacy VPN when resetting IPv4 addresses." 2011-08-16 14:25:30 -07:00
Mike Lockwood
4c77081f5d am 33ffb366: Merge "UsbManager: Use resource IDs for notification IDs"
* commit '33ffb3661e42359c7485d0e1636828c0e7e5dd87':
  UsbManager: Use resource IDs for notification IDs
2011-08-16 14:08:50 -07:00
Mike Lockwood
fadd2b8e0f UsbManager: Use resource IDs for notification IDs
to avoid ID collisions with other system services.

Bug: 5161005

Change-Id: I069fbc40a8764bc85cceeacd04264abd32b62668
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-16 13:45:51 -07:00
Mike Lockwood
df5a183fef am 92bebc32: Merge "dumpsys: fix problems with -a option in battery and batteryinfo services"
* commit '92bebc3259c802be2a2313fadbe0116381189d7d':
  dumpsys: fix problems with -a option in battery and batteryinfo services
2011-08-16 13:09:02 -07:00
Mike Lockwood
e81740442f dumpsys: fix problems with -a option in battery and batteryinfo services
Now the dumpsys battery output will show up in bugreports again.

Change-Id: Id36e87d27e9d3c06dcc17671c81aa1d3fe260d1e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-16 12:53:43 -07:00
Chia-chi Yeh
0c074e6843 VPN: reset legacy VPN when resetting IPv4 addresses.
Currently legacy VPN only works on IPv4, and it should always
turn down when the addresses are changed. It assumed that the
interface will be brought down and up, so the event can be
detected via interfaceStatusChanged(). However, the assumption
was incorrect and the event is actually driver-dependent. To
fix this issue, ConnectivityService now tells VPN that the
interface is down when resetting IPv4 addresses.

Change-Id: I76d15e56552d86635c5b274ca980be5da905a6fb
2011-08-16 10:08:33 -07:00
Robert Greenwalt
06ea223195 am 8e99d183: Merge "Flush central DNS cache when things change."
* commit '8e99d183345391cddec70e18d3c41cf21f9f67cb':
  Flush central DNS cache when things change.
2011-08-16 09:43:23 -07:00
Robert Greenwalt
8e99d18334 Merge "Flush central DNS cache when things change." 2011-08-16 09:41:54 -07:00
Kenny Root
034b305d9b am 46d2545d: Merge "Infrastructure to support package verifier"
* commit '46d2545db48e6b8565ef7beedf6486ef5d7f4507':
  Infrastructure to support package verifier
2011-08-16 08:37:59 -07:00
Kenny Root
5d716901c9 am bcc2d40a: Merge "Throw exception on odd length Signatures"
* commit 'bcc2d40a11432736e94c1dd3c64abd1aac476c20':
  Throw exception on odd length Signatures
2011-08-16 08:36:03 -07:00
Kenny Root
46d2545db4 Merge "Infrastructure to support package verifier" 2011-08-16 08:35:53 -07:00
Kenny Root
bcc2d40a11 Merge "Throw exception on odd length Signatures" 2011-08-16 08:34:22 -07:00
Mike Lockwood
210ea86260 Merge "Add headless mode for running the framework without the surface flinger" into ics-aah 2011-08-15 21:13:21 -07:00
Dianne Hackborn
34c788096f Merge "Add new am option to profile the launching of an activity." 2011-08-15 18:57:57 -07:00
Jeff Sharkey
b51645ee2c Merge "Foreground/background network stats using sets." 2011-08-15 18:44:15 -07:00