4885 Commits

Author SHA1 Message Date
Mike Lockwood
84338c4559 Fix deadlock in MountService
It is not safe to call into vold with a lock held on mVolumeStates
since we will receive events back from vold on a different thread.
So in the boot completed handler we make a copy of the volume list and
then call vold to mount volumes after releasing the lock

Change-Id: I0dee91f09e4056132aaaf0fb0a663148c65db1e4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-05 10:07:53 -04:00
Christopher Tate
42bc0e946f Merge "Fix deadlock in BackupManagerService" 2011-04-04 17:41:22 -07:00
Mike Lockwood
cace13d72a Merge "StorageManager: Add getVolumeList() and getVolumeState() methods" 2011-04-04 17:39:21 -07:00
Mike Lockwood
47c5581ada Merge "MountService: Add support for multiple volumes" 2011-04-04 17:39:15 -07:00
Christopher Tate
4559764e9f Fix deadlock in BackupManagerService
Lock ordering bug.  The fix is to avoid having to hold both locks
simultaneously in one prong of the deadlock.  (Further strengthening:
the code path for potentially acquiring both simultaneously now
begins at a common method, ensuring that lock ordering is always
consistent.)

Change-Id: If9433aff8326fec2ba0e97e96ad2d835b01e2cda
2011-04-04 16:59:21 -07:00
Robert Greenwalt
b6c5d824c0 am e716a551: resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp
* commit 'e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96':
  Only leave one default network up at a time.
2011-04-04 16:44:25 -07:00
Robert Greenwalt
e716a5515b resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
2011-04-04 16:26:42 -07:00
Mike Lockwood
8fa5f804e2 StorageManager: Add getVolumeList() and getVolumeState() methods
Change-Id: Icf3301827dd27e8430bd44eaafde517a31ef035a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-04 18:54:03 -04:00
Mike Lockwood
7fa24aa8da MountService: Add support for multiple volumes
Change-Id: I4eaa781cf302c7aaae170af2489b6b29120c0b81
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-04 18:53:58 -04:00
Brad Fitzpatrick
37334c0f34 am 8f7aad14: am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container"
* commit '8f7aad147d790b25bae7301827e070df72690341':
  Avoid crash in system server when mounting container
2011-04-04 15:28:48 -07:00
Brad Fitzpatrick
8f7aad147d am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container"
* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
  Avoid crash in system server when mounting container
2011-04-04 15:25:21 -07:00
Robert Greenwalt
ab2194aade am 27725e8c: Only leave one default network up at a time.
* commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
  Only leave one default network up at a time.
2011-04-04 12:18:58 -07:00
Elliott Hughes
6907891b1f You can't fsync(2) /dev/urandom...
...so don't even try. Doing so leads to this:

W/EntropyService( 1586): unable to load initial entropy (first boot?)
W/EntropyService( 1586): java.io.SyncFailedException: fsync failed: EINVAL (Invalid argument)
W/EntropyService( 1586): 	at java.io.FileDescriptor.sync(FileDescriptor.java:73)
W/EntropyService( 1586): 	at java.io.RandomAccessFile.write(RandomAccessFile.java:694)
W/EntropyService( 1586): 	at java.io.RandomAccessFile.write(RandomAccessFile.java:676)
W/EntropyService( 1586): 	at com.android.server.RandomBlock.toDataOut(RandomBlock.java:88)
W/EntropyService( 1586): 	at com.android.server.RandomBlock.toFile(RandomBlock.java:70)
W/EntropyService( 1586): 	at com.android.server.EntropyService.loadInitialEntropy(EntropyService.java:99)
W/EntropyService( 1586): 	at com.android.server.EntropyService.<init>(EntropyService.java:86)
W/EntropyService( 1586): 	at com.android.server.EntropyService.<init>(EntropyService.java:76)
W/EntropyService( 1586): 	at com.android.server.ServerThread.run(SystemServer.java:139)
W/EntropyService( 1586): Caused by: libcore.io.ErrnoException: fsync failed: EINVAL (Invalid argument)
W/EntropyService( 1586): 	at libcore.io.Posix.fsync(Native Method)
W/EntropyService( 1586): 	at libcore.io.BlockGuardOs.fsync(BlockGuardOs.java:39)
W/EntropyService( 1586): 	at java.io.FileDescriptor.sync(FileDescriptor.java:71)
W/EntropyService( 1586): 	... 8 more

Change-Id: I598a9456eccec0ca087f1568d47b6b8e531de8a8
2011-04-04 12:15:34 -07:00
Brad Fitzpatrick
f7a34b1598 am e558a000: Merge "Avoid crash in system server when mounting container"
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
  Avoid crash in system server when mounting container
