6116 Commits

Author SHA1 Message Date
Jeff Brown
cb0c55ed37 am e046555b: am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit 'e046555b4d92179327d12d888be967fff5c027ca':
  Fix build.
2011-06-07 17:52:53 -07:00
Jeff Brown
051e8f2bfa am 55cc25c1: am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2
* commit '55cc25c12c45e8ffb65d2275cc0b6941b68db9df':
  Simplify spot tracking logic. Bug: 4124987
2011-06-07 17:52:22 -07:00
Jeff Brown
774ed9d953 resolved conflicts for merge of 8b2c0014 to master
Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361
2011-06-07 17:48:39 -07:00
Irfan Sheriff
f596955372 am 5e4d0206: am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
* commit '5e4d0206486378ffc7d2992750e439d54df15147':
  Handle AsyncChannel disconnect in WifiService
2011-06-07 17:19:02 -07:00
Dianne Hackborn
aefc94f19a am 4bd50588: am fc3fa5dc: am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
* commit '4bd505883df3d8ca7583d854f1c71302c615519d':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
2011-06-07 17:18:16 -07:00
Christopher Tate
ba4b2faa09 Merge "Fix embedded spaces in tar stream EVEN HARDER" 2011-06-07 15:20:34 -07:00
Irfan Sheriff
2391a98314 Merge "Update walled garden detection logic" 2011-06-07 15:16:00 -07:00
Irfan Sheriff
5ea65d609f Update walled garden detection logic
DNS based techniques dont always work. Some hotspots
redirect on data fetch on IP. Use a known pattern match
on URL to detect a walled garden instead.

Also, added gservices capability to turn off the feature
or change the URL & the pattern to match

Bug: 4378442
Change-Id: I78b4208d3ea3ace20069169e7c01ed769892d94d
2011-06-07 15:10:58 -07:00
Christopher Tate
3f6c77b7ca Fix embedded spaces in tar stream EVEN HARDER
Change-Id: I97ac586ff3541a05d73e1e53f680517c15e6c662
2011-06-07 13:17:17 -07:00
Mike Lockwood
65abc4531f Merge "StorageVolume: Add allowMassStorage flag" 2011-06-07 12:44:52 -07:00
Mike Lockwood
8e8b280bd1 StorageVolume: Add allowMassStorage flag
Change-Id: I9d19e635bb06e50068d7e4e6919322bd5bb2e00f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-07 12:43:49 -07:00
Christopher Tate
b0628bfd5a Implement shared-storage full backup/restore
Every available shared-storage volume is backed up, tagged with its
ordinal in the set of mounted shared volumes.  This is an approximation
of "internal + the external card".  This lets us restore things to the
same volume [or "equivalent" volume, in the case of a cross-model
restore] as they originated on.

Also fixed a bug in the handling of files/dirs with spaces in
their names.

Change-Id: I380019da8d0bb5b3699bd7c11eeff621a88e78c3
2011-06-07 12:16:27 -07:00
Iliyan Malchev
5c54f4b3cb frameworks/base: updates for camera HAL memory management
-- when the camera HAL allocates memory
	-- it requests is as N buffers by S bytes each
	-- it may specify a file descriptor to get mmapped; if -1, then we use ashmem
-- when issuing data and data-timestamp callbacks, the camera HAL specifies a
   buffer index
-- range checking is performed on the buffer indices
-- memory requested by a camera HAL is not incStrong'ed, and needs to be
   expliciftly released by the camera HAL (by calling the release method on the
   camera_memory_t handle)

Change-Id: I0f09603aa786c238590e7288388ab673787e6032
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-06-07 11:43:20 -07:00
Jeff Brown
e046555b4d am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit 'fd3244868dec40707039cd616dd37ada41774547':
  Fix build.
2011-06-06 21:11:44 -07:00
Jeff Brown
fd3244868d am 5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '5cb05eea289559b30cf4f84130cb6afba0921638':
  Fix build.
2011-06-06 21:08:25 -07:00
Jeff Brown
5cb05eea28 Merge "Fix build." into honeycomb-mr2 2011-06-06 21:06:30 -07:00
Jeff Brown
9181a5f40c Fix build.
Change-Id: I9ea07637058e2aa74d20d881bc21fea305cc869e
2011-06-06 21:04:14 -07:00
Jeff Brown
55cc25c12c am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2
* commit '797dc698e9ff85c1a09874cc3f7bfe825b2ff0e1':
  Simplify spot tracking logic. Bug: 4124987
