54539 Commits

Author SHA1 Message Date
Glenn Kasten
8b7d1b4d4a Add MEDIA_UID
Change-Id: Iaf03913dce95420e21c79226031b7caaaedf2ce8
2011-07-13 17:39:02 -07:00
Ben Dodson
67671874dc unhide public apis
Change-Id: I3bbe0e7c1e135a4654f63c34c024d7aa10341279
2011-07-13 17:38:33 -07:00
Svetoslav Ganov
f382dc2d97 Merge "Touch exploration gesture events change the window id." 2011-07-13 17:23:41 -07:00
Svetoslav Ganov
63c04eeb00 Touch exploration gesture events change the window id.
1. Touch exploration start and end events are generated
   by the sytstem to provide additional information for
   accessibility services. Since such events do not come
   from any particular window they whould not change the
   id of the window that currently allows exploring its
   content.

2. Touch exploration start and end events were lealing the
   touch explorer class wich is private.

bug:5026258

Change-Id: Icaf3e2bd9566716f2afb876cf8e0d50813b0c76e
2011-07-13 17:22:15 -07:00
Mike Lockwood
e67ebacd15 Merge "Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build" 2011-07-13 16:46:50 -07:00
Mike Lockwood
c1b9bbb21c Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 19:45:44 -04:00
Jason Sams
b328269531 Merge "Fix native crash when GL driver fails to initialize." 2011-07-13 16:43:27 -07:00
Dave Santoro
b6e5e7a740 Merge "Contacts contract update for display photos." 2011-07-13 16:23:44 -07:00
Jason Sams
fb06b7a551 Fix native crash when GL driver fails to initialize.
Change-Id: I85714de9029285027dc75fb3b62076be41a4c985
2011-07-13 16:09:42 -07:00
Kenny Root
a1b68687de Merge "Add StorageVolume list to MountService dump" 2011-07-13 15:53:12 -07:00
Kenny Root
f953dee175 Merge "Fix debugging for hwui caches" 2011-07-13 15:53:03 -07:00
Andreas Huber
c3119330a5 Remove legacy http support from stagefright, chromium is the new hotness.
Change-Id: I6725d42d38b91e6a1cbca43174870f445aeb3d99
2011-07-13 15:45:01 -07:00
Daniel Lehmann
6a8f7795c9 Merge "Allow a sync adapter to provide an OPEN action for a group" 2011-07-13 15:40:03 -07:00
Christopher Tate
9a79cda53b Merge "Compress the backup output stream" 2011-07-13 15:37:21 -07:00
Daniel Lehmann
e6d3d28a6b Allow a sync adapter to provide an OPEN action for a group
Bug:4413120
Change-Id: I17572204dc9fad3406d2505c83586b9dbce177b9
2011-07-13 15:35:05 -07:00
Christopher Tate
7926a693c4 Compress the backup output stream
Zlib compression, with a full flush between each application's
data.  Encryption will be performed on the already-compressed data
once that's implemented.

On restore, the streamed data is similarly uncompressed on the fly.

Change-Id: I19b65c88e759a66527d10913d18fffa9df0bc011
2011-07-13 15:30:41 -07:00
Jeff Sharkey
19d2c0b0c0 Merge "Control socket tagging through Settings.Secure." 2011-07-13 15:28:06 -07:00
Andreas Huber
8d3073c5c4 Include all supported mime types when querying decoder profile/level support.
Change-Id: Ia1c930eee489bfebb482ac5079bd6ac9354532f2
2011-07-13 15:27:51 -07:00
Jeff Sharkey
62a2c8fed9 Control socket tagging through Settings.Secure.
When NetworkManagementService starts, it determines if qtaguid
should be enabled.  The changes pushes the enabled state to a system
property to control socket tagging.

Change-Id: I5697a990dbaad4b220a2fb055931b18077d07a74
2011-07-13 15:25:11 -07:00
Andreas Huber
2d912dd5ea Merge "Remove old-style software decoders." 2011-07-13 15:19:44 -07:00
David 'Digit' Turner
bd55ab1877 am 0814a9aa: am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
* commit '0814a9aa0c8f89f084ba37df05b3735274d78420':
  NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
  Fix missing NL
2011-07-13 14:55:20 -07:00
Scott Main
605a80f3c3 am 9b446cd6: am bc047bb0: am e32c49ab: docs: de-new sidenavs
* commit '9b446cd6b4d3d2c2e2517d95937750da0d3b2df1':
  docs: de-new sidenavs
2011-07-13 14:55:15 -07:00
Robert Ly
0e9bc56e75 am 4e400158: am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '4e4001589911b971d56c72acee140526d4575dac':
  cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
2011-07-13 14:54:44 -07:00
Scott Main
1c91fac1ab am 22f4e8f6: am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboard
* commit '22f4e8f627e3f54b418da422eadcf0c43caa3499':
  docs: fix date on opengl dashboard
2011-07-13 14:54:24 -07:00
Xavier Ducrohet
37b3cc3bbe am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
* commit '9163a4a686fc25fefc77d5b41c24a4538486a48e':
  Merge 36a3a392 from mr1.