2011-04-04 10:17:35 -07:00
Fredrik Helmer
a20c8ef471 Avoid crash in system server when mounting container
A race condition when mounting a container in PackageHelper may cause
the system_server to crash (uncaught exception). Calling methods are
prepared to handle null, so return null instead.

Change-Id: I852ee21a2d847e37d81c1b900c27ddf94ef24fcb
2011-04-04 14:38:24 +02:00
Chet Haase
09bc5f5b57 Merge "Add logging of graphics acceleration info to bugreports" 2011-04-01 13:28:10 -07:00
Chet Haase
9c1e23baf5 Add logging of graphics acceleration info to bugreports
Change-Id: I9fa4cda6ccf92df9d1c644ccdc0e7274a30106e0
2011-04-01 13:24:53 -07:00
Jeff Brown
bc2278b95f Merge "Add a little input event consistency verifier." 2011-04-01 12:56:35 -07:00
Robert Greenwalt
13ec406381 Fix a bad merge.
Re-add change 103769 (Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f) from gingerbread
after the bad merge was reverted by master change 104487
(Change-Id: I8fad7ee11f4b26630f3cc4b31cc9cafbe66b3bf4).

bug:4157610
Change-Id: I96a75d71220cc7886a5b186b415d8dacf6951ca6
2011-04-01 10:51:22 -07:00
Jeff Brown
21bc5c917d Add a little input event consistency verifier.
The idea is to assist with debugging by identifying cases in which
the input event stream is corrupted.

Change-Id: I0a00e52bbe2716be1b3dfc7c02a754492d8e7f1f
2011-03-31 19:57:00 -07:00
Robert Greenwalt
b1c6b0f1e2 Fix the build.
Fix a bad merge.

Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee
2011-03-31 10:44:47 -07:00
Michael Jurka
8fad7ee11f Fix the build
Revert "am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp"

This reverts commit 352f2c33d3b8a0b73dcdab98c7a77f698578b048, reversing
changes made to ce8a55db6feae11c1db45a868a7d8a0e7d105471.
2011-03-30 19:57:12 -07:00
Jeff Brown
e028290d01 Merge "Add input filter mechanism for accessibility." 2011-03-30 17:20:56 -07:00
Jeff Brown
a386952528 Merge "Move accessibility manager service to own package." 2011-03-30 17:20:50 -07:00
Jeff Brown
0029c66203 Add input filter mechanism for accessibility.
This patch adds a mechanism for capturing, filtering, transforming
and injecting input events at a very low level before the input
dispatcher attempts to deliver them to applications.  At this time,
the mechanism is only intended to be used by the accessibility
system to implement built-in system-level accessibility affordances.

The accessibility input filter is currently just a stub.
It logs the input events receives and reinjects them unchanged,
except that it transforms KEYCODE_Q into KEYCODE_Z.

Currently, the accessibility input filter is installed whenever
accessibility is enabled.  We'll probably want to change that
so it only enables the input filter when a screen reader is
installed and we want touch exploration.

Change-Id: I35764fdf75522b69d09ebd78c9766eb7593c1afe
2011-03-30 16:55:15 -07:00
Robert Greenwalt
352f2c33d3 am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '047f9d12976d90d0931a64a256bb4843d77f5e20':
  Fix some alt-network issues.
2011-03-30 16:40:23 -07:00
Brad Fitzpatrick
b9d173ce8f am f6809853: am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit 'f68098534e42b33cd4588bb2d2ba34ab579e11aa':
  Unregister callback from binder when vibration is removed
2011-03-30 16:37:58 -07:00
Mike Lockwood
d0b4e9611d am 08d5de83: am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
* commit '08d5de83393dbd4d31893d96e4871a8a3628a2cd':
  UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-30 16:33:40 -07:00
Robert Greenwalt
6244f0fc16 resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp
Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1
2011-03-30 15:03:13 -07:00
Irfan Sheriff
11ebb6f502 am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
  DO NOT MERGE Pick upstream intf with valid IP conf
2011-03-30 09:30:32 -07:00
Robert Greenwalt
ce6766ea51 am 568845a7: Merge "Fix some alt-network issues." into gingerbread
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.
2011-03-30 09:30:15 -07:00
Brad Fitzpatrick
f68098534e am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '7a84a60d569ef7373fbb6418026b935d48fcd7e7':
  Unregister callback from binder when vibration is removed
2011-03-30 08:20:51 -07:00
Jeff Brown
6e6cd7a566 Move accessibility manager service to own package.
Change-Id: I0d73737a21615f0ff0abc80b757fb8c9bcb50be5
2011-03-30 03:29:30 -07:00
Mike Lockwood
08d5de8339 am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
* commit 'cd90d1f1173c344738362d24bdc637c355b75645':
  UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:17:36 -07:00
