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

47311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
e1976e5c61 am 3b473d95: am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 
* commit '3b473d958c46ea6511b9599f727b47636e5cbc4a':
  USB: minor cleanup work
 2011-03-11 23:10:41 -08:00
James Dong
133cf8b92a Add a release() method to MediaScanner 
bug - 2586042

Change-Id: I08713ac75cbcaf01dff21a24cdefb6e2dacc92cb
 2011-03-11 19:08:59 -08:00
Mathias Agopian
718e64b17f Merge "Fix some const-ness and comments" 2011-03-11 18:45:33 -08:00
Christopher Tate
c37febe285 am 767d7a03: Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 
* commit '767d7a03733c867da7cad466a9303208eb51699f':
  Add a test app: quota exceeded doing a backup
 2011-03-11 18:24:49 -08:00
Christopher Tate
767d7a0373 Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 2011-03-11 18:22:37 -08:00
Dianne Hackborn
ce3bcbade5 am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 
* commit '9ff6483843bfa23751b1acf32b169fca9ad97f7f':
  Fix issues #4087362 and #4087356
 2011-03-11 18:04:04 -08:00
Dianne Hackborn
9ff6483843 Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 2011-03-11 18:01:47 -08:00
Christopher Tate
38507bb993 Add a test app: quota exceeded doing a backup 
This is a simple test app (a clone of the Backup/Restore sample code)
that deliberately backs up 20 megabytes of data every time it performs
a backup pass.  This is to trigger the quota-exceeded logic both on
the client and on the backend, for testing purposes.

Change-Id: I01f04d0f85c827baadf1990c09643d5eb5f88266
 2011-03-11 17:58:01 -08:00
James Dong
a7727dc887 Merge "If MP3 decoder output frame size were 0, media server would crash." 2011-03-11 17:55:52 -08:00
Mike Lockwood
3b473d958c am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 
* commit '9fffd9a8bb73e9b225878686862d49b27e98c659':
  USB: minor cleanup work
 2011-03-11 17:54:23 -08:00
Mike Lockwood
9fffd9a8bb Merge "USB: minor cleanup work" into honeycomb-mr1 2011-03-11 17:52:36 -08:00
Mathias Agopian
248ce94c57 Merge "Fix initialization order warning." 2011-03-11 17:03:45 -08:00
Mathias Agopian
f0ff906fa4 Fix some const-ness and comments 
mDrawingState doesn't need to be accessed by the
mStateLock, because by definition it's only accessed
from the main thread.

Similarily, the list of layers in the drawing state
cannot change (ie: is const).

Change-Id: I2e5da7f4d8caee7af7802b432cd45cc81c7c08b0
 2011-03-11 17:01:40 -08:00
Mathias Agopian
ccf94df600 Fix initialization order warning. 
Change-Id: I794dfaaa3a2f2645a89abc6c45de5f76e485f7d0
 2011-03-11 17:01:40 -08:00
Gilles Debunne
d40cc3c58a Removed empty block warnings in TextView 
Change-Id: Ieec52faa6fa7160fb3f8fca30cdd25125ccd51ee
 2011-03-11 16:59:32 -08:00
Ying Wang
86ad55028b Merge "Remove unnecessary ld flags." 2011-03-11 16:52:59 -08:00
Gilles Debunne
6a85508e94 Wrong null check in TextView 
Bug 4087576

Change-Id: I907cb08b24b23715f3900bc076de2cc856650981
 2011-03-11 16:51:41 -08:00
Adam Powell
e5c1bdfa98 am f7db87f0: am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 
* commit 'f7db87f0730ce91e3230b798b3a85bb47f655ba8':
  Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances
 2011-03-11 16:44:09 -08:00
Adam Powell
f7db87f073 am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 
* commit '87584f51a865cfe8ef19c2b24e858a63cb3e475c':
  Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances
 2011-03-11 16:41:50 -08:00
Adam Powell
87584f51a8 Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 2011-03-11 16:39:42 -08:00
Glenn Kasten
977d1fbf47 am dd264f21: am 76470914: Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 
* commit 'dd264f21e6e9952b3d2ef53ea8a8a9e918e5ce96':
  Bug 3515073 Add ANativeWindow_fromSurfaceTexture
 2011-03-11 16:36:42 -08:00
Glenn Kasten
dd264f21e6 am 76470914: Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 
* commit '7647091436c45af2d82f12c9ea9ec77fa309b49b':
  Bug 3515073 Add ANativeWindow_fromSurfaceTexture
 2011-03-11 16:34:30 -08:00
Glenn Kasten
7647091436 Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 2011-03-11 16:31:55 -08:00
James Dong
69ad25e0ff If MP3 decoder output frame size were 0, media server would crash. 
This is to log an error message should that happen.

Change-Id: I0f947cd7a8e6639b4f11a928bf90286a34cc652e
 2011-03-11 16:13:15 -08:00
Ying Wang
eab30df281 Remove unnecessary ld flags. 
This fixes the x86 buid, in which bfd linker is unavailabe.

Change-Id: Ibce1b5cbfb0435644b2d75056003578371510929
 2011-03-11 16:06:02 -08:00
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
9a3595c2c8 am c6c311f7: am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 
* commit 'c6c311f77459c3852d4a8c887657f6a135ad4cdf':
  HTML5 Video improvements
 2011-03-11 15:18:46 -08:00
Robert Greenwalt
66a09d0a17 am 618377d8: Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '618377d83d4a280c2e0f89642bfb1046d387ad7d':
  Don't accept a user-defined dun-capable connection
 2011-03-11 15:17:44 -08:00
James Dong
d96d1be7bd Merge "A little cleanup in MediaScanner JNI code" 2011-03-11 15:15:40 -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
Eric Hassold
f667740d28 Merge "Default to NONE format in Layer" 2011-03-11 15:08:16 -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
Chih-Wei Huang
4c1ac4e665 Remove unnecessary SkImageDecoder_libjpeg.cpp 
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's

out/target/external/skia/src/images/SkImageDecoder_libjpeg.o

It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.

Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.

Change-Id: Ia0ed72d8a6cbd3b2f3997b71dfdcf72fee50f5bb
 2011-03-11 14:02:39 -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
James Dong
f399752858 A little cleanup in MediaScanner JNI code 
o mainly use the defined class name rather than repeat the string each time
  to reduce the typo chance.
o format the code also

Change-Id: I131c98f11335ff524d01a6791baa1b8c11013abc
 2011-03-11 13:36:28 -08:00
Mike Lockwood
f25a7964a3 am 7e6f519c: am 14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 
* commit '7e6f519c0704321461e256c919b4d554f23a4261':
  Clear default for USB device/accessory when new matching app is installed
 2011-03-11 13:27:56 -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
aa4c99c61f am 236d41c7: am 761b8440: am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb 
* commit '236d41c732f58ca22a1f18480a506302b32157ac':
  DOC CHANGE: Fix 4084450 monkeyrunner_concepts
 2011-03-11 13:14:36 -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