2011-06-06 20:36:41 -07:00
Jeff Brown
8b2c00144a am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
* commit 'b3536145725250401d25ffa00cda85d222dfc21e':
  Touch pad improvements. Bug: 4124987
2011-06-06 20:34:38 -07:00
Irfan Sheriff
5e4d020648 am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
* commit 'b400184ad6277676048a30b042ed0667de662ad8':
  Handle AsyncChannel disconnect in WifiService
2011-06-06 20:34:35 -07:00
Jeff Brown
797dc698e9 am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2
* commit 'b92dcf9c062064dcca9298b089d95a3ce1ba2e75':
  Simplify spot tracking logic. Bug: 4124987
2011-06-06 20:34:33 -07:00
Jeff Brown
b353614572 am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
* commit 'ed48fa89a8e31b04681347a9235c2a566e7dbb8e':
  Touch pad improvements. Bug: 4124987
2011-06-06 20:32:25 -07:00
Irfan Sheriff
b400184ad6 Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE 2011-06-06 20:31:55 -07:00
Jeff Brown
b92dcf9c06 Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2 2011-06-06 20:31:55 -07:00
Jeff Brown
ed48fa89a8 Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2 2011-06-06 20:30:47 -07:00
Jeff Brown
cb5ffcf0e4 Simplify spot tracking logic.
Bug: 4124987

Since spots are now one-to-one with the touch gesture points,
we can eliminate a lot of redundant logic that assumed they weren't.

Change-Id: Ic60d8d0898c285317f480bc8fb17fb9797770e69
2011-06-06 20:06:19 -07:00
Jeff Brown
bb3fcba0ca Touch pad improvements.
Bug: 4124987

Only show one spot per touch point instead of one spot per
finger for multitouch gestures.

Tweaked the pointer acceleration curves.

Dissociated the hover/tap timeouts from the "tap" timeout
since they mean very different things.

Change-Id: I7c2cbd30feeb65ebc12f6c7e33a67dc9a9f59d4c
2011-06-06 19:23:05 -07:00
Svetoslav Ganov
8643aa0179 Interrogation of the view hierarchy from an AccessibilityService.
1. Views are represented as AccessibilityNodeInfos to AccessibilityServices.

2. An accessibility service receives AccessibilityEvents and can ask
   for its source and gets an AccessibilityNodeInfo which can be used
   to get its parent and children infos and so on.

3. AccessibilityNodeInfo contains some attributes and actions that
   can be performed on the source.

4. AccessibilityService can request the system to preform an action
   on the source of an AccessibilityNodeInfo.

5. ViewAncestor provides an interaction connection to the
   AccessibiltyManagerService and an accessibility service uses
   its connection to the latter to interact with screen content.

6. AccessibilityService can interact ONLY with the focused window
   and all calls are routed through the AccessibilityManagerService
   which imposes security.

7. Hidden APIs on AccessibilityService can find AccessibilityNodeInfos
   based on some criteria. These API go through the AccessibilityManagerServcie
   for security check.

8. Some actions are hidden and are exposes only to eng builds for UI testing.

Change-Id: Ie34fa4219f350eb3f4f6f9f45b24f709bd98783c
2011-06-06 18:46:03 -07:00
Dianne Hackborn
4bd505883d am fc3fa5dc: am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
* commit 'fc3fa5dc1045a8f25fc1982443e05873edf028df':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
2011-06-06 18:18:34 -07:00
Dianne Hackborn
fc3fa5dc10 am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
* commit '1b405592550c719aa5dd93178705ae08b4e84a2f':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
2011-06-06 17:33:59 -07:00
Dianne Hackborn
1b40559255 Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 2011-06-06 17:30:50 -07:00
Dianne Hackborn
bc7386c261 Fix issue #4539687: At least one compatibility-mode app (Androminion)...
...will only launch when held in portrait mode.

There was a bug in the window manager that caused all of the careful code to
update the configuration in sync with movements between activities to break.
Now it is fixed, so this app works, and we no longer see the bad slow orientation
changes when switching between activities that want to be in different
orientations.

