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

40760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dharmaray Kundargi
9db4aa09e9 am bf6ccb04: am 307003a8: Merge "integrate videoeditor preview player." into honeycomb 
* commit 'bf6ccb04b93f7a2738f29f2d96a69f32f7602f51':
  integrate videoeditor preview player.
 2011-01-17 11:53:15 -08:00
Dharmaray Kundargi
3b9b12b5f0 am f7465eb6: am 4e4f3d1d: Merge "videoeditor JNI files on honeycomb" into honeycomb 
* commit 'f7465eb652717d89193b0208a85edc8bd1ef0b4d':
  videoeditor JNI files on honeycomb
 2011-01-17 11:53:10 -08:00
Dharmaray Kundargi
bf6ccb04b9 am 307003a8: Merge "integrate videoeditor preview player." into honeycomb 
* commit '307003a844c90458bcfd7398c44bbae734936238':
  integrate videoeditor preview player.
 2011-01-17 11:40:16 -08:00
Dharmaray Kundargi
f7465eb652 am 4e4f3d1d: Merge "videoeditor JNI files on honeycomb" into honeycomb 
* commit '4e4f3d1df475b03a1a49954d2b3b4530e39778ab':
  videoeditor JNI files on honeycomb
 2011-01-17 11:40:11 -08:00
Eric Laurent
dac2a9f8e7 am 20fd4c8b: am 72b83b59: Merge "Fix issue 3354692." into honeycomb 
* commit '20fd4c8b9645b37e957a8e63a88316bb2b32af84':
  Fix issue 3354692.
 2011-01-17 10:55:45 -08:00
Romain Guy
4982d91ca4 am e99d5e6e: am cfe5dd01: Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb 
* commit 'e99d5e6eb8facb3e8dabfba68fffe0e0fd556000':
  Yet another fix for 9patch rendering. Bug #3362133
 2011-01-17 10:55:42 -08:00
Eric Laurent
20fd4c8b96 am 72b83b59: Merge "Fix issue 3354692." into honeycomb 
* commit '72b83b5938a997b4d69edcd09a46a06ac39102d4':
  Fix issue 3354692.
 2011-01-17 10:53:06 -08:00
Romain Guy
e99d5e6eb8 am cfe5dd01: Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb 
* commit 'cfe5dd01f29acbb7393ffa91bb4b2a8ad43414f2':
  Yet another fix for 9patch rendering. Bug #3362133
 2011-01-17 10:53:02 -08:00
Dharmaray Kundargi
307003a844 Merge "integrate videoeditor preview player." into honeycomb 2011-01-17 10:52:23 -08:00
Dharmaray Kundargi
4e4f3d1df4 Merge "videoeditor JNI files on honeycomb" into honeycomb 2011-01-17 10:52:13 -08:00
Eric Laurent
72b83b5938 Merge "Fix issue 3354692." into honeycomb 2011-01-17 10:51:46 -08:00
Romain Guy
cfe5dd01f2 Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb 2011-01-17 10:51:32 -08:00
Romain Guy
7444da5126 Yet another fix for 9patch rendering. 
Bug #3362133

Change-Id: Ia6521d31a8c208a2ad2506a23b6a01e5e442ad86
 2011-01-17 10:53:44 -08:00
Eric Laurent
117b7bb5b5 Fix issue 3354692. 
The problem is that SoundPool never calls the onLoadComplete() callback
when load() method fails because the file cannot be opened.
AudioService loadSoundEffects() was blocked waiting for a callback
that never came.
In this particular case, this happened on a specific build where sound
effects assets were not included.

The fix consists in waiting for the callback only if at least one sample is
accepted by SoundPool load().

Also moved the initial loading of sound effect samples from the boot completed
broadcast receiver to the audio service message handler to avoid waiting in the
main system server thread.

Change-Id: I902e5988f8b644a81d8e585c52eed1df4ca0ec05
 2011-01-17 10:36:12 -08:00
Kenny Root
87f11d7640 am 7b5b79e4: am ec7c9ff0: Hide USB mass storage APIs in StorageManager 
* commit '7b5b79e4bc759b0a48c99a8edb28d932955e6117':
  Hide USB mass storage APIs in StorageManager
 2011-01-17 09:57:23 -08:00
Kenny Root
7b5b79e4bc am ec7c9ff0: Hide USB mass storage APIs in StorageManager 
* commit 'ec7c9ff0bb1c98cb8bec3ec7bdacbae3a434fa53':
  Hide USB mass storage APIs in StorageManager
 2011-01-17 09:55:31 -08:00
Kenny Root
ec7c9ff0bb Hide USB mass storage APIs in StorageManager 
They appear to have been unhidden in a bad merge from gingerbread.

Change-Id: Ice0fc865425d5d885af3c2e90a7ffeaa1d623b80
 2011-01-17 09:15:36 -08:00
