38455 Commits

Author SHA1 Message Date
Martijn Coenen
25d61bb3a0 am 12e5c1a2: am c58c3f1a: Implement additional Mifare Ultralight convenience methods.
* commit '12e5c1a21ee0dad786e8e5e7f7ca18e8ffdd53e5':
  Implement additional Mifare Ultralight convenience methods.
2010-12-16 16:10:02 -08:00
Martijn Coenen
e645311047 am bf76b52f: am 0d27f999: Expose reconnect(), to allow applications to reset tag state.
* commit 'bf76b52f05384feddb073ee6aa18091f701d069b':
  Expose reconnect(), to allow applications to reset tag state.
2010-12-16 16:09:55 -08:00
Martijn Coenen
03077d04b0 am 9dce44ff: am 4049f9d0: Implement multi-tech connect, enfore tech exclusivity.
* commit '9dce44ffbb0edcc59b7f72a59099abb313167d0b':
  Implement multi-tech connect, enfore tech exclusivity.
2010-12-16 16:09:42 -08:00
Eric Laurent
a1608902f9 am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
* commit '5a756fb0f1f3f8cd7612284c889dfc69875577a8':
  Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
2010-12-16 16:05:16 -08:00
Scott Main
49cdfcf574 am 3165bbb1: cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
* commit '3165bbb15560ed9facdfb906da55a9b24eb5989a':
  cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
2010-12-16 16:05:00 -08:00
Scott Main
c4172983fb am 4ea442b4: Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread
* commit '4ea442b49c2f44c180346fe780a2b8c9766b587b':
  cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links
2010-12-16 16:04:54 -08:00
Martijn Coenen
12e5c1a21e am c58c3f1a: Implement additional Mifare Ultralight convenience methods.
* commit 'c58c3f1ae27c0c7f560bd381180397d7f6a2ebed':
  Implement additional Mifare Ultralight convenience methods.
2010-12-16 16:04:47 -08:00
Martijn Coenen
bf76b52f05 am 0d27f999: Expose reconnect(), to allow applications to reset tag state.
* commit '0d27f999f4b1ad51da11946800b40d2978fc6326':
  Expose reconnect(), to allow applications to reset tag state.
2010-12-16 16:04:41 -08:00
Martijn Coenen
9dce44ffbb am 4049f9d0: Implement multi-tech connect, enfore tech exclusivity.
* commit '4049f9d00a86f848d42d2429068496b31a6795ad':
  Implement multi-tech connect, enfore tech exclusivity.
2010-12-16 16:04:28 -08:00
Ben Komalo
cbda9104d0 Fix incorrect anonymous AnimatorListenerAdapter.
Change-Id: I0384a437089d11dda03d0657235404ea96e8b19d
2010-12-16 15:59:22 -08:00
Scott Main
0d1e38ef99 cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c
docs: misc fixes to the drawable reference

Change-Id: I8b867234250ca18d5b6ee78a22b6150e1ba3e588
2010-12-16 15:48:36 -08:00
Mike Lockwood
076e05b488 MediaScanner: Add support for scanning empty directories
Currently the media scanner does not create database entries for directories
unless they contain a file that is scanned.
Fixing this so we provide a consistent view of the world to MTP.

Change-Id: Ia776acfeae23192183e7192d63cdc34d830ea889
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-16 15:35:36 -08:00
Chet Haase
27c1d4debb Fix minor animation and doc issues
Change-Id: I0ea077d9434ac3e22e8600f22ca4a24a6a46965c
2010-12-16 15:25:52 -08:00
Fred Quintana
b19e62add0 fix the TooManyDeletes to show up again
It was moved so it was no longer in the location that
SyncManager expected. I fixed it by (a) moving it to the
SyncManager directory and by (b) changing the SyncManager to
refer to it by class rather than by class name, which means
it will now check for it at compile time, not run time.
Bug: 3289922

