3863 Commits

Author SHA1 Message Date
Joe Onorato
557ed7aa29 am 0457db37: am ab2e6284: Merge "Use the private version of userActivity." into gingerbread
Merge commit '0457db37de22d430df0e55a7552dcfe81b701627'

* commit '0457db37de22d430df0e55a7552dcfe81b701627':
  Use the private version of userActivity.
2010-09-30 19:48:31 -07:00
Kenny Root
9664b24172 am 8d85beca: am 8b28441a: Merge "Being already unmounted is not a failure" into gingerbread
Merge commit '8d85beca80f0c84344ffb527ec7cab0ca7b53d4f'

* commit '8d85beca80f0c84344ffb527ec7cab0ca7b53d4f':
  Being already unmounted is not a failure
2010-09-30 19:48:27 -07:00
Kenny Root
13cc0a06fc am 4309b52f: am 735de3b3: Hash keys with MD5; track IBinders not IInterface
Merge commit '4309b52fe19de5241113d8f9ebcdf52741e086a9'

* commit '4309b52fe19de5241113d8f9ebcdf52741e086a9':
  Hash keys with MD5; track IBinders not IInterface
2010-09-30 19:47:06 -07:00
Kenny Root
fc32a60236 am 0f064de8: am 27358a69: Only allow 8 OBBs to be mounted by a UID
Merge commit '0f064de830d11ddb08a3c000b894b46aa530348a'

* commit '0f064de830d11ddb08a3c000b894b46aa530348a':
  Only allow 8 OBBs to be mounted by a UID
2010-09-30 19:47:00 -07:00
Kenny Root
9e95468bbb am 6ce5f60c: am 38cf8867: Remove OBBs from state list when volume unmounted
Merge commit '6ce5f60c791401ed0faf5d36baf4fc6612358676'

* commit '6ce5f60c791401ed0faf5d36baf4fc6612358676':
  Remove OBBs from state list when volume unmounted
2010-09-30 19:46:46 -07:00
Dianne Hackborn
6a3eddb469 am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread
Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp

* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
  Rub in a little 'ol log-b-gone.
2010-09-30 19:12:11 -07:00
Dianne Hackborn
0a69f59760 Merge "Rub in a little 'ol log-b-gone." into gingerbread 2010-09-30 19:03:38 -07:00
Dianne Hackborn
cef65eeb03 Rub in a little 'ol log-b-gone.
Mmmmmm...  great fresh scent!

Change-Id: I050e70b31b5d4a9c6731f15a4b51a3620a33a78d
2010-09-30 18:27:22 -07:00
Joe Onorato
0457db37de am ab2e6284: Merge "Use the private version of userActivity." into gingerbread
Merge commit 'ab2e6284845794079d809e62c52c6c380b31c4b5' into gingerbread-plus-aosp

* commit 'ab2e6284845794079d809e62c52c6c380b31c4b5':
  Use the private version of userActivity.
2010-09-30 18:19:09 -07:00
Joe Onorato
ab2e628484 Merge "Use the private version of userActivity." into gingerbread 2010-09-30 18:12:24 -07:00
Kenny Root
8d85beca80 am 8b28441a: Merge "Being already unmounted is not a failure" into gingerbread
Merge commit '8b28441adab59f2bb0d92c8a717af75331249e08' into gingerbread-plus-aosp

* commit '8b28441adab59f2bb0d92c8a717af75331249e08':
  Being already unmounted is not a failure
2010-09-30 18:06:02 -07:00
Kenny Root
4da02392a1 Being already unmounted is not a failure
Change-Id: I5943096444e3d4d4cc5fd63f64a09c32f649a227
2010-09-30 17:59:42 -07:00
Kenny Root
4309b52fe1 am 735de3b3: Hash keys with MD5; track IBinders not IInterface
Merge commit '735de3b38abbd6564082a819377673ee593744a6' into gingerbread-plus-aosp

* commit '735de3b38abbd6564082a819377673ee593744a6':
  Hash keys with MD5; track IBinders not IInterface