Shih-wei Liao
1d91ee3afd am 9dc76d53: am 38f79d01: Merge "Make ImageProcessing work." into honeycomb 
* commit '9dc76d53edd32ee64f963b06f7fbb1aa30ee02d0':
  Make ImageProcessing work.
 2011-01-17 01:22:25 -08:00
Shih-wei Liao
9dc76d53ed am 38f79d01: Merge "Make ImageProcessing work." into honeycomb 
* commit '38f79d01db07f7cc3d3b49d594b675adfa8959d5':
  Make ImageProcessing work.
 2011-01-17 01:20:42 -08:00
Shih-wei Liao
38f79d01db Merge "Make ImageProcessing work." into honeycomb 2011-01-17 01:18:32 -08:00
Shih-wei Liao
2aad562ab2 Make ImageProcessing work. 
Change-Id: Id1ab91657ff4ba70a2391b168958e72b68e8a3e0
 2011-01-17 01:17:39 -08:00
satok
a8ed84c6bc am d039293c: am 5a1473ba: Merge "Implicitly/Explicitly subtypes bug." into honeycomb 
* commit 'd039293c172a6d2135c737af39d919ae2c42c919':
  Implicitly/Explicitly subtypes bug.
 2011-01-16 23:51:55 -08:00
satok
d039293c17 am 5a1473ba: Merge "Implicitly/Explicitly subtypes bug." into honeycomb 
* commit '5a1473bae0467693445b31454e4f736763276de8':
  Implicitly/Explicitly subtypes bug.
 2011-01-16 23:50:06 -08:00
satok
5a1473bae0 Merge "Implicitly/Explicitly subtypes bug." into honeycomb 2011-01-16 23:48:24 -08:00
satok
f6cafb6375 Implicitly/Explicitly subtypes bug. 
Change-Id: I6ccc22d4272ee92c0d8ba3f3c724d8f838d51310
 2011-01-17 16:29:02 +09:00
Adam Powell
98893db9dc am 4ba7f35e: am 92cd4d02: Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb 
* commit '4ba7f35e0f9cfdf59ed6e8f9092992893da46d4a':
  Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.
 2011-01-16 23:08:54 -08:00
Adam Cohen
b9efec8b3d am 0a654ae3: am d110889c: Fixing bug related to collisions with AppWidget view ids and AppWidgetHost view ids 
* commit '0a654ae398a84858ed00326c75b8ca15516db880':
  Fixing bug related to collisions with AppWidget view ids and AppWidgetHost view ids
 2011-01-16 23:08:46 -08:00
Xavier Ducrohet
baf3e38d66 am bca118f0: am 87ab45c0: Merge "LayoutLib: extract resource resolution into its own class." into honeycomb 
* commit 'bca118f027cd7f65acbf04300c6083cd2137c227':
  LayoutLib: extract resource resolution into its own class.
 2011-01-16 23:08:40 -08:00
Jim Miller
5fbda0427a am f0c53e66: am bdac9e0f: Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into honeycomb 
* commit 'f0c53e66997bf781fb52f76e58aa0928fd8b64eb':
  Fix 3005526: Properly update StatusView from Password/PIN unlock
 2011-01-16 23:08:30 -08:00
David 'Digit' Turner
924e8ae4c4 am 5356487f: am 3612f087: Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb 
* commit '5356487f8bf732d7ff4cd89692cf5937b54c1721':
  SystemServer: Do not register null BlueTooth service in the emulator
 2011-01-16 23:08:24 -08:00
Jeff Brown
c886ff38c7 am fed9d654: am 5cdf0752: Merge "Support non-rectangular input regions." into honeycomb 
* commit 'fed9d654e9f769a2d81682121faff01fee11555f':
  Support non-rectangular input regions.
 2011-01-16 23:08:18 -08:00
Dianne Hackborn
c293a5627f am e27145d8: am 805fd7ee: Add API to get path to OBBs. 
* commit 'e27145d83f144eb025f34985a02cda9cd5e0bcfe':
  Add API to get path to OBBs.
 2011-01-16 23:08:00 -08:00
Jamie Gennis
8824624a3b am d97ea28b: am cf18c478: Merge "Implement SurfaceTexture frame-available callback." into honeycomb 
* commit 'd97ea28b48b49c02cb9c0af015d1f11e8855d47b':
  Implement SurfaceTexture frame-available callback.
 2011-01-16 23:07:50 -08:00
Jamie Gennis
dd9b658cb9 am ecd797b1: am 41424ade: Merge "Fix SurfaceTexture transform matrix." into honeycomb 
* commit 'ecd797b12fd19a6e3cfe0e92a4a5601d395bb753':
  Fix SurfaceTexture transform matrix.
 2011-01-16 23:07:44 -08:00
Mathias Agopian
2f1fb40720 am 4f22f981: am 84d36f0a: Merge "egl: fix GetProcAddress for EGLimage extensions" into honeycomb 
* commit '4f22f981fd2b172487ccc35e83fe604569c5430d':
  egl: fix GetProcAddress for EGLimage extensions
 2011-01-16 23:07:39 -08:00