Change-Id: I24f8bac371a16c62c2a38ed1024702c6d0913b93
2010-12-16 15:19:37 -08:00
Irfan Sheriff
d3040307ab Merge "Fix ssid storage regression" 2010-12-16 14:46:32 -08:00
Daniel Sandler
7ef29b5a06 Update flyover if notification changes.
Bug: 3292466
Change-Id: I11407b7a0eedc3d8474d34e45e4b472a2dc61d27
2010-12-16 17:29:50 -05:00
Joe Onorato
cf321c1abe Merge "Fix the SettingsView so it shows again." 2010-12-16 13:55:50 -08:00
Joe Onorato
244e415905 Fix the SettingsView so it shows again.
Change-Id: Ie041fd12412ee1de9d1f90604b777db2fd00f550
2010-12-16 13:29:38 -08:00
Dianne Hackborn
88b03bd2e1 Hm somehow my log didn't make it in the last patch.
Change-Id: If7b3b041e478e1f05998323c02deb665f65073cb
2010-12-16 13:29:27 -08:00
Dianne Hackborn
64b591de33 Merge "Fix issue #3291975: Google services frame work crash..." 2010-12-16 13:07:28 -08:00
Mike Lockwood
060f217546 Merge "Add Process.MEDIA_RW_GID constant" 2010-12-16 12:59:07 -08:00
Mike Lockwood
dcaa10cd36 Add Process.MEDIA_RW_GID constant
Change-Id: I2358e5ef1e55ee4b1b9725451ce06cfbf3ed54a4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-16 12:56:12 -08:00
Dianne Hackborn
3ec27e06a7 Fix issue #3289835: NullPointerException in...
..PackageManagerService.grantPermissionsLP when updating system app

Change-Id: I36c1b96d2fe9a8737843d30f3a2669935fc281bb
2010-12-16 12:41:56 -08:00
Andreas Huber
161929ff31 Merge "Instead of asserting, gracefully abort and signal and error." 2010-12-16 12:39:37 -08:00
Jason Sams
8903058a4a Merge "Remove outdated texture upload functions." 2010-12-16 12:22:01 -08:00
Jason Sams
e5d3712d9e Remove outdated texture upload functions.
Change-Id: Ie3f9ba64a94425fa96b1924cb4b70dd36b71e294
2010-12-16 12:18:28 -08:00
Jesse Wilson
e8a56933de Merge "New tests for AndroidHttpClient with a proxy server." 2010-12-16 12:16:52 -08:00
Jesse Wilson
bf1df887d4 New tests for AndroidHttpClient with a proxy server.
Change-Id: I03ec2f1257824c8675156dd80f6045512d1a36fe
http://b/3254717
2010-12-16 12:06:32 -08:00
Mike LeBeau
17268ccfcf Merge "Add new EXTRA_WEB_SEARCH_ONLY to RecognizerIntent API. This can be used to avoid triggering any non-web-search actions from the speech recognizer (such as Voice Actions in the Google implementation). The browser will set this to true to avoid triggering non-web-search actions when speech recognition is requested from the browser." 2010-12-16 11:43:30 -08:00
Mike LeBeau
b30023caba Add new EXTRA_WEB_SEARCH_ONLY to RecognizerIntent API. This can be used to
avoid triggering any non-web-search actions from the speech recognizer
(such as Voice Actions in the Google implementation). The browser will set
this to true to avoid triggering non-web-search actions when speech
recognition is requested from the browser.

Change-Id: I9b410ef8696e12f22dbad325b367f0f187a2dce8
http://b/3289997
http://b/3176717
2010-12-16 14:41:46 -05:00
Robert Greenwalt
81d5ad515a Fix Bluetooth-tethering config of interface.
bug:3288692
Change-Id: Id7f1b680392f938000953157716bf9a8f8a66af9
2010-12-16 11:35:40 -08:00
Andreas Huber
c4f297d612 Instead of asserting, gracefully abort and signal and error.
Change-Id: I170a602ed80e6c85a94e46deadfc02aaf92bfebb
2010-12-16 11:31:13 -08:00
Eric Laurent
5a756fb0f1 Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread 2010-12-16 11:18:29 -08:00
Dianne Hackborn
cb8f0e099c Fix issue #3291975: Google services frame work crash...
..observed after adding Google account from Gtalk

