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

42643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
2c91b5699e am c80daa1b: am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb 
* commit 'c80daa1b05b8f1d2873df23821ae2c5344e76fb8':
  StagefrightMediaScanner: Close metadata retriever after we are done scanning
 2011-01-25 16:20:56 -08:00
Mike Lockwood
501e52f09d am 7fadb5e7: am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb 
* commit '7fadb5e77fd079c3a6c5eeae1ae81a487864b129':
  MTP: Fix race conditions in MtpServer JNI code
 2011-01-25 16:20:50 -08:00
James Dong
7ae6dac845 am 45800cf9: am 3115dad3: Merge "Report errors to applications if AudioRecord->start() fails" into honeycomb 
* commit '45800cf939d716a6d6435872f5f876b2cfd2689d':
  Report errors to applications if AudioRecord->start() fails
 2011-01-25 16:20:34 -08:00
Justin Ho
6f3276276d am 55a24b7a: am 26faf54d: Merge "New contact picture" into honeycomb 
* commit '55a24b7a4e3a6c19efe64737148857c162ea3a1e':
  New contact picture
 2011-01-25 16:20:26 -08:00
Dianne Hackborn
17d7cbc14c am a58552e0: am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb 
* commit 'a58552e03de2f24aef735e94fcfab12a0078a3b3':
  Argh forget to include my final part of the change.
 2011-01-25 16:20:16 -08:00
Dianne Hackborn
7f13e47620 am 1a904ded: am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb 
* commit '1a904dedbb5a15b3e60cac0fab83a3734701aff6':
  New extra for GET_CONTENT.
 2011-01-25 16:19:48 -08:00
Adam Powell
dedeab17b1 am e0c14848: am 5dcc9bd7: Merge "Fix bug 3387855 - Menu flashes on left side of screen" into honeycomb 
* commit 'e0c148484e3855bfa48b5e874ac3a1d2663784dd':
  Fix bug 3387855 - Menu flashes on left side of screen
 2011-01-25 16:19:25 -08:00
Santosh Madhava
4a39e8ad70 am d6451721: am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb 
* commit 'd645172123f6aac530986ede22fae13f647ccb9f':
  Fix for issue 3385068 : Play gets out of sync
 2011-01-25 16:19:17 -08:00
Scott Main
aea82125bd am 108841ff: am 31e5c30f: Merge "docs: revise and amend platform notes for preview" into honeycomb 
* commit '108841ff943a592702698ca17ccfe7d2ce2798ed':
  docs: revise and amend platform notes for preview
 2011-01-25 16:19:09 -08:00
Jeff Brown
fbe446d7f2 am 391ef42c: am 3168a137: Merge "Fix surface frame size reporting." into honeycomb 
* commit '391ef42c92ab97e5c22a720973790696d30576ca':
  Fix surface frame size reporting.
 2011-01-25 16:18:59 -08:00
Gilles Debunne
277ae7e3dc am 7a417821: am 47fc854a: Merge "Fix for a call to startActivity from outside of an app." into honeycomb 
* commit '7a417821957bac70bfd4cb4a357b143a1a1570e3':
  Fix for a call to startActivity from outside of an app.
 2011-01-25 16:18:51 -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
Mike Lockwood
2b3da7ab61 Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb 2011-01-25 15:44:28 -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
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
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
Glenn Kasten
164fddfeae Merge "Bug 3117154" 2011-01-25 15:06:20 -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
Santosh Madhava
1c9ac91634 Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb 2011-01-25 14:46:15 -08:00
Adam Powell
e2b03a62e5 Fix bug 3387855 - Menu flashes on left side of screen 
Post popup menu click events rather than executing inline so that the
popup can close undisturbed.

Change-Id: I01481bd37d7921c10c6b8b484eab33f0d25447ff
 2011-01-25 14:40:36 -08:00
Scott Main
31e5c30f02 Merge "docs: revise and amend platform notes for preview" into honeycomb 2011-01-25 14:21:28 -08:00
Jeff Brown
3168a13723 Merge "Fix surface frame size reporting." into honeycomb 2011-01-25 14:21:00 -08:00
Gilles Debunne
47fc854ae9 Merge "Fix for a call to startActivity from outside of an app." into honeycomb 2011-01-25 14:20:09 -08:00
Dianne Hackborn
1a728e30ef am a2909773: am 4426f643: Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb 
* commit 'a29097731254975fdeba8702f3167ef2d14bcdc7':
  Fix issue #3385839: Fragment.onCreateView is passing in activity...
 2011-01-25 14:10:42 -08:00
Scott Main
7afdaf0b9c docs: revise and amend platform notes for preview 
Change-Id: Ief10e85ae7c1a9c56381342e0f3b880ebe57d8ca
 2011-01-25 14:09:11 -08:00
Dianne Hackborn
a290977312 am 4426f643: Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb 
* commit '4426f643ec3833e830bc2f9b8af5088343de1315':
  Fix issue #3385839: Fragment.onCreateView is passing in activity...
 2011-01-25 14:08:10 -08:00
Justin Ho
35833fb906 am 6954e9b0: am d00d2925: Merge changes I282a8421,I53d15f37 into honeycomb 
* commit '6954e9b0d90c9fe80f370892defb4906848806b4':
  Merging Gingerbread assets into Honeycomb
  Removing old assets from SystemUI in drawable-hdpi
 2011-01-25 14:07:22 -08:00
Jaikumar Ganesh
da6e64a6b4 am e4d494b4: am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb 
* commit 'e4d494b49548eca62bf665fd5954c90731fd18e3':
  Rename virtual call API to ScoUsingVirtualCall.
 2011-01-25 14:07:12 -08:00
Romain Guy
402ede322d am 535602fe: am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb 
* commit '535602fe5572e2a648251faf01b4dcd3649d5ede':
  Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339
 2011-01-25 14:07:00 -08:00
Dianne Hackborn
4426f643ec Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb 2011-01-25 14:06:01 -08:00
Justin Ho
6954e9b0d9 am d00d2925: Merge changes I282a8421,I53d15f37 into honeycomb 
* commit 'd00d2925ca9997c2f0fab1a8b149d91d77b79010':
  Merging Gingerbread assets into Honeycomb
  Removing old assets from SystemUI in drawable-hdpi
 2011-01-25 14:03:55 -08:00
Justin Ho
d00d2925ca Merge changes I282a8421,I53d15f37 into honeycomb 
* changes:
  Merging Gingerbread assets into Honeycomb
  Removing old assets from SystemUI in drawable-hdpi
 2011-01-25 14:01:25 -08:00