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

47215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
6ff211e08a am 8f6c5226: am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1 
* commit '8f6c5226c5a0522cf2bbad987004e362098d9464':
  Fix for bug 3434228
 2011-03-16 21:20:37 -07:00
Alex Sakhartchouk
8f6c5226c5 am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1 
* commit '55a9be3d284d17045d9d3546c57d9dc3c4c8a521':
  Fix for bug 3434228
 2011-03-16 21:18:37 -07:00
Alex Sakhartchouk
55a9be3d28 Merge "Fix for bug 3434228" into honeycomb-mr1 2011-03-16 21:16:31 -07:00
Alex Sakhartchouk
2c74ad9aae Fix for bug 3434228 
Change-Id: I57973faf782b487e7913a096f0ab6012dc1c9415
 2011-03-16 19:28:25 -07:00
Adam Cohen
6decf37c98 am afcb65c2: am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 
* commit 'afcb65c2fdc6892a605fced93da13f6ff455bd2b':
  Catching all Exceptions when calling through to RemoteViewsFactory
 2011-03-16 18:04:49 -07:00
Adam Cohen
afcb65c2fd am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 
* commit '296c1616bad5a075cf64c2ba025b0cfd6bb3816d':
  Catching all Exceptions when calling through to RemoteViewsFactory
 2011-03-16 18:03:23 -07:00
Adam Cohen
296c1616ba Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 2011-03-16 18:02:08 -07:00
Romain Guy
72064c66e2 am b0204d0a: am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1 
* commit 'b0204d0a271dafdf5be216f30c001929bdd831c0':
  Modify the GL renderer's functor to pass the clip to WebView
 2011-03-16 17:28:43 -07:00
Romain Guy
b0204d0a27 am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1 
* commit 'c2b91a6113c30d3b994ef081fbd5b941200d55a4':
  Modify the GL renderer's functor to pass the clip to WebView
 2011-03-16 17:26:41 -07:00
Romain Guy
c2b91a6113 Merge "Modify the GL renderer's functor to pass the clip to WebView" into honeycomb-mr1 2011-03-16 17:24:32 -07:00
Eric Fischer
8504423f00 am c657fcce: am 20ccaf6c: Import revised translations. DO NOT MERGE 
* commit 'c657fcce45fa4d9817589e96508f5ddf0ae09c61':
  Import revised translations.  DO NOT MERGE
 2011-03-16 17:11:54 -07:00
Eric Fischer
c657fcce45 am 20ccaf6c: Import revised translations. DO NOT MERGE 
* commit '20ccaf6cc1a79a3f7973e5875c66e2bce2ebee7c':
  Import revised translations.  DO NOT MERGE
 2011-03-16 17:10:09 -07:00
Eric Fischer
20ccaf6cc1 Import revised translations. DO NOT MERGE 
Change-Id: I59b21268d693f0fac87e787fceb4f41b3f3e6acd
 2011-03-16 16:48:09 -07:00
Yu Shan Emily Lau
0af00ebc17 am 797f5b0c: am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 
* commit '797f5b0c00895c21ff755ec7f6974e1d2e763b13':
  Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
 2011-03-16 16:45:37 -07:00
Yu Shan Emily Lau
797f5b0c00 am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 
* commit 'fd5c1f7c575451cf3566d1a8290b0b001bddfa39':
  Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
 2011-03-16 16:43:04 -07:00
Yu Shan Emily Lau
fd5c1f7c57 Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 2011-03-16 16:40:46 -07:00
Yu Shan Emily Lau
9dab784705 Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. 
Add the media test util for capturing the memory usage.
Bug# 4108259
Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
 2011-03-16 16:36:17 -07:00
Adam Cohen
c2be22cf20 Catching all Exceptions when calling through to RemoteViewsFactory 
Change-Id: Ib20c880bb7626565541ab4697317fcfaa2e6b5b7
 2011-03-16 16:33:53 -07:00
Rajneesh Chowdury
ce254e8613 am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 
* commit '69d05490345e96e1155e3b33eb5e36761b07a314':
  Fix for 4087846 Crash reported by monkey report (Java/Jni)
 2011-03-16 16:08:09 -07:00
Rajneesh Chowdury
69d0549034 am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 
* commit '0edefea88e975613bca9f0227614de91434ade11':
  Fix for 4087846 Crash reported by monkey report (Java/Jni)
 2011-03-16 16:05:54 -07:00
Rajneesh Chowdury
0edefea88e Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 2011-03-16 16:03:15 -07:00
Mathias Agopian
9405d98705 am a05a8ac5: am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 
* commit 'a05a8ac5eef083a4c28c1fb4eceea92100cf86a2':
  fix [4107131] nvidia driver call takes a very long time
 2011-03-16 16:01:31 -07:00
Mathias Agopian
a05a8ac5ee am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 
* commit 'af831a7bd5f1a3ffd1129f5f15b862c5973d48b6':
  fix [4107131] nvidia driver call takes a very long time
 2011-03-16 15:59:15 -07:00