Mike Lockwood
cd90d1f117 am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
* commit '44e4b99f823a6d6131f94e67389b705d3b124c0a':
  UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:16:17 -07:00
Mike Lockwood
4f0f3561ed UsbService: Make USB disconnect handling for accessory mode more robust
Handle the case where the kernel driver is in accessory mode but we failed
to initialize it at the framework level.  On disconnnect, check to see if the
accessory kernel driver is enabled rather than checking mCurrentAccessory.
That way we will restore the USB state in the kernel even if mCurrentAccessory
is null.

Change-Id: I35d458f21a8b21611946da523d0f53723cab0540
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-29 16:59:38 -07:00
Robert Greenwalt
27725e8cd1 Only leave one default network up at a time.
If original refuses to tear down, tear down new one.  It's better
to have none (which will try to launch them all again) than two.

Really people shouldn't refuse the teardown request.

bug:4183397
Change-Id: I54ea1bf0d2cd2ef16fcf2eafc69895ad2fe33ffd
2011-03-29 11:36:28 -07:00
Mike Lockwood
35167d95e1 Remove logging from HardwareService flashlight calls
Bug: 4184090

Change-Id: I772b9098e082afcde09ae607d196c1591137fa6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-28 20:29:14 -07:00
Brad Fitzpatrick
7a84a60d56 am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
  Unregister callback from binder when vibration is removed
2011-03-28 08:15:35 -07:00
Kenny Root
ff5075944e Merge changes Ia7add63e,Ic7571dae
* changes:
  Split dump and annotate users of mPackages lock
  Split PackageManagerService into subclasses
2011-03-25 14:41:34 -07:00
Irfan Sheriff
05f14e2bcf Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 2011-03-25 11:01:02 -07:00
Irfan Sheriff
c0e0dbb454 DO NOT MERGE Pick upstream intf with valid IP conf
As a work around for the issue of picking
the wrong interface, add a check for selecting
an upstream interface that has a valid IP configuration

Bug: 3362306
Change-Id: I3e8ab5ef30b69f1adab755d83f5b65c078f73936
2011-03-25 10:09:55 -07:00
Robert Greenwalt
7cf5b419da Fix some alt-network issues.
Two issues.
1) remove default routes for non-default networks.
2) don't report mobile is the active default network just because
   it is active.

bug:4157610
Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f
2011-03-25 08:59:08 -07:00
Adam Cohen
2625feae79 Modifying RemoteViewsFactory interface
-made onDestroy() one way
-moved uncaught exception handling to the application process

Change-Id: I958571a34eaa48b27e441e3a117c109fb2d2c644
2011-03-24 19:50:22 -07:00
Mathias Jeppsson
b23949b745 Unregister callback from binder when vibration is removed
When creating new vibration pattern, a callback is registered
in case binding to caller goes away, by linkToDeath().
Need to unregister this callback when we throw away the vibration.

Change-Id: Ibdf0bd415a539054ac7a66f49b33a864f729c546
2011-03-24 08:49:12 +01:00
Kenny Root
447106fc83 Split dump and annotate users of mPackages lock
Split the dump() command between PMS and Settings.

Try to annotate all users of the mPackages lock in preparation for
switch to reader/writer lock.

Also mark some locals final as I was reading through the usage of the
synchronization on mPackages.

Change-Id: Ia7add63e835e67156edf886f98acebe50cc41f70
2011-03-23 17:20:04 -07:00
Robert Greenwalt
15cb32ed9d am 5635dc93: am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
* commit '5635dc9313dc6ca3ea739e4ca36c42a2c58537e9':
  Fix adding of default route.
2011-03-22 21:40:54 -07:00
Robert Greenwalt
5635dc9313 am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
* commit '0b6d044567b9c3004eb7ed826fd593019cd24352':
  Fix adding of default route.
2011-03-22 21:39:19 -07:00
Robert Greenwalt
0b6d044567 am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
* commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
  Fix adding of default route.
2011-03-22 21:37:48 -07:00
Robert Greenwalt
edcb4f9d56 Fix adding of default route.
If you deleted the host routes (started a secondary network like mms, supl
of hipri and then ended it) you would lose the host route to the default
gateway.  Then if you needed to re-add the default gateway route (lost
the connection and removed the default route and then re-established)
you couldn't - can't add a gateway that isn't routable apparently.

This happens if you are in a video chat and lose your connection without
losing the interface (PPP keeps it up for a bit).

Fixed it by having addDefaultRoute first add a hsot route for the gateway
before adding the default route.  This allows the default add to succeed.

bug:3490353
Change-Id: I415e7319832e6456f8757b14c4f79f098a08839b
2011-03-22 18:47:42 -07:00