Change-Id: I5d93f99649849bdaca2e8bebade6b91b8b6cf645
2011-06-06 17:29:10 -07:00
Mathias Agopian
c1cbf4525b am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
* commit '24855c09173a6caaec7dcedd0c2d7ce15121d39b':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
2011-06-06 15:21:44 -07:00
Irfan Sheriff
6da83d5868 Handle AsyncChannel disconnect in WifiService
Backport change I928544a0 to LTE branch and also handle
disconnect on WifiStateMachine channel

Bug: 4473750
Change-Id: I556330c10243a1805555f6bf6dcc7e43b78e3bfd
2011-06-06 15:17:58 -07:00
Mathias Agopian
24855c0917 merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
Fix a race that could cause GL commands to be executed from the wrong thread.
  RefBase subclasses can now decide how they want to be destroyed.
  Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
  Fix a race-condtion in SurfaceFlinger that could lead to a crash.

initial cherry-pick:
resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

Change-Id: I2a335e03fff219e35c18a7b0089b3a11d636576f
2011-06-06 15:14:25 -07:00
TK MUN
60a3117838 am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection
* commit '51704fc9c2f42e72a86f580c3e2aa977e8b6b006':
  Allow control over search order for tethering upstream interface selection
2011-06-06 12:57:24 -07:00
TK MUN
51704fc9c2 am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
  Allow control over search order for tethering upstream interface selection
2011-06-06 11:51:22 -07:00
Marco Nelissen
b2fd84ad1d resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
2011-06-06 09:55:15 -07:00
Glenn Kasten
a093ca9c73 Merge "Remove dead code related to gettid" 2011-06-06 09:12:05 -07:00
Svetoslav Ganov
c321c19fc9 Fixing a bug I introduced during my last merge.
Change-Id: I6474ca94a6ef9bd17a5670a4baa51673f3c2f5d0
2011-06-03 19:49:00 -07:00
Christopher Tate
d00ea44b31 Merge "Respect android:allowBackup="false" during full backup & restore" 2011-06-03 17:39:27 -07:00
Jeff Brown
b12682270a Use pointer mode instead of spots for SEMI_MT touch pads.
The spot-based presentation relies on being able to accurately
locate and distinguish two or more fingers on the touch pad.
We can still do gesture recognition without distinct multitouch
but it doesn't make sense to show spots because we can't be sure
that the spots will appear in the right places.

Change-Id: Ia282d77000bf3b50d395273a1f0ac0bbe55b3c6f
2011-06-03 17:08:09 -07:00
Glenn Kasten
6af763bec7 Remove dead code related to gettid
The gettid system call is always available now.

Change-Id: Ib78b41781eda182dc8605daf456bbea7ff7c2dc0
2011-06-03 16:12:37 -07:00
Jeff Brown
7218d830e2 resolved conflicts for merge of ca2b552d to master
Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
2011-06-03 15:50:27 -07:00
Jeff Brown
a742f85490 am 56503b8d: am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2
* commit '56503b8ddfe5c82407da32e18061e725f668432d':
  Implement pointer acceleration.
2011-06-03 15:30:33 -07:00
Dianne Hackborn
2515db74fe am 3a80c504: am 8b9a2b6c: am e6676351: Work around OpenFeint bug.
* commit '3a80c50485809fe72d6de83dacad494c5e84ed24':
  Work around OpenFeint bug.
2011-06-03 14:43:18 -07:00
Christopher Tate
a858cb075d Respect android:allowBackup="false" during full backup & restore
Packages with this manifest attribute set 'false' will not be backed
up even through the "full device backup" infrastructure.  If someone
produces an apparent restore file with data for such an application,
it will not actually be restored onto the device.

When an apk is installed during the course of a restore operation,
it is validated against the manifest contents and deleted if there
is a mismatch.  Also, if the newly-installed app is found to
disallow backups, no file content will be processed for that app.

Bug 4532159

Change-Id: I59630054584b1394e567de939192e22e597044ee
2011-06-03 14:06:46 -07:00
Dianne Hackborn
50469db071 am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
* commit '7322e557cfe42da42779625d69ced2db74a9df90':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
2011-06-03 13:17:00 -07:00
Dianne Hackborn
f3b57def93 resolved conflicts for merge of 7e193916 to master
Change-Id: If06892419319c3a2d4ab6b03dd3ceb99b83803b5
2011-06-03 12:26:54 -07:00
Andy Stadler
daac9dd974 am c22d145a: am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
* commit 'c22d145a9f26314e23ea678e96766755268e878b':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
2011-06-03 10:33:13 -07:00