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

47663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Hines
d50349de17 Merge "Check setName() for null string + typo fixes." 2011-03-16 17:27:48 -07:00
Eric Fischer
9ca34f6813 am 8504423f: (-s ours) am c657fcce: am 20ccaf6c: Import revised translations. DO NOT MERGE 
* commit '8504423f00237e13e87499f74e41ecf73c3e8e1b':
  Import revised translations.  DO NOT MERGE
 2011-03-16 17:14:07 -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
f916a5537c am 0af00ebc: 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 ho 
* commit '0af00ebc178a90d53a2aba92b8f8c11cfca8c1f4':
  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:47:08 -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
Rajneesh Chowdury
0b8fe2012d am ce254e86: am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 
* commit 'ce254e8613ddc4d57a8a5a8a2763b22690f451a4':
  Fix for 4087846 Crash reported by monkey report (Java/Jni)
 2011-03-16 16:10:32 -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
Mathias Agopian
5e4059f646 am 9405d987: am a05a8ac5: am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 
* commit '9405d98705db1c8102b77ef960f344ac416d165c':
  fix [4107131] nvidia driver call takes a very long time
 2011-03-16 16:03:24 -07:00
Andreas Huber
93668dfdd6 Merge "Don't send the seek-complete notification twice." 2011-03-16 16:03:19 -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
James Dong
80572f6a4d Merge "resolved conflicts for merge of 1cbf8493 to master" 2011-03-16 15:56:32 -07:00
James Dong
9fe05b7bc1 resolved conflicts for merge of 1cbf8493 to master 
Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4
 2011-03-16 15:53:03 -07:00
Jesse Wilson
94e085fda0 Merge "Don't leak JsonReaders in example code." 2011-03-16 15:48:07 -07:00
Andreas Huber
f8a5b55740 Don't send the seek-complete notification twice. 
Change-Id: Ie994de2d57e20dde12b8d59af4968d03569c7efa
related-to-bug: 3489432
 2011-03-16 15:42:45 -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
Jesse Wilson
47a2a4eaad Merge "Fix a bogus comment on LruCache.hitCount()" 2011-03-16 15:05:10 -07:00
Jesse Wilson
9d30ea0333 Don't leak JsonReaders in example code. 
Change-Id: Id81fb44e26f895d7ac6ecf87eddfa9d14c643159
 2011-03-16 15:02:48 -07:00
Jesse Wilson
a460c1871e Fix a bogus comment on LruCache.hitCount() 
Change-Id: I219b65bd73b85a414c21d4c4abe59296c9c5945a
 2011-03-16 14:57:01 -07:00
Shimeng (Simon) Wang
0ec5c78a80 am 0c4f09be: am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. 
* commit '0c4f09be5b73bd6bf19921d907fadc50d853deaf':
  Pass firstLayout info to native webview when setting baseLayer.
 2011-03-16 14:51: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
dce574a191 am 5b7a1bd7: am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 
* commit '5b7a1bd7906b24e92d61b967abe736cc3559bf08':
  add comment to deprecated tag
 2011-03-16 13:43:30 -07:00
Andreas Huber
9e22d68a6f am 1a47fc35: (-s ours) 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 '1a47fc353157bf9798c8a7425f106681e14bf4a5':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
 2011-03-16 13:41:28 -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
83361fe18b am 89de72d8: am 1d8b5a5e: am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 
* commit '89de72d83a1593ceb268f9433cd10455c66fc3af':
  USB System UI:  Improve message for the "no app for USB accessory" dialog.
 2011-03-16 12:35:55 -07:00
Michael Kolb
0677d2526d am d799caa9: am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 
* commit 'd799caa9a6623de4af581bebc9759272c10b6588':
  deprecate getVisibleTitleHeight
 2011-03-16 12:35:42 -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