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

41782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Hamilton
95f7c85499 Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-01-25 16:02:19 -08:00
Gilles Debunne
f5c7cbadd5 am 4df103cf: Merge "A long press on the selection handle no longer selects the word." into honeycomb 
* commit '4df103cf3d134bc0e428656e07c43eda2687ecdb':
  A long press on the selection handle no longer selects the word.
 2011-01-25 16:01:37 -08:00
Jeff Hamilton
437ff39c74 resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp 
Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13
 2011-01-25 18:00:41 -06:00
Gilles Debunne
4df103cf3d Merge "A long press on the selection handle no longer selects the word." into honeycomb 2011-01-25 15:59:01 -08:00
Xavier Ducrohet
7d7016e724 LayoutLib: return ViewInfo for all merged items + Build init. 
android.os.Build is now initialized from the build properties
parsed from the SDK build.prop file.

Change-Id: If16953215ca90fb0beacb51bf405b89a5c8a34fa
 2011-01-25 15:55:16 -08:00
Romain Guy
1495297180 am 5c4c0d50: Merge "Fix documentation typo." into honeycomb 
* commit '5c4c0d50fc1653fb6158e20d9b0af0325a80287c':
  Fix documentation typo.
 2011-01-25 15:50:18 -08:00
Romain Guy
5c4c0d50fc Merge "Fix documentation typo." into honeycomb 2011-01-25 15:48:17 -08:00
Romain Guy
b8c0e0fd73 Fix documentation typo. 
Change-Id: Ide9a6a6843e86fe3ef841f95bdff132cca1f3832
 2011-01-25 15:49:52 -08:00
Mike Lockwood
c80daa1b05 am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb 
* commit 'f10d940413000732f1cd35bcb113c41019c7e3b7':
  StagefrightMediaScanner: Close metadata retriever after we are done scanning
 2011-01-25 15:48:06 -08:00
Mike Lockwood
f10d940413 Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb 2011-01-25 15:46:25 -08:00
Mike Lockwood
7fadb5e77f am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb 
* commit '2b3da7ab61ac920881f35bbf66234c073d79ba24':
  MTP: Fix race conditions in MtpServer JNI code
 2011-01-25 15:45:48 -08:00
Brad Fitzpatrick
6af61b8435 am a206efcf: Merge "android.os.Message: respect sPoolSize" 
* commit 'a206efcf8d2e56cbd0d1de125b29b45fc6cc8431':
  android.os.Message: respect sPoolSize
 2011-01-25 15:44:33 -08:00
Mike Lockwood
2b3da7ab61 Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb 2011-01-25 15:44:28 -08:00
Arnaud Berry
6108c9af47 Fixed the display of the brightness controls in the system panel 
Bug: 3389549
Change-Id: I87cc77de877653d471ba4ef6a790c568e9aaa60c
 2011-01-25 15:42:17 -08:00
Michael I. Gold
e7ff5ddb47 egl: clear error on function entry 
Clear the current thread error state on entry to API functions as
mandated by the EGL 1.4 specification, section 3.1.  glGetError
returns additional information about the "most recent EGL function".

Change-Id: Ic24c64b39294ffc1a4e43fa72663e076b9d7decf
 2011-01-25 15:36:21 -08:00
Justin Ho
fc384e697f Removing unused assets in mdpi 
Change-Id: Id3bc90a10e602e35366d167fc72cc7edeaf15013
 2011-01-25 15:35:04 -08:00
James Dong
45800cf939 am 3115dad3: Merge "Report errors to applications if AudioRecord->start() fails" into honeycomb 
* commit '3115dad3fc8493ff510b9f6a46b18d951bf5c162':
  Report errors to applications if AudioRecord->start() fails
 2011-01-25 15:33:27 -08:00
Justin Ho
55a24b7a4e am 26faf54d: Merge "New contact picture" into honeycomb 
* commit '26faf54debfc7386a483eccfcddf1c051c653292':
  New contact picture
 2011-01-25 15:33:23 -08:00
James Dong
3115dad3fc Merge "Report errors to applications if AudioRecord->start() fails" into honeycomb 2011-01-25 15:31:09 -08:00
Justin Ho
26faf54deb Merge "New contact picture" into honeycomb 2011-01-25 15:31:08 -08:00
James Dong
d7ef5b6feb Report errors to applications if AudioRecord->start() fails 
bug - 3385198

Change-Id: I86ac8071eb28a538b333e102192193d1b9eda5eb
 2011-01-25 15:30:34 -08:00
Gilles Debunne
874d77c62e A long press on the selection handle no longer selects the word. 
Bug 3371448.

Change-Id: I360e6259f5f58a6f251efbe031ac46a76b7168e7
 2011-01-25 15:29:13 -08:00
Costin Manolache
d606045070 If 'customTokens', let authenticator handle notification. 
Bug: 3377952
Change-Id: Iffb0ed01c39b42838cf88fd1b332c4b41c3194ec
 2011-01-25 15:28:44 -08:00
Dianne Hackborn
a58552e03d am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb 
* commit 'f95bd0feb57f1503be7c08083c0a4d22286256e8':
  Argh forget to include my final part of the change.
 2011-01-25 15:25:39 -08:00
