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

41144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
2b25dcc09d am b28c5ecc: am ea6a3c70: Merge "Minor updates." into honeycomb 
* commit 'b28c5eccabff5192d94fd59594123e8f9d450c1c':
  Minor updates.
 2011-01-18 22:00:14 -08:00
Adam Powell
1539a2967b am eb7a7a04: am 6cfc7a0a: Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb 
* commit 'eb7a7a044adba95216152e848fa692ec2869e06b':
  Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing
 2011-01-18 22:00:06 -08:00
Mathias Agopian
e4d8b8ad29 am 246bd60e: am fc14d42b: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb 
* commit '246bd60efa89376918e5d4cd53d2ed4f9288bf8d':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails
 2011-01-18 21:59:58 -08:00
Christopher Tate
a953359db5 am 31cd02ad: am 17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder 
* commit '31cd02ade3dd85c676bb278a1c2181f57179c390':
  API CHANGE: add a no-View ctor for DragShadowBuilder
 2011-01-18 21:58:32 -08:00
Romain Guy
7dfe1ab587 am 069f9b63: am 745a5292: Merge "Smoother pinch-zoom in Browser." into honeycomb 
* commit '069f9b6352951134a8c0b3d5320e31290e681206':
  Smoother pinch-zoom in Browser.
 2011-01-18 21:58:24 -08:00
Jack Palevich
1e686175a6 am 79f74eda: am a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb 
* commit '79f74eda8a6ba96519bb3a084f656fcacb1cd2e7':
  Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
 2011-01-18 21:58:11 -08:00
John Reck
ded2bc5c5f am 733e2047: am c098c1d3: Merge "Create db path if it doesn\'t exit" into honeycomb 
* commit '733e2047e7dbb53d5b3b2514bfb76edbcef8a149':
  Create db path if it doesn't exit
 2011-01-18 21:58:01 -08:00
Nick Pelly
5a6e65ed2e am b6b426ad: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp 
* commit 'b6b426ad1c953555dd6393844c29be5c9a9cd700':
  Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
 2011-01-18 21:57:31 -08:00
Andreas Huber
07ff585c30 am f9846fcd: am 39560507: Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb 
* commit 'f9846fcdf89432d05c713a5f356a0bd1447d3cf1':
  Apparently our native TCP sockets do not return an error from blocking "connect"
 2011-01-18 21:57:06 -08:00
Dianne Hackborn
7fc5d4b8e7 am 2ec5a716: am 36c84403: Merge "Fix issue #3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb 
* commit '2ec5a7160b3d32887b2428edef7a751ee3700809':
  Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog
 2011-01-18 21:56:45 -08:00
Jeff Brown
7cca7e0b28 am 761a6b7f: am f4368c95: Merge "Filter virtual keys after touches." into honeycomb 
* commit '761a6b7fdbe2bcc6db4306af9705dcb22b036068':
  Filter virtual keys after touches.
 2011-01-18 21:56:31 -08:00
Eric Fischer
7927859e10 am 18a7428d: (-s ours) am 2c0d22e7: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '18a7428dcb7cd3008d2c898efaaf8fe20604fdf3':
  Import revised translations.  DO NOT MERGE
 2011-01-18 21:55:34 -08:00
James Dong
c0c48d285f am d2225a06: am 1418de7e: Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb 
* commit 'd2225a06a315db9988236dcf5c5bca743f6d457d':
  Fix the sluggish preview during timelapse video recording because software encoder is used.
 2011-01-18 21:54:39 -08:00
Costin Manolache
b8c581ec64 am bf8e1627: am b8b671df: Merge "Add back NEW_TASK flag." into honeycomb 
* commit 'bf8e162702d0e56a8f5bf97de4c40b0a87fd78a4':
  Add back NEW_TASK flag.
 2011-01-18 21:54:17 -08:00
Stephen Hines
ed6b96f68a am 780816b3: am 0e5f4e54: Merge "Validate that version pragma is correct." into honeycomb 
* commit '780816b306876ad3e82fa5181f5d77a44720c497':
  Validate that version pragma is correct.
 2011-01-18 21:54:03 -08:00