2011-07-13 14:53:54 -07:00
Dave Santoro
a528237b80 Contacts contract update for display photos.
This adds support for storing larger, hi-res photos in the contacts
system.  Thumbnails continue to be stored in the Photo.PHOTO column
as BLOBs, while hi-res versions of the photos are stored in the file
system and referenced via a photo file ID (with metadata stored in
a new table).

See go/large-photo-design for details.

Change-Id: Ie182eaa6a0330e2eca0a732f201f20a91e4dc584
2011-07-13 14:50:22 -07:00
Mike Lockwood
fd909a774c Merge "MediaScanner: fix breakage in updates" 2011-07-13 14:33:13 -07:00
Robert Ly
afcec44d5f Merge "docs: fix for bug 3186839" 2011-07-13 14:28:52 -07:00
Robert Ly
a704daa8b1 docs: fix for bug 3186839
Change-Id: I28305b73f0fe02593e072d690471a1448eb4c675
2011-07-13 14:25:52 -07:00
Svetoslav Ganov
3b56b0d74b Merge "Polish of the ActivityChooserView and ShareActionProvider." 2011-07-13 14:19:33 -07:00
Wink Saville
3810361e4a am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
  Remove STOPSHIP but allow seamless Handoff when possible.
2011-07-13 14:19:12 -07:00
Fabrice Di Meglio
fe7e40dc0d Fix bug #5025936 TableLayout layout direction resolution is broken
- check is the parent's view can do resolution when there is inheritance

Change-Id: Ic21d4ee761982ee219229a95f170b6bf2e596b02
2011-07-13 14:15:35 -07:00
Wink Saville
6d1d16c324 Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 2011-07-13 14:15:19 -07:00
Andreas Huber
a8ccc50175 Remove old-style software decoders.
Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
2011-07-13 14:14:08 -07:00
repo sync
0d4fc33479 Merge "Add REFER handling." 2011-07-13 14:09:33 -07:00
Chris Craik
101eb4810c Merge "Tile profiling interface" 2011-07-13 14:08:11 -07:00
Mathias Agopian
40001da8fa Merge "get rid of overlay HAL" 2011-07-13 14:07:01 -07:00
Svetoslav Ganov
76559a65ad Polish of the ActivityChooserView and ShareActionProvider.
1. Addressed the UX comments: ActivityChooserView's default selection
   popup no longer shows a message, rather hightlights the default
   action which now it displays. Alignemnt of the UI.

2. The ShareActionProvider shows a sub-menu if the host item goes
   on the overflow menu.

3. Now the heade layout of the activity chooser view is not needed hence
   dropped and the item and footer ones are merged.

Change-Id: I0b3de623e4c0a805be9ed73a8541e66b8c00e2d2
2011-07-13 13:57:32 -07:00
Mike Lockwood
45aaa2a345 MediaScanner: fix breakage in updates
To facilitate bulk inserts, we changed the media scanner to use the file URI
instead of the audio, video or image media URIs.
However we should still use the media URIs for updating existing records

Bug: 5021925

Change-Id: I6143dc1d00350192170428a5e951b52ef9223734
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 16:50:29 -04:00
Wink Saville
e822225f7a Remove STOPSHIP but allow seamless Handoff when possible.
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.


Bug: 4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
2011-07-13 13:44:13 -07:00
Chris Craik
445ab74a21 Tile profiling interface
Allows access to underlying WebView benchmarking calls.

Uses C++ backend from the following CL:
https://android-git.corp.google.com/g/#change,121035

Change-Id: Ib205340451aadfd40425f492afa4f2e46d314ebc
2011-07-13 13:19:37 -07:00
Jeff Brown
023e8c72e9 Merge "Revert "fix a weird use of Vector::appendVector()"" 2011-07-13 13:00:38 -07:00
Jeff Brown
b99a82437c Revert "fix a weird use of Vector::appendVector()"
This reverts commit 198fd888add624cf9e53ce31b776568a5d069916

This change seems to have exposed some other bugs.
Bug: 5026631
2011-07-13 12:51:11 -07:00
Jaikumar Ganesh
6dd4531639 resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp
Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85
2011-07-13 12:29:57 -07:00
Jason Sams
3ac60ada27 Merge "Add slot number to forEach hal." 2011-07-13 12:28:38 -07:00
Elliott Hughes
b9eba866b2 Fix aidl to cope with multiple collection types per method.
Bug: http://code.google.com/p/android/issues/detail?id=18497
Change-Id: I152416022524d2860cb16b46c4812c5be6bdcbad
2011-07-13 12:10:30 -07:00
Jason Sams
92b0eab07e Add slot number to forEach hal.
Change-Id: I0f2992d5f4128422d07f897b335c219cc7f1d02c
2011-07-13 11:26:26 -07:00
Jaikumar Ganesh
ab3ec17608 am 9ff89495: am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
* commit '9ff89495a4890191a0bc5dfddf28f23f79f23698':
  Bluetooth: correcting return value from cancelDiscovery
2011-07-13 10:25:27 -07:00
Jaikumar Ganesh
9ff89495a4 am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
* commit '53cf7858c3fd36082302efdc4d848925bcc0001e':
  Bluetooth: correcting return value from cancelDiscovery
2011-07-13 10:22:40 -07:00
John Wang
28d92afc0a am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '2ac78a2da52b29f6ac72294072d7ca87d991dab1':
  Add getImei() to Phone interface.
2011-07-13 10:21:38 -07:00