2010-09-30 17:30:37 -07:00
Kenny Root
0f064de830 am 27358a69: Only allow 8 OBBs to be mounted by a UID
Merge commit '27358a69b33eaa268ee75ef778ec824c8085adcc' into gingerbread-plus-aosp

* commit '27358a69b33eaa268ee75ef778ec824c8085adcc':
  Only allow 8 OBBs to be mounted by a UID
2010-09-30 17:30:33 -07:00
Kenny Root
6ce5f60c79 am 38cf8867: Remove OBBs from state list when volume unmounted
Merge commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94' into gingerbread-plus-aosp

* commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94':
  Remove OBBs from state list when volume unmounted
2010-09-30 17:30:22 -07:00
Kenny Root
735de3b38a Hash keys with MD5; track IBinders not IInterface
Using a plaintext password doesn't work unless it's a certain length, so
just hash the plaintext password with MD5 to make it the right length
for the twofish encryption.

Tracking the IInterface doesn't make much sense since it's different
each time, so track the IBinder instead. That way we can unlinkToDeath
the binder when the last thing it's holding onto goes away.

Change-Id: Id828d25b4d74f27e9d8b4bfb3909c964469cc473
2010-09-30 17:25:05 -07:00
Kenny Root
27358a69b3 Only allow 8 OBBs to be mounted by a UID
Change-Id: I4f017c5408af903c6c9ba007a2cf7f488a7fcd27
2010-09-30 17:24:53 -07:00
Kenny Root
38cf8867a8 Remove OBBs from state list when volume unmounted
Don't keep tracking OBBs when the volume they're located on goes away.
Remove them from our state tracking maps and then send a notification to
any listener that is still around.

Add a dump handler to MountService so the state of the mount lists
can be inspected.

Change the API to just make a callback directly to the change listener
when mount is called when it's already mounted or unmount called when
it's already unmounted.

Change-Id: Idb4afbb943ca5ca775825f908bff334e3ce1cfcc
2010-09-30 17:24:34 -07:00
Christopher Tate
1a74cc347a Merge "Drag/drop APIs and infrastructure" 2010-09-30 17:04:31 -07:00
Joe Onorato
a39ccb6c4a Use the private version of userActivity.
We were flunking the enforcement of DEVICE_POWER since apps don't need that permission to use a wake
lock.

Bug: 3051596
Change-Id: I1910d8402adb3e9a4d8635de5d2a301f6286f216
2010-09-30 16:47:09 -07:00
Christopher Tate
a53146c556 Drag/drop APIs and infrastructure
A View initiates a drag-and-drop operation (hereafter just called a "drag")
by calling its startDrag(ClipData) method.  Within the processing of that
call, two callbacks are made into the originating View.  The first is to
onMeasureDragThumbnail().  Similarly to the core onMeasure() method, this
callback must respond by calling setDragThumbnailDimension(width, height) to
declare the size of the drag thumbnail image that should be used.  Following
this, the View's onDrawDragThumbnail(canvas) method will be invoked to
actually produce the bits of the thumbnail image.

If all goes well, startDrag() will return 'true', and the drag is off and
running.  (The other arguments to startDrag() provide reconciliation between
the current finger position and where the thumbnail should be placed on
the screen relative to it.)

Potential receipients of the ClipData behind the drag are notified by a
new dispatch mechanism, roughly parallel to motion event dispatch.  The core
routine is the View's onDragEvent(event) callback, with the mechanics of
dispatch itself being routed through dispatchDragEvent(event) -- as in
the case of motion events, the dispatch logic is in ViewGroup, with leaf
View objects not needing to consider the dispatch flow.

Several different event 'actions' are delivered through this dispatch
mechanism:

ACTION_DRAG_STARTED: this event is propagated to every View in every window
(including windows created during the course of a drag).  It serves as a
global notification that a drag has started with a payload whose matching
ClipDescription is supplied with the event.  A View that is prepared to
consume the data described in this event should return 'true' from their
onDragEvent() method, and ideally will also make some visible on-screen
indication that they are a potential target of the drop.

