drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,178 Commits 1 Branch 0 Tags
Commit Graph

47178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
62cfeeb821 USB: minor cleanup work 
Bug: 4067029

Change-Id: Icd8f912ab8732b5f770a217b9b3731092597ce02
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 18:51:29 -05:00
Kenny Root
206c62ed34 am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-11 15:45:34 -08:00
Nicolas Roard
c6c311f774 am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 
* commit 'f0230cca194c840684bab959856c56725fc40b87':
  HTML5 Video improvements
 2011-03-11 15:11:14 -08:00
Gloria Wang
192b591cdc - Some change on the DrmManager in order to support feature request 4082089. 
In DrmManager, we currently lock both processDrmInfo() and onInfo() which is
    ok for now since processDrmInfo() is async call, and it will return without
    waiting for onInfo() call. However, if we send an event in processDrmInfo(),
    we will got deadlock here because we need to invoke onInf() which will wait
    for processDrmInfo() to release the lock. Use different lock for onInfo().
- Remove some redundent mutex lock.

Change-Id: I59c794f95ba1693425723224114fa975cf9b235f
 2011-03-11 14:54:23 -08:00
Nicolas Roard
f0230cca19 Merge "HTML5 Video improvements" into honeycomb-mr1 2011-03-11 14:35:32 -08:00
James Dong
7d93b7574f am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 
* commit '68f66b945e7a69549689becd2e656d9056f1e7f5':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
 2011-03-11 14:31:37 -08:00
Nicolas Roard
0e778a1ab0 HTML5 Video improvements 
- add support for the fullscreen button

counterpart webkit CL: https://android-git.corp.google.com/g/#change,101484

bug:2126902
Change-Id: Ibcc8c5b115089ad1f30ebe76e4d5c31b2d6389f9
 2011-03-11 14:29:05 -08:00
Kenny Root
2fdf829a17 Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 2011-03-11 14:22:22 -08:00
Robert Greenwalt
618377d83d Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-03-11 14:16:18 -08:00
Robert Greenwalt
fe99eb7548 resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp 
Change-Id: I7909f30fa5273693d115fd4b565f6c424c95dcc0
 2011-03-11 14:05:14 -08:00
Dianne Hackborn
cf407ad88b Fix issues #4087362 and #4087356 
4087362: Provide a safer way to call DialogFragment.dismiss()
4087356: PreferenceActivity.invalidateHeaders() can cause
IllegalStateException: Can not perform this action after onSaveInstanceState

These are very safe; the first is just a new public API that
allows you to use an existing feature in DialogFragment, and the
second just uses the version of commit that avoids the failure if
happening at a point where the operation would be lost if restored
from the last state (which is no big deal for preferences).

Change-Id: I53971c9fb1efdcd599694cdcd4585b81afc156b8
 2011-03-11 13:48:32 -08:00
James Dong
68f66b945e Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 2011-03-11 13:38:02 -08:00
Mike Lockwood
7e6f519c07 am 14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 
* commit '14c875eac750ca096de439225b1a028b1facc58e':
  Clear default for USB device/accessory when new matching app is installed
 2011-03-11 13:26:14 -08:00
Mike Lockwood
14c875eac7 Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 2011-03-11 13:24:01 -08:00
Joe Malin
236d41c732 am 761b8440: am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb 
* commit '761b84409135641ec27bb828dbd8a1d04a7252fe':
  DOC CHANGE: Fix 4084450 monkeyrunner_concepts
 2011-03-11 13:12:37 -08:00
Mike Lockwood
c7d32d1065 Clear default for USB device/accessory when new matching app is installed 
Bug: 4063041

Change-Id: Ia1b4f29d3e54ec21aa64407720d9d5db62855380
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 16:12:07 -05:00
Joe Malin
761b844091 am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb 
* commit '9f18729676a58cdfcee98db3329de3397c657d48':
  DOC CHANGE: Fix 4084450 monkeyrunner_concepts
 2011-03-11 13:10:29 -08:00
Joe Malin
9f18729676 Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb 2011-03-11 13:08:59 -08:00
Ying Wang
e557025563 am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread 
* commit '69e725eb8806180749b66903382754c86a15d0f6':
  Dist com.android.nfc_extras.jar.
 2011-03-11 12:05:22 -08:00
Robert Greenwalt
2e7415564a am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 
* commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
  DO NOT MERGE Backport of I1f55df8a from master.
 2011-03-11 11:52:31 -08:00
Adam Powell
c37308f116 Fix bug 4083825 - Gesture zoom locked along content edges under some 
circumstances

Tune the procedure used to handle "zoom slop" during a webview
pan+zoom gesture.

Change-Id: Ia706722ba6a46e64cce8814d4668e3857b16e562
 2011-03-11 11:44:08 -08:00
Mike Lockwood
75c95e9a6d am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* commit '0eb7b697b7c180660647b5cd0cd7dd067f6b6abb':
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 11:37:14 -08:00
James Dong
070b2e1a5c MP3Extractor and MP3 decoder fixes - DO NOT MERGE 
cherry-picked the following patches from HC branch:
o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits
o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
o When the temp buffer wraps around, the next read position should start
    from what have been read to avoid reading the same remaining bytes in
    the buffer again.
o Speed up MP3Extractor using cached reads