Mathias Agopian
af831a7bd5 Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 2011-03-16 15:57:57 -07:00
Romain Guy
80911b8517 Modify the GL renderer's functor to pass the clip to WebView 
Change-Id: If5efe399ca58f3000b2883e24e9f3736a2025184
 2011-03-16 15:31:33 -07:00
James Dong
1cbf8493da am 28fc2037: am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1 
* commit '28fc2037bffd1593b56fe1e1522de544a7d49120':
  Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
 2011-03-16 15:12:58 -07:00
James Dong
28fc2037bf am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1 
* commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd':
  Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
 2011-03-16 15:11:03 -07:00
James Dong
fc59176241 Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1 2011-03-16 15:09:21 -07:00
Shimeng (Simon) Wang
0c4f09be5b am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. 
* commit 'f2532d16a4a2ca4dffe9bf9568fdd24475369cac':
  Pass firstLayout info to native webview when setting baseLayer.
 2011-03-16 14:49:18 -07:00
Shimeng (Simon) Wang
f2532d16a4 am 464b690a: Pass firstLayout info to native webview when setting baseLayer. 
* commit '464b690ada24428f3dff4102659048db7128835f':
  Pass firstLayout info to native webview when setting baseLayer.
 2011-03-16 14:47:32 -07:00
Mathias Agopian
3d69bea1f6 fix [4107131] nvidia driver call takes a very long time 
We were leaking all EGLSyncKHR objects, over time the list
would grow and become very slow to operate on.

Bug: 4107131
Change-Id: I6c82daf49fe3189d04550781d64d57c30c95f552
 2011-03-16 14:19:03 -07:00
James Dong
6ec0ca9e8e Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file. 
bug - 4109530

Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
 2011-03-16 14:11:32 -07:00
Shimeng (Simon) Wang
464b690ada Pass firstLayout info to native webview when setting baseLayer. 
issue: 4094300
Change-Id: I4fdbc0cee73230a731b1356f44372cd86a5c4ad1
 2011-03-16 13:56:37 -07:00
Michael Kolb
5b7a1bd790 am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 
* commit 'b0a07f0ce54ee812f9a00cc53f43919051d563c3':
  add comment to deprecated tag
 2011-03-16 13:38:24 -07:00
Andreas Huber
1a47fc3531 am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 
* commit '7532ae7f79d6d849faae1a9bee171c66bd534d97':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
 2011-03-16 13:36:35 -07:00
Michael Kolb
b0a07f0ce5 am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 
* commit '6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
  add comment to deprecated tag
 2011-03-16 13:34:30 -07:00
Andreas Huber
7532ae7f79 am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 
* commit '46956b0691b2a228237d17536fe4ad33a760c0af':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
 2011-03-16 13:18:42 -07:00
Michael Kolb
6bb2020e6e Merge "add comment to deprecated tag" into honeycomb-mr1 2011-03-16 13:10:48 -07:00
Andreas Huber
46956b0691 Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 2011-03-16 13:06:52 -07:00
Michael Kolb
24e53b00b0 add comment to deprecated tag 
Change-Id: Id0c30c43abfeb9005f9b69e0a565644c7c956295
 2011-03-16 12:56:39 -07:00
Mike Lockwood
89de72d83a am 1d8b5a5e: am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 
* commit '1d8b5a5e866f75d516dd6f03424f37b1de9a3d97':
  USB System UI:  Improve message for the "no app for USB accessory" dialog.
 2011-03-16 12:09:27 -07:00
Mike Lockwood
1d8b5a5e86 am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 
* commit '75d62cee30557145e48d792fdce4769235daa9ce':
  USB System UI:  Improve message for the "no app for USB accessory" dialog.
 2011-03-16 12:06:58 -07:00
Andreas Huber
5bd3bb46b1 DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting. 
Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7
related-to-bug: 4039068
 2011-03-16 12:04:56 -07:00
Mike Lockwood
75d62cee30 Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 2011-03-16 12:03:39 -07:00
Michael Kolb
d799caa9a6 am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 
* commit '9a0df3c5c730ff12e050945f2bad0d86a37c5b2f':
  deprecate getVisibleTitleHeight
 2011-03-16 11:37:23 -07:00
Michael Kolb
9a0df3c5c7 am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 
* commit '95fd065e3cef0bef723a2e624191b08bb00ce6f8':
  deprecate getVisibleTitleHeight
 2011-03-16 11:35:45 -07:00
Michael Kolb
95fd065e3c Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 2011-03-16 11:33:13 -07:00
Mike Lockwood
b893916fb8 USB System UI: Improve message for the "no app for USB accessory" dialog. 
Change-Id: I72bdc3afa152ed7a0e30b1a0e8d9cb2e53ca3f29
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-16 14:10:03 -04:00
Eric Fischer
d40e0efb02 am d5eb3bbb: am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'd5eb3bbbf2959553005df173165b6b65231798a2':
  Import revised translations.  DO NOT MERGE
 2011-03-16 10:54:33 -07:00
Eric Fischer
d5eb3bbbf2 am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'cc571e9643865edc3f25aa133c467ace46ce8e80':
  Import revised translations.  DO NOT MERGE
 2011-03-16 10:51:56 -07:00