Mathias Agopian
5b0cf9d01a am 82fcc216: am f90633a0: Merge "egl: expose EGLimage extensions" into honeycomb 
* commit '82fcc21683e7590df05a6455e301ffed35163133':
  egl: expose EGLimage extensions
 2011-01-16 23:07:22 -08:00
Jim Miller
9e8d9b6cd9 am a55c1280: am 057d9f16: Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb 
* commit 'a55c1280f9b674619368ee61e4fe6b8db64eb2ce':
  Fix 3342063: Correctly update StatusView when battery changes.
 2011-01-16 23:06:59 -08:00
Jason Sams
f32424315d am 58d10708: am 7f13a850: Merge "Add some error checking." into honeycomb 
* commit '58d1070861237cf8f931808cc143c3da090da056':
  Add some error checking.
 2011-01-16 23:06:50 -08:00
Adam Cohen
432589b046 am dc0b8323: am 50204584: Fixing StackView bug (Issue: 3321912) 
* commit 'dc0b8323d4fbe9c41de674ef8b18dd4efab67846':
  Fixing StackView bug (Issue: 3321912)
 2011-01-16 23:06:36 -08:00
Jeff Brown
7b86464181 am 01f4a588: am 2d1072ed: Merge "Flush Binder commands in ndk looper." into honeycomb 
* commit '01f4a588eaf793392bd30ac48a10fe99ab14cbbc':
  Flush Binder commands in ndk looper.
 2011-01-16 23:06:29 -08:00
Patrick Dubroy
a409951f91 am c0147531: am e7218240: Merge "Add a method for clearing all animations on a thread." into honeycomb 
* commit 'c01475318e0618219e9e56f274b38f6d3b76a9b1':
  Add a method for clearing all animations on a thread.
 2011-01-16 23:06:11 -08:00
Adam Powell
0acd32fddf am 4b8bb8b0: am 70359ce2: Merge "Fix bug 3050138 - Action bar does not display correctly when many action items are added" into honeycomb 
* commit '4b8bb8b01aa9c2eb2b94318009d6e84387ee0b01':
  Fix bug 3050138 - Action bar does not display correctly when many action items are added
 2011-01-16 23:06:04 -08:00
Mathias Agopian
109023a90d am d13ff8de: am 8a852406: Merge "Add logs when taking a screenshot to help tracking issue 3361121" into honeycomb 
* commit 'd13ff8de1af1a2a022c74a4fb9f801f1cb77f262':
  Add logs when taking a screenshot to help tracking issue 3361121
 2011-01-16 23:05:55 -08:00
Adam Cohen
efc47c52cf am 760534a6: am 67e8915c: Merge "Fixing StackView bugs:" into honeycomb 
* commit '760534a68aebc761bd12a9cccf76135cb3e5ce3d':
  Fixing StackView bugs:
 2011-01-16 23:05:39 -08:00
Joe Onorato
8f769f8a80 am 85e700ca: am 08a555ba: Merge "Remove a bunch of logging." into honeycomb 
* commit '85e700ca2e89d1174a591e99e5f16eaf46509c9c':
  Remove a bunch of logging.
 2011-01-16 23:05:29 -08:00
Kenny Root
a9d5188cc6 am d259468f: am fc28f412: Merge "Put externalSize measurements in PackageStats" into honeycomb 
* commit 'd259468fe92b9714b45a134e781ce09681e70217':
  Put externalSize measurements in PackageStats
 2011-01-16 23:05:15 -08:00
Jeff Brown
90ba0c070c am 04970d65: am 3392b8e2: am 4a2e478a: Merge "Flush Binder commands in ndk looper." into gingerbread 
* commit '04970d654d96404cff60f774c1b7a02da03c75fd':
  Flush Binder commands in ndk looper.
 2011-01-16 23:05:06 -08:00
Jim Miller
a3006a46d0 am 3530ebe4: resolved conflicts for merge of 578e73da to honeycomb-plus-aosp 
* commit '3530ebe451fea39b159baa9b8c9f9cd851de42a3':
  Fix 3106227: use WeakReferences for receivers in DigitalClock class
 2011-01-16 23:04:55 -08:00
Jason Sams
b32585a5ff am 4e7a9fea: am 981df1d9: Merge "unhide functions used by reflected files for SDK." into honeycomb 
* commit '4e7a9feae2c40d40a76eaaa8fcbd5a647bea86ba':
  unhide functions used by reflected files for SDK.
 2011-01-16 23:04:25 -08:00
Jim Miller
4169700edd am 76e75335: am 1f6e37ef: Merge "Fix 3355957: Don\'t hide the keyboard for PIN/Password" into honeycomb 
* commit '76e75335648f1c0c695701a94499bfd4625eba5d':
  Fix 3355957: Don't hide the keyboard for PIN/Password
 2011-01-16 23:04:09 -08:00