Dianne Hackborn
f95bd0feb5 Merge "Argh forget to include my final part of the change." into honeycomb 2011-01-25 15:23:13 -08:00
Mike Lockwood
8151dc3229 StagefrightMediaScanner: Close metadata retriever after we are done scanning 
This prevents the mediaserver from leaking a file descriptor after
the media scanner runs

BUG: 3373546

Change-Id: I82a8bae82306de3da56a5c7da5b03ecf106a4efc
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-25 15:20:04 -08:00
Dianne Hackborn
1a904dedbb am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb 
* commit '8fca2eccb03b9b8d71ec4a7ec088d617edec4e73':
  New extra for GET_CONTENT.
 2011-01-25 15:19:17 -08:00
Dianne Hackborn
8fca2eccb0 Merge "New extra for GET_CONTENT." into honeycomb 2011-01-25 15:17:50 -08:00
Dianne Hackborn
c4d0e6fcea New extra for GET_CONTENT. 
Change-Id: Ib367c02619ee301d9651dd70d35f7d57aa8a0cbc
 2011-01-25 15:16:55 -08:00
Brad Fitzpatrick
a206efcf8d Merge "android.os.Message: respect sPoolSize" 2011-01-25 15:12:18 -08:00
Mike Lockwood
071b2b6739 MTP: Fix race conditions in MtpServer JNI code 
Make sure previous MtpThread has exited before starting another to avoid
EBUSY opening MTP kernel driver.

BUG: 3317803

Change-Id: I81dcbac42bcf5f680ed1b1469839bc0b0e49d53d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-25 15:10:31 -08:00
Brad Fitzpatrick
2405c278ef android.os.Message: respect sPoolSize 
Also rename some static members from mFoo to sFoo.

Bug: http://code.google.com/p/android/issues/detail?id=13866
Change-Id: I5c5075eb6f529d1534c7aa72b6881873cd08676a
 2011-01-25 14:54:31 -08:00
Dianne Hackborn
f812fee071 Argh forget to include my final part of the change. 
Change-Id: I1e2711e1ecde0350047f1edef9a59947ff5749eb
 2011-01-25 14:54:29 -08:00
Justin Ho
18cc1f2cb6 New contact picture 
Change-Id: Ic601c375df6117c5e974f39d4a75ccef45e6912c
 2011-01-25 14:54:08 -08:00
Adam Powell
e0c148484e am 5dcc9bd7: Merge "Fix bug 3387855 - Menu flashes on left side of screen" into honeycomb 
* commit '5dcc9bd7261d6b19135bf972cf603b355b5316f4':
  Fix bug 3387855 - Menu flashes on left side of screen
 2011-01-25 14:50:34 -08:00
Santosh Madhava
d645172123 am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb 
* commit '1c9ac91634f7663b7a199f6eacc5a363f888e4d4':
  Fix for issue 3385068 : Play gets out of sync
 2011-01-25 14:48:28 -08:00
Scott Main
108841ff94 am 31e5c30f: Merge "docs: revise and amend platform notes for preview" into honeycomb 
* commit '31e5c30f0240fce5d39abfcbd25cf715b00ec019':
  docs: revise and amend platform notes for preview
 2011-01-25 14:48:19 -08:00
Jeff Brown
391ef42c92 am 3168a137: Merge "Fix surface frame size reporting." into honeycomb 
* commit '3168a13723ff0f3f87937457fe33c3518caa4bb9':
  Fix surface frame size reporting.
 2011-01-25 14:48:14 -08:00
Gilles Debunne
7a41782195 am 47fc854a: Merge "Fix for a call to startActivity from outside of an app." into honeycomb 
* commit '47fc854ae9947e0fe5ca0e33e22a41618ba7523b':
  Fix for a call to startActivity from outside of an app.
 2011-01-25 14:48:08 -08:00
Adam Powell
5dcc9bd726 Merge "Fix bug 3387855 - Menu flashes on left side of screen" into honeycomb 2011-01-25 14:46:47 -08:00
Mathias Agopian
df8368925a am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread 
* commit '239fd805ef7c0e4116b0a89e20caaf287e91f017':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
 2011-01-25 14:46:40 -08:00
Mathias Agopian
af4fa5d83d am 1955a5c9: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread 
* commit '1955a5c9da421dc89bb1a1dd3d3193159192cde9':
  partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
 2011-01-25 14:46:35 -08:00
Mathias Agopian
6b72702f30 am d0441f92: Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread 
* commit 'd0441f921b2b1879fb44041f521d9bfaa5a547d0':
  fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
 2011-01-25 14:46:31 -08:00
Mathias Agopian
2d665dd37a am 043a3cdd: Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread 
* commit '043a3cddf67e2baf38711bcb125084599f8f9802':
  workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
 2011-01-25 14:46:27 -08:00
Mathias Agopian
88bccab35c am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread 
* commit 'd3fcd0a1c923498921107bb44fbc8b24582a170a':
  minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
 2011-01-25 14:46:22 -08:00
Santosh Madhava
1c9ac91634 Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb 2011-01-25 14:46:15 -08:00
Mathias Agopian
239fd805ef Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:21 -08:00
Mathias Agopian
1955a5c9da Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:14 -08:00
Mathias Agopian
d0441f921b Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:09 -08:00
Mathias Agopian
043a3cddf6 Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:05 -08:00