ACTION_DRAG_ENTERED: this event is sent once when the drag point
enters the View's bounds.  It is an opportunity for the View to set up
feedback that they are the one who will see the drop if the finger goes
up now.

ACTION_DRAG_LOCATION: when the drag point is over a given View, that
View will receive a stream of DRAG_LOCATION events, providing an
opportunity for the View to show visual feedback tied to the drag point.

ACTION_DRAG_EXITED: like DRAG_ENTERED, but called when the drag point
leaves the View's bounds.  The View should undo any visuals meant to
emphasize their being the hovered-over target.

ACTION_DROP: when the drag ends at a given point, the View under that
point is sent this event, with the full ClipData of the payload.

ACTION_DRAG_ENDED: paralleling the DRAG_STARTED action, this is the global
broadcast that the drag has ended and all Views should return to their
normal visual state.  This happens after the DROP event.

Change-Id: Ia8d0fb1516bce8c735d87ffd101af0976d7e84b6
2010-09-30 16:29:07 -07:00
Mike Lockwood
5972e52e15 resolved conflicts for merge of 53b07027 to master
Change-Id: Ia5ce86d84454a4be76e71aeb77942ba8d88d2700
2010-09-30 18:43:52 -04:00
Mike Lockwood
53b0702755 am 727d67d4: Merge "location: rebind to network location and geocoder services after package update" into gingerbread
Merge commit '727d67d4fb8721b0291312e4cca33927dfba0e31' into gingerbread-plus-aosp

* commit '727d67d4fb8721b0291312e4cca33927dfba0e31':
  location: rebind to network location and geocoder services after package update
2010-09-30 13:10:50 -07:00
Mike Lockwood
e97ae40dff location: rebind to network location and geocoder services after package update
Change-Id: I2d7db3512b9edd7e0ba27d97442967fc2278e3b9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-30 15:25:54 -04:00
Joe Onorato
d4c2a2f187 am 198297b4: am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
Merge commit '198297b495d975cd4889f5136cd69368bd319eed'

* commit '198297b495d975cd4889f5136cd69368bd319eed':
  Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
2010-09-29 22:13:21 -07:00
Kenny Root
ea7ee3f4d3 am 8bd545ab: am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread
Merge commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c'

* commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c':
  Move all the permissions check up for unmount
2010-09-29 17:17:22 -07:00
Nick Pelly
4715bd91f5 resolved conflicts for merge of f4c3b7e9 to master
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
2010-09-29 12:20:51 -07:00
Joe Onorato
198297b495 am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp

* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
  Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
2010-09-29 11:02:55 -07:00
Joe Onorato
0c32c09cd3 Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
This reverts commit 4da4827504df019d4e64dd864f70526ff6d384a0.
2010-09-29 10:20:59 -07:00
Kenny Root
8bd545ab4f am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp

* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
  Move all the permissions check up for unmount
2010-09-29 07:53:06 -07:00
Kenny Root
212d81a004 Merge "Move all the permissions check up for unmount" into gingerbread 2010-09-29 07:40:32 -07:00
Kenny Root
f1121dc1d3 Move all the permissions check up for unmount
We have already scanned the state of the OBB in mountObb, so check the
caller against the stored state in the unmountObb call. This allows us
to ensure the calling binder is the same one that mounted it since we
tie the lifecycle of the OBB to the lifecycle of the binder.

Change-Id: I45d9cfbab5d3f5b37a6a9b594b10bd8b91cccc45
2010-09-29 07:38:55 -07:00
Ulf Rosdahl
39357708b7 Corrected visibility reporting error in WindowManager
Correction for the error:
When a window is done animating and about to be destroyed,
it is still checked for visibility in the method
updateReportedVisibilityLocked in the WindowManager.
In the case where other windows are ready to be reported as
visible, this, not yet destroyed window which has the state
not visible, will prevent the visibility report message from
being sent.

