52126 Commits

Author SHA1 Message Date
Brian Carlstrom
c8307c885f Merge "Change KeyChain to assume PEM encoded keystore entries" 2011-06-07 15:57:29 -07:00
Frank Sposaro
34687664be Merge "Fixed typo. "a a" -> "a"" 2011-06-07 15:57:11 -07:00
Christopher Tate
0a251cd5ee Merge "Don't ack/nak backup redundantly at exit" 2011-06-07 15:37:08 -07:00
Christopher Tate
ec5d4a0f97 Don't ack/nak backup redundantly at exit
Change-Id: I7293518bc2fe6c66270a7c8aea3bf0c0829754e4
2011-06-07 15:35:45 -07:00
Brian Carlstrom
9d7faa91be Change KeyChain to assume PEM encoded keystore entries
Summary:
- Changed KeyChain to assume PEM encoded keystore entries
- Moved convertToPem from CertInstaller for reuse with other Credentials helpers
- Added convertFromPem for use decoding keystore entries

Change-Id: I340168b88aefa458d01e81324824e2e08b1d7c4e
2011-06-07 15:33:09 -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
Amith Yamasani
0df77e6d42 Merge "Volume Panel sizing for phones." 2011-06-07 14:48:50 -07:00
Fabrice Di Meglio
c46f7ffa90 Rename atribute View horizontalDirection to layoutDirection and update unit tests
- update before/after to start/end in unit test app

Change-Id: Id7286ef5d9390540faf8ecd5f0b1c140d04bb364
2011-06-07 14:21:31 -07:00
Yu Shan Emily Lau
fd65e00d62 Merge "Cleaned up the old test cases and test media files." 2011-06-07 13:40:04 -07:00
Daniel Sandler
18cee202a0 Merge "Experimental compatibility mode UI." 2011-06-07 13:37:08 -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
Daniel Sandler
45c0401a06 Experimental compatibility mode UI.
♫ Just another button, for you and me, in the status bar. ♫

Change-Id: I11ecac63341d4c421dbaffba931861605ebad286
2011-06-07 15:29:07 -04:00
Christopher Tate
ffccff0864 Merge "Implement shared-storage full backup/restore" 2011-06-07 12:25:06 -07:00
Alon Albert
55f18e1832 Merge "Add columns: Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter) Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates." 2011-06-07 12:16:28 -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
Yu Shan Emily Lau
d1d17b1651 Cleaned up the old test cases and test media files.
Change-Id: Icc3c04c69b11b2bb91588a8bb916baf69594e8d3
2011-06-07 12:08:13 -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
Mike Lockwood
a8be99f8ae Merge "Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED" 2011-06-07 11:25:27 -07:00
Mike Lockwood
7e4db3767b Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED
Change-Id: I3c42393c79424217d6b44cccef9de9e06da58193
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-07 11:24:29 -07:00
Mathias Agopian
16affed50e am cf3036eb: (-s ours) am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
* commit 'cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
2011-06-07 11:15:01 -07:00
Mike Lockwood
98c185e694 Merge "Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED" 2011-06-07 11:02:58 -07:00
Alon Albert
866f40aeda Add columns:
Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event
  Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter)
  Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates.

Change-Id: I5c153fb9cbf43dd1def0267c2f912a59038b28c1
2011-06-07 11:01:49 -07:00
Mike Lockwood
da85e524c7 Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED
Change-Id: I7261959462422cf241a46a5ada6fbd98d655db3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-07 10:59:04 -07:00
Wu-cheng Li
a4a48a484f Merge "Improve android.hardware.Camera.Area javadoc." 2011-06-07 04:05:35 -07:00
Wu-cheng Li
bde61a5731 Improve android.hardware.Camera.Area javadoc.
bug:4553469
Change-Id: Iae88af354fee4925cb7978572c27f6dd5595ca59
2011-06-07 19:00:03 +08:00
Xia Wang
4da7b10c45 Merge "Add OpenGl benchmark tests: display images with different texture in each mesh." 2011-06-06 22:00:31 -07:00
Dianne Hackborn
b5c462f801 Merge "Add force-stop subcommand for 'am'." 2011-06-06 19:01:48 -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
Iliyan Malchev
219451363d CameraParameters: add PIXEL_FORMAT_RGBA8888
Change-Id: I2780e936f5b4628d506ac4e6947b78ef831fbde8
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-06-06 18:04:17 -07:00
Fabrice Di Meglio
de7fc15ff4 Update BiDiTest app for Gravity renaming
- BEFORE?AFTER is now START/END

Change-Id: I44cfdc17090052704024d8c5386553f0c83e9ab2
2011-06-06 17:58:17 -07:00
Amith Yamasani
727d8fc0ba Volume Panel sizing for phones.
Change-Id: I5a21b42740a3a3535504dc93c85b866c52cfb319
2011-06-06 17:30:10 -07:00
Fabrice Di Meglio
a556abfb3d Merge "Rename Gravity BEFORE/AFTER to START/END" 2011-06-06 16:48:30 -07:00
Fabrice Di Meglio
9e3b002d3f Rename Gravity BEFORE/AFTER to START/END
- following spec proposal for having CSS3 like naming

Change-Id: Id5e316a2d9b54b9f20bbcb168fea6a3a83882e1b
2011-06-06 16:41:16 -07:00
Eric Fischer
4297539155 Merge "Import revised translations." 2011-06-06 16:22:35 -07:00
James Dong
6564c3c6ab Merge "Fix the comment for the location box @xyz" 2011-06-06 15:54:10 -07:00
Eric Fischer
f24004279a Import revised translations.
Change-Id: I02300c0a71373654beb97bc96691438136bd3365
2011-06-06 15:51:43 -07:00
Ben Komalo
98ded72258 Merge "Makes SSLCertificateSocketFactory more flexible" 2011-06-06 15:50:10 -07:00
Mathias Agopian
cf3036ebef am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
* commit 'c1cbf4525b4d12b6cb7908072d36c8f6ca819f5b':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
2011-06-06 15:25:32 -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
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
Xia Wang
62e8f2228f Add OpenGl benchmark tests:
display images with different texture in each mesh.

Change-Id: I051be3cf8be117e62fc635dfaf75b5c0e4cdd644
2011-06-06 15:12:29 -07:00
Ben Komalo
1b52806e21 Makes SSLCertificateSocketFactory more flexible
Specifically, this adds support for specifying custom
{Trust,Key}Managers in the socket factory.

Change-Id: I1fdf6587064c71ae0520f73821923dcad8d140ad
2011-06-06 15:10:33 -07:00
Fabrice Di Meglio
890e013c05 Merge "Fix USE_TEXT_LAYOUT_CACHE define" 2011-06-06 14:14:36 -07:00
Martijn Coenen
4e75dbb94d Merge "Connecting to a NFC technology may fail." 2011-06-06 13:46:47 -07:00
Frank Sposaro
15dc451906 Fixed typo. "a a" -> "a"
Change-Id: I600d6f7f5d87766cd841a5e8177581d33dcdd282
2011-06-06 13:41:37 -07:00
Jeff Brown
49470743fa Merge "Copy pointer assets for hdpi." 2011-06-06 13:14:13 -07:00