Change-Id: Ide0646e01ded6f661e4e8de990a21e4d4330b416
2010-12-16 11:15:18 -08:00
Andreas Huber
f76aca984c Merge "The HTTP/1.1 Host request header must include port if it's not the default (80)." 2010-12-16 10:51:15 -08:00
Andreas Huber
3abb7dde86 The HTTP/1.1 Host request header must include port if it's not the default (80).
Change-Id: Idcc1429fbeecef99dad435208c9a1bd481132e2b
2010-12-16 10:45:24 -08:00
Eric Laurent
82ca370694 Merge "Fix speakerphone routing to analog dock" 2010-12-16 10:41:16 -08:00
Scott Main
3165bbb155 cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5
docs: misc fixes for the adb move

Change-Id: Ie7701d9c1656c6cb5ae6063562efeabd9eb737a3
2010-12-16 10:34:54 -08:00
Vasu Nori
ceb99ec550 Merge "fix downloadmanager tests. add few more. fix some. isolate flaky ones" 2010-12-16 10:28:27 -08:00
Eric Laurent
051c751569 Merge "Fix error in HDMI and digital dock intent strings" 2010-12-16 10:28:05 -08:00
Andreas Huber
2e8295950a Merge "Remove now obsolete implementation of streaming from AwesomePlayer." 2010-12-16 10:26:48 -08:00
Andreas Huber
52185ff754 Merge "Properly announce decoder output format changes, make sure AMessage::dup does." 2010-12-16 10:26:37 -08:00
James Dong
49dad77148 Merge "Give the standard not compliant video sample a chance if its size in the mp4 header is invalid" 2010-12-16 10:24:27 -08:00
Andreas Huber
d936726fd7 Remove now obsolete implementation of streaming from AwesomePlayer.
Change-Id: If62bedbf74c8e987d6651604d7bebc9da381e86a
2010-12-16 10:16:36 -08:00
Kristian Monsen
d4819a722b Add methods to send messages to the WebViewCore whithout having a reference
Change-Id: I8543e862e7a93651c3e3fa9bcefc8ea5f857a152
2010-12-16 18:14:46 +00:00
Andreas Huber
687b32d83e Properly announce decoder output format changes, make sure AMessage::dup does.
Change-Id: Ia77f6b6d5e5c5055583740dfe876b8a3c22be9b6
2010-12-16 10:08:26 -08:00
Daniel Sandler
6f6cf3c5e5 Reimplement StatusBarManager.disable(DISABLE_SYSTEM_INFO).
Bug: 3284968
Change-Id: I7171b7770c2972bb56672a771c7ed5ca10fb4dda
2010-12-16 12:54:03 -05:00
Eric Laurent
aef0cbb885 Fix speakerphone routing to analog dock
The audio routing policy when speakerphone is on and a dock with built-in
speakers is connected should be to output audio to teh dock speakers

Also removed route to SCO car kit if forced usage is not SCO as the SCO
socket might not be established.

Change-Id: I1aa2954092e28de935304b90f7a7a64d661934c7
2010-12-16 09:44:42 -08:00
Eric Laurent
4d29b2f11d Fix error in HDMI and digital dock intent strings
Intent.ACTION_USB_DGTL_HEADSET_PLUG and Intent.ACTION_HDMI_AUDIO_PLUG
where mistakenly using the same string.

Change-Id: Iede1896196585396dcc7e00aad06ad60e9a87875
2010-12-16 09:25:53 -08:00
Iain Merrick
6a4d0a6af2 Merge "*Don't* disable CacheManager when using Chromium HTTP stack." 2010-12-16 08:52:14 -08:00