bug - 4083532

Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
 2011-03-11 11:02:17 -08:00
Mike Lockwood
0eb7b697b7 Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* changes:
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 10:57:06 -08:00
Christopher Tate
ab1f2a824b am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 
* commit '9856fbd40470c9f441b6c38b980210cfdef821e9':
  Broaden the filter for wallpaper restore
 2011-03-11 10:48:46 -08:00
Christopher Tate
9856fbd404 Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 2011-03-11 10:45:17 -08:00
Dianne Hackborn
8657427f78 am 7b076307: Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1 
* commit '7b076307bb1f78d3f5616b7f2f2ad496aa4a33d7':
  Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121
 2011-03-11 10:44:46 -08:00
Dianne Hackborn
1bada408f9 am 492eb33d: Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 
* commit '492eb33d549afa65e630d2f4886b1bdf3d979d04':
  Fix issue #4081756: Crash when un-stopping applications
 2011-03-11 10:44:42 -08:00
Dianne Hackborn
7b076307bb Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1 2011-03-11 10:39:46 -08:00
Dianne Hackborn
492eb33d54 Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 2011-03-11 10:38:52 -08:00
Ying Wang
69e725eb88 Merge "Dist com.android.nfc_extras.jar." into gingerbread 2011-03-11 10:17:49 -08:00
Robert Greenwalt
b5c51d5fa8 Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 2011-03-11 10:14:28 -08:00
Glenn Kasten
055066e1e7 am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1 
* commit '92f2f3ff2ea5c5b474722f2055cfee4916010e26':
  Bug 3012968 DRM output control
 2011-03-11 08:44:35 -08:00
Glenn Kasten
92f2f3ff2e Merge "Bug 3012968 DRM output control" into honeycomb-mr1 2011-03-11 08:43:05 -08:00
Mike Lockwood
a75075e167 UsbManager: Hide APIs not needed for USB host or accessory support. 
Bug: 4067029

Change-Id: Ib63ab95a6571d6a691834bfb583a68d2e4cfd22e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 11:26:38 -05:00
Mike Lockwood
c72eb9113a Remove MtpClient class from framework and public API 
After reviewing this class I decided it would be best not to include it in the public API
since it adds no functionality that cannot be done using MtpDevice and other APIs directly.
So I am moving it to the CameraBrowser sample instead.

Also changed CameraBrowser to build against the SDK to ensure all the necessary APIs for
PTP support have been made public.

Bug: 4067029

Change-Id: I585b06104084953176d018ced08bba0cb4607490
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 10:55:44 -05:00
Mike Lockwood
acc29cc91b UsbDevice: Move IO related methods to new UsbDeviceConnection class 
UsbDevice is now just an immutable parcelable object like UsbInterface and
UsbEndpoint.
All IO related functionality is now contained in UsbDeviceConnection
and UsbRequest.

Bug: 4067029

Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 10:24:21 -05:00
Mike Lockwood
4135cb8e43 am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1 
* commit '364903bac6b9bfde694f1c0c5c40b6a2af628408':
  Support for USB accessory URIs
 2011-03-11 06:02:57 -08:00
Mike Lockwood
364903bac6 Merge "Support for USB accessory URIs" into honeycomb-mr1 2011-03-11 05:56:50 -08:00
Jim Miller
7b7a8ca615 am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 
* commit '352987e0889b6fa8862f489bc31ba7e9de8d1cbe':
  Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
 2011-03-10 23:01:42 -08:00
Jim Miller
352987e088 Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 2011-03-10 22:59:57 -08:00
Justin Ho
f5c2d35059 am f1093dfd: Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1 
* commit 'f1093dfd7b15c7f33341a4062987c906c061d65f':
  Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF
 2011-03-10 22:33:43 -08:00
Justin Ho
f1093dfd7b Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1 2011-03-10 22:31:29 -08:00
Justin Ho
48a412bded Updated cellular data indicators with transmission signals AGAIN 
Bug: #6699FF

Change-Id: Idfc1c43e3fb2df12665bcc3ea18ae7b9f6dfbe9e
 2011-03-10 22:26:34 -08:00
Justin Ho
cf99638b6b am 57162cdc: Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1 
* commit '57162cdcdeaacc826011f98d0285c6034797f5f3':
  Wire up the data activity reporting on wifi icon in status bar.
 2011-03-10 22:24:51 -08:00
Justin Ho
57162cdcde Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1 2011-03-10 22:22:57 -08:00
Joe Onorato
f32621aded Wire up the data activity reporting on wifi icon in status bar. 
Bug: 3412258 and #6699FF
Change-Id: I11142f1cd5a2a60045b2a1fea371b2ead2aa81b4
 2011-03-10 22:21:50 -08:00
Adam Powell
2737dfe0a5 am 5ec35c17: Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1 
* commit '5ec35c172ad0628b7092ab34f962ff2c063905d8':
  Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser
 2011-03-10 21:43:45 -08:00
Justin Ho
f333baa015 am dacf0d02: Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1 
* commit 'dacf0d022f1f78e60fffcd8b6b547743cca51c76':
  Updated cellular data indicators with transmission signals Bug: #6699FF
 2011-03-10 21:41:53 -08:00
Adam Powell
5ec35c172a Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1 2011-03-10 21:40:38 -08:00