Change-Id: I9e307a678a204f0883ccd78c2645c373d3f81066
2010-09-29 12:34:38 +02:00
Nick Pelly
f4c3b7e916 am 038cabe0: NFC integration
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
  NFC integration
2010-09-28 22:40:18 -07:00
Nick Pelly
038cabe024 NFC integration
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
2010-09-28 22:36:27 -07:00
Mike Lockwood
5d5bf48c98 am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
Merge commit '05e110506156a1b782232833b907afb428802b69'

* commit '05e110506156a1b782232833b907afb428802b69':
  Revert "Check for the DEVICE_POWER permission in userActivity."
2010-09-28 20:21:48 -07:00
Mike Lockwood
05e1105061 am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp

* commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845':
  Revert "Check for the DEVICE_POWER permission in userActivity."
2010-09-28 20:18:36 -07:00
Mike Lockwood
4da4827504 Revert "Check for the DEVICE_POWER permission in userActivity."
The change broke SetupWizard and probably other apps

This reverts commit 059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c.
2010-09-28 23:07:26 -04:00
Jaikumar Ganesh
7440fc2e0e Wifi: Update code for new BT Apis.
Change-Id: I1deb0a9a1533958cdb79179bebd2d3b435b0b07c
2010-09-28 20:02:33 -07:00
Jaikumar Ganesh
3f03496ad9 Update code for new BT APIs.
Change-Id: I53aa17b6c2a5ee50d47df91960a7f997eb7b1107
2010-09-28 20:02:12 -07:00
Kenny Root
bff405f910 resolved conflicts for merge of d8e8186c to master
Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5
2010-09-28 18:16:50 -07:00
Joe Onorato
75a44c6196 am f5bdeba1: am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
Merge commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d'

* commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d':
  Check for the DEVICE_POWER permission in userActivity.
2010-09-28 17:40:23 -07:00
Kenny Root
d8e8186c88 am 05105f7a: Update OBB API to include callbacks
Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp

* commit '05105f7abe02b2dff91d6260b3628c8b97816bab':
  Update OBB API to include callbacks
2010-09-28 17:33:47 -07:00
Kenny Root
05105f7abe Update OBB API to include callbacks
Add a callback for users of the StorageManager API to be able to receive
notifications when the requested operation completes for mountObb and
unmountObb.

Add NDK API to get to ObbInfo like the Java API has.

Also update the docs for the API and remove the "STOPSHIP" comments.

Change-Id: I23a4409c7f8b74d3169614beba920b4d667990a4
2010-09-28 17:23:26 -07:00
Joe Onorato
f5bdeba197 am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp

* commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
  Check for the DEVICE_POWER permission in userActivity.
2010-09-28 17:22:09 -07:00
Joe Onorato
059f8f93e6 Check for the DEVICE_POWER permission in userActivity.
Change-Id: I6c8038a960bdf32dfad3b0571d86f51f87784370
2010-09-28 17:14:34 -07:00
Dianne Hackborn
e8fd195208 am b763a6dc: am 08cf57d7: Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread
Merge commit 'b763a6dc41dcce76585c56657903ae72c5422ae1'

* commit 'b763a6dc41dcce76585c56657903ae72c5422ae1':
  Fixes to granting URI permissions - take into account path perms.
2010-09-28 13:58:12 -07:00
Irfan Sheriff
b974d0c8f2 am 6db64689: am c89dd54c: Remove logging on wifilock acquire/release
Merge commit '6db6468956fa6d71d68e410a532ed7b1bcaecf74'

* commit '6db6468956fa6d71d68e410a532ed7b1bcaecf74':
  Remove logging on wifilock acquire/release
2010-09-28 13:20:43 -07:00
Dianne Hackborn
b763a6dc41 am 08cf57d7: Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread
Merge commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5' into gingerbread-plus-aosp

* commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5':
  Fixes to granting URI permissions - take into account path perms.
2010-09-28 11:32:38 -07:00
Dianne Hackborn
08cf57d791 Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread 2010-09-28 11:21:27 -07:00