Eric Laurent
4a515f1543 am 2d1362b7: am 74ff70d2: Merge "Fix typo" into honeycomb 
* commit '2d1362b7b4c090157878212edfddba282f831502':
  Fix typo
 2011-01-18 21:53:48 -08:00
Kenny Root
3f56e4a53b am 67f23166: am 11ebdd6a: Merge "Erase OBB files when removing packages" into honeycomb 
* commit '67f23166d00d0b965d5b913bcc0cfb442c0e9506':
  Erase OBB files when removing packages
 2011-01-18 21:53:21 -08:00
Romain Guy
977dd49047 am 4a809367: am 553889a6: Merge "Fix 9patches, again... Bug #3365243" into honeycomb 
* commit '4a80936778b1e20f063df89869f089444f46797f':
  Fix 9patches, again... Bug #3365243
 2011-01-18 21:53:07 -08:00
Mike Lockwood
e28ef04acc am 14032e3b: am 5f31aa30: Merge "MTP: Set modification date for abstract playlists" into honeycomb 
* commit '14032e3b3e9b5f31d7dd1264a8d0c79e2bc633e7':
  MTP: Set modification date for abstract playlists
 2011-01-18 21:52:18 -08:00
Brad Fitzpatrick
6b6156a96b am fe384670: am 3ab249cc: Merge "Fixing memory leak in PreferenceScreen." into honeycomb 
* commit 'fe3846707b7fbe86681e49e88c9368213f0eb16a':
  Fixing memory leak in PreferenceScreen.
 2011-01-18 21:52:05 -08:00
James Dong
d91ee38d51 am 1b67fec7: am 0a3dbf6f: Merge "Fix the build break in git_master-without-vendor" into honeycomb 
* commit '1b67fec7e16860d6f605f810ae422375ec3a567d':
  Fix the build break in git_master-without-vendor
 2011-01-18 21:51:52 -08:00
Mike Lockwood
19bb5b5a7b am b5f08714: am 26c1ab2e: Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb 
* commit 'b5f08714597c7a50388336480a6b72f3dc698735':
  MTP: Strip ".pla" file extension from name field for WMP playlists
 2011-01-18 21:51:17 -08:00
Kenny Root
83239a4693 am 189854d0: am 241fc72b: Merge "Don\'t cache return of getService in Environment" into honeycomb 
* commit '189854d0735eae7b251d39360c9582cbcbb0a642':
  Don't cache return of getService in Environment
 2011-01-18 21:51:04 -08:00
Brad Fitzpatrick
aef99bbc69 am 7adf8481: am b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb 
* commit '7adf848183b39ac4d0b8b67435ace94909ca3076':
  StrictMode class instance limit interface.
 2011-01-18 21:50:45 -08:00
Romain Guy
68a60f8913 am a7d666ab: am 713440d2: Merge "Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #3360888" into honeycomb 
* commit 'a7d666ab59cab888a07065099226023745486ba2':
  Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #3360888
 2011-01-18 21:50:19 -08:00
Jack Palevich
0cf7ecc640 am 3ee50921: am b54407f2: Merge "Add support for preserving EGL contexts when pausing / resuming." into honeycomb 
* commit '3ee50921957a00a91a951707aeff83208d293f2f':
  Add support for preserving EGL contexts when pausing / resuming.
 2011-01-18 21:50:06 -08:00
Andreas Huber
d5af25c624 am 63e99c39: am 529fc53d: Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb 
* commit '63e99c39e1e1a0dd7989bb858447b3ca76738554':
  Implement parsing of vbv buffering info in RTSP.
 2011-01-18 20:44:04 -08:00
John Wang
e732ab01f0 am ae451252: am 8d48c3d2: Merge "Enable AUTO_TIME_ZONE settings." into honeycomb 
* commit 'ae451252f425525efd4ade9adbd023a00a89c3e7':
  Enable AUTO_TIME_ZONE settings.
 2011-01-18 20:43:41 -08:00
Bryan Mawhinney
e0dda5ac4a am 6d7d0da9: am 3a4d547c: Merge "Don\'t report 100% buffered when the stream ends prematurely." into honeycomb 
* commit '6d7d0da9fb5bc52282b3d1d1fc2ac6ad8a4eb01b':
  Don't report 100% buffered when the stream ends prematurely.
 2011-01-18 20:43:22 -08:00
Elliott Hughes
b28c5eccab am ea6a3c70: Merge "Minor updates." into honeycomb 
* commit 'ea6a3c706ada7db1abeda609aa5d1ba9209c7f2b':
  Minor updates.
 2011-01-18 18:39:36 -08:00
Adam Powell
eb7a7a044a am 6cfc7a0a: Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb 
* commit '6cfc7a0acb0d3b202ae1dbee88e7e8bdfaee5590':
  Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing
 2011-01-18 18:39:10 -08:00
Mathias Agopian
246bd60efa am fc14d42b: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb 
* commit 'fc14d42b75d25b5062613333331839c895621f3b':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails
 2011-01-18 18:39:02 -08:00
Christopher Tate
31cd02ade3 am 17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder 
* commit '17ed60c3d2e480ab9788b445958a22b9ae7b6e96':
  API CHANGE: add a no-View ctor for DragShadowBuilder
 2011-01-18 18:36:06 -08:00
Romain Guy
069f9b6352 am 745a5292: Merge "Smoother pinch-zoom in Browser." into honeycomb 
* commit '745a529249c346656a404e38333f6d0ce6503fd7':
  Smoother pinch-zoom in Browser.
 2011-01-18 18:35:50 -08:00
Jack Palevich
79f74eda8a am a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb 
* commit 'a228e4f833b96e0633571735c2363e30363e155c':
  Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
 2011-01-18 18:35:42 -08:00
John Reck
733e2047e7 am c098c1d3: Merge "Create db path if it doesn\'t exit" into honeycomb 
* commit 'c098c1d348a183635561c504ccd67a9014a45475':
  Create db path if it doesn't exit
 2011-01-18 18:35:35 -08:00
Elliott Hughes
ea6a3c706a Merge "Minor updates." into honeycomb 2011-01-18 17:25:05 -08:00
Elliott Hughes
c3839d3242 Minor updates. 
Take into account Gingerbread JIT and GC improvements.

Change-Id: I170def3ac1ecac0ba88258b8d6bfdd77cb2f7f9a
 2011-01-18 17:13:06 -08:00
Adam Powell
6cfc7a0acb Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb 2011-01-18 16:57:59 -08:00
Mathias Agopian
fc14d42b75 Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb 2011-01-18 16:52:33 -08:00
Adam Powell
a1e6358a4c Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing 
Change-Id: I9e7ec4ab14c6008397d26c499ccf478f8875f918
 2011-01-18 16:51:22 -08:00
Nick Pelly
b6b426ad1c Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp 2011-01-18 16:10:48 -08:00
Gloria Wang
797297456e Merge "rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/" 2011-01-18 16:09:44 -08:00
Christopher Tate
17ed60c3d2 API CHANGE: add a no-View ctor for DragShadowBuilder 
Cf conversation with the API council.  Also expand the javadoc
a bit.

Change-Id: I9d4edb1042e00492b3db5c6bb7c7d9648581efad
 2011-01-18 16:07:06 -08:00
Romain Guy
745a529249 Merge "Smoother pinch-zoom in Browser." into honeycomb 2011-01-18 15:55:31 -08:00
Jack Palevich
a228e4f833 Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb 2011-01-18 15:54:29 -08:00
John Reck
c098c1d348 Merge "Create db path if it doesn't exit" into honeycomb 2011-01-18 15:53:33 -08:00
Jack Palevich
75f2bc04df Unhide GLSurfaceView.get/setPreserveEGLContextOnPause 
Change-Id: I882b8fa7888e2baae41c81b75af7fc1f639d38d6
 2011-01-18 15:53:25 -08:00
Mathias Agopian
2e102a05ca fix [3361121] hang in glClear() - device unresponsive, OTA fails 
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.

The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.

This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.

Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.

Change-Id: I1f226b1ebdf6918439b687c2723955d55b842c55
 2011-01-18 15:51:30 -08:00
Romain Guy
4f066784ec Smoother pinch-zoom in Browser. 
Change-Id: Ie5a403b76ab25483a980324cd7b31976359fa796
 2011-01-18 15:43:46 -08:00