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

7738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android (Google) Code Review
ce54003aa8 Merge change 23406 into eclair 
* changes:
  allow a longer timeout for layout tests, see if it stabilizes pass/fail numbers
 2009-08-31 22:04:09 -07:00
Guang Zhu
38323a5f9f allow a longer timeout for layout tests, see if it stabilizes pass/fail numbers 2009-08-31 22:01:53 -07:00
Chih-Chung Chang
a7bdedabf4 Fix 2081525: NPE in MediaScannerService. 
Handle the case where the datetime string in jpeg exif is not in the format we expect.

Change-Id: I5462052c3dd723d01bce45f4924137632d081400
 2009-09-01 12:23:43 +08:00
Tammo Spalink
8ad69ed4f1 am d1e7bd0a: am 95434bfa: Allow fragmentText to be called for singleton CDMA messages. 
Merge commit 'd1e7bd0a64980b1812a0bbfeb16fc3802664ab27'

* commit 'd1e7bd0a64980b1812a0bbfeb16fc3802664ab27':
  Allow fragmentText to be called for singleton CDMA messages.
 2009-08-31 20:51:18 -07:00
Tammo Spalink
d1e7bd0a64 am 95434bfa: Allow fragmentText to be called for singleton CDMA messages. 
Merge commit '95434bfaee62161ce02012c6424f0c0c8fffccb5' into eclair-plus-aosp

* commit '95434bfaee62161ce02012c6424f0c0c8fffccb5':
  Allow fragmentText to be called for singleton CDMA messages.
 2009-08-31 20:49:10 -07:00
Tammo Spalink
95434bfaee Allow fragmentText to be called for singleton CDMA messages. 
Corrects for previous partner changes, addressing issue:

http://buganizer/issue?id=2063332

Change-Id: I49e564d81c5db3e92a6bad973f21a02a7302875d
 2009-09-01 11:44:08 +08:00
Tammo Spalink
bd512eb756 am efba24ba: am 33567c5f: Merge change 23271 into eclair 
Merge commit 'efba24ba665a36ac41fc283327c422fd7a92c681'

* commit 'efba24ba665a36ac41fc283327c422fd7a92c681':
  Cleanup egregious style issues.
 2009-08-31 19:50:59 -07:00
Tammo Spalink
efba24ba66 am 33567c5f: Merge change 23271 into eclair 
Merge commit '33567c5f3dab39cbb8c526c919e7e526042d1acf' into eclair-plus-aosp

* commit '33567c5f3dab39cbb8c526c919e7e526042d1acf':
  Cleanup egregious style issues.
 2009-08-31 19:46:56 -07:00
Android (Google) Code Review
33567c5f3d Merge change 23271 into eclair 
* changes:
  Cleanup egregious style issues.
 2009-08-31 19:45:05 -07:00
Tammo Spalink
41551165c4 am 65de3aa9: am 650cbfd3: Merge change 22551 into eclair 
Merge commit '65de3aa9ad3b609c0de7557ef4aec9551f7f32ea'

* commit '65de3aa9ad3b609c0de7557ef4aec9551f7f32ea':
  Fix broken unit test.
 2009-08-31 19:44:29 -07:00
Tammo Spalink
65de3aa9ad am 650cbfd3: Merge change 22551 into eclair 
Merge commit '650cbfd3815382df1a82c52297f641bfe9cc4f73' into eclair-plus-aosp

* commit '650cbfd3815382df1a82c52297f641bfe9cc4f73':
  Fix broken unit test.
 2009-08-31 19:42:23 -07:00
Android (Google) Code Review
650cbfd381 Merge change 22551 into eclair 
* changes:
  Fix broken unit test.
 2009-08-31 19:39:40 -07:00
Scott Main
972b851e08 am 3ae594dc: am 2bd4326a: am 5126d3a3: docs only. revise samples link for offline docs to point to the current version 
Merge commit '3ae594dce5450df95b9af5113257246bfcb1ddcf'

* commit '3ae594dce5450df95b9af5113257246bfcb1ddcf':
  docs only.
 2009-08-31 19:05:10 -07:00
Scott Main
3ae594dce5 am 2bd4326a: am 5126d3a3: docs only. revise samples link for offline docs to point to the current version 
Merge commit '2bd4326a4694ea3055dc758c05533c905ad78291' into eclair-plus-aosp

* commit '2bd4326a4694ea3055dc758c05533c905ad78291':
  docs only.
 2009-08-31 19:03:05 -07:00
Scott Main
2bd4326a46 am 5126d3a3: docs only. revise samples link for offline docs to point to the current version 
Merge commit '5126d3a3794c8c5e1e61621daa5e9dab050b44a1' into eclair

* commit '5126d3a3794c8c5e1e61621daa5e9dab050b44a1':
  docs only.
 2009-08-31 19:00:45 -07:00
Fred Quintana
664614cfa5 am 765f49e2: am 34b6a27e: Merge change 23375 into eclair 
Merge commit '765f49e22d7dbf608710baa95e9769b9133d9483'

* commit '765f49e22d7dbf608710baa95e9769b9133d9483':
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
 2009-08-31 18:55:36 -07:00
Fred Quintana
765f49e22d am 34b6a27e: Merge change 23375 into eclair 
Merge commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91' into eclair-plus-aosp

* commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91':
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
 2009-08-31 18:53:12 -07:00
Android (Google) Code Review
34b6a27ea3 Merge change 23375 into eclair 
* changes:
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
 2009-08-31 18:51:04 -07:00
Grace Kloba
ef32ee3db8 When we get 304 and switch to cacheLoader, need to set mFromCache to be true. 
So that the cache loading will not create a new mCacheResult which overwrites
the old cache data.
 2009-08-31 18:43:48 -07:00
Xavier Ducrohet
6b6afb67a1 am 93266f3d: am e23ef102: Merge change 23363 into eclair 
Merge commit '93266f3d4c0a3036fcd536108a3404f2b330813b'

* commit '93266f3d4c0a3036fcd536108a3404f2b330813b':
  Add error output to pm for FAILED_MISSING_FEATURE
 2009-08-31 18:18:48 -07:00
Xavier Ducrohet
93266f3d4c am e23ef102: Merge change 23363 into eclair 
Merge commit 'e23ef1023a4e4bd91a68c41c81ba273656a2c3a7' into eclair-plus-aosp

* commit 'e23ef1023a4e4bd91a68c41c81ba273656a2c3a7':
  Add error output to pm for FAILED_MISSING_FEATURE
 2009-08-31 18:16:31 -07:00
Android (Google) Code Review
e23ef1023a Merge change 23363 into eclair 
* changes:
  Add error output to pm for FAILED_MISSING_FEATURE
 2009-08-31 18:13:24 -07:00
Scott Main
5126d3a379 docs only. 
revise samples link for offline docs to point to the current version
 2009-08-31 18:04:52 -07:00
Fred Quintana
f892fb3a43 - don't schedule syncs that we will never dispatch 
- expedite the INITIALIZATION sync
 2009-08-31 18:04:39 -07:00
Romain Guy
6dbc11ca81 am 85655ebc: am 0f44220b: Merge change 23381 into eclair 
Merge commit '85655ebcd9dc521e3c11209d24afee432d18b596'

* commit '85655ebcd9dc521e3c11209d24afee432d18b596':
  Prevent ListView from scrolling/flinging its content when the content fits on screen.
 2009-08-31 17:50:29 -07:00
Romain Guy
85655ebcd9 am 0f44220b: Merge change 23381 into eclair 
Merge commit '0f44220b34e346ef333cdb4cd4b4903b5212dad2' into eclair-plus-aosp

* commit '0f44220b34e346ef333cdb4cd4b4903b5212dad2':
  Prevent ListView from scrolling/flinging its content when the content fits on screen.
 2009-08-31 17:48:14 -07:00
Jack Palevich
5f95d7e977 am e1f7bcc7: am ad822197: Merge change 23380 into eclair 
Merge commit 'e1f7bcc7ab422e2bc87137648dc67250d116b0c6'

* commit 'e1f7bcc7ab422e2bc87137648dc67250d116b0c6':
  Change util_texSubImage2D to call glCompressedTexImage2D correctly.
 2009-08-31 17:48:00 -07:00
Android (Google) Code Review
0f44220b34 Merge change 23381 into eclair 
* changes:
  Prevent ListView from scrolling/flinging its content when the content fits on screen.
 2009-08-31 17:46:47 -07:00
Jack Palevich
e1f7bcc7ab am ad822197: Merge change 23380 into eclair 
Merge commit 'ad82219718cd1751dcf84bab0cd1aedcb6805eb1' into eclair-plus-aosp

* commit 'ad82219718cd1751dcf84bab0cd1aedcb6805eb1':
  Change util_texSubImage2D to call glCompressedTexImage2D correctly.
 2009-08-31 17:46:42 -07:00
Romain Guy
6198ae8468 Prevent ListView from scrolling/flinging its content when the content fits on screen. 
Change-Id: Id46313bca3ae53b0717cd74a4a6f889a01f9fcb1
 2009-08-31 17:45:55 -07:00
Android (Google) Code Review
ad82219718 Merge change 23380 into eclair 
* changes:
  Change util_texSubImage2D to call glCompressedTexImage2D correctly.
 2009-08-31 17:45:03 -07:00
Jack Palevich
106006cbde Change util_texSubImage2D to call glCompressedTexImage2D correctly. 
Previously we had been setting the imageSize parameter to 0, which was
incorrect. According to the OpenGL ES spec for glCompressedTexImage2D
this parameter should be the size in bytes of the compressed data.
 2009-08-31 17:42:50 -07:00
Joe Onorato
b43a24b671 am 8580b6fc: am ae209acd: Don\'t leak jni refs. 
Merge commit '8580b6fc3e225fae09cfeeb2a7bdf3f66958937a'

* commit '8580b6fc3e225fae09cfeeb2a7bdf3f66958937a':
  Don't leak jni refs.
 2009-08-31 17:30:59 -07:00
Fred Quintana
2f20b04c14 am a27b7822: am ec5d9fb4: Merge change 23370 into eclair 
Merge commit 'a27b7822200ab8f7a1978ca27ae3e14929b9d665'

* commit 'a27b7822200ab8f7a1978ca27ae3e14929b9d665':
  Revert "- don't schedule syncs that we will never dispatch"
 2009-08-31 17:29:03 -07:00
Joe Onorato
8580b6fc3e am ae209acd: Don\'t leak jni refs. 
Merge commit 'ae209acd8d48755df7d49459b1bcbc3b8e20561d' into eclair-plus-aosp

* commit 'ae209acd8d48755df7d49459b1bcbc3b8e20561d':
  Don't leak jni refs.
 2009-08-31 17:28:13 -07:00
Fred Quintana
a27b782220 am ec5d9fb4: Merge change 23370 into eclair 
Merge commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00' into eclair-plus-aosp

* commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00':
  Revert "- don't schedule syncs that we will never dispatch"
 2009-08-31 17:26:43 -07:00
Joe Onorato
ae209acd8d Don't leak jni refs. 2009-08-31 17:25:08 -07:00
Fred Quintana
fcb14322f4 re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync() 2009-08-31 17:25:05 -07:00
Android (Google) Code Review
ec5d9fb47d Merge change 23370 into eclair 
* changes:
  Revert "- don't schedule syncs that we will never dispatch"
 2009-08-31 17:24:17 -07:00
Fred Quintana
c58b611652 Revert "- don't schedule syncs that we will never dispatch" 
This reverts commit fae7ff106b3ed791e324ddcec17226c3fe1cd809.
 2009-08-31 17:20:08 -07:00
Romain Guy
7e66cb6582 am cfbff6c9: am f428f8ae: Merge change 23329 into eclair 
Merge commit 'cfbff6c985f6aa690ee8e4f9cb8006382d214fcf'

* commit 'cfbff6c985f6aa690ee8e4f9cb8006382d214fcf':
  Load bitmap resources entirely from native code.
 2009-08-31 17:19:28 -07:00
Romain Guy
cfbff6c985 am f428f8ae: Merge change 23329 into eclair 
Merge commit 'f428f8aecea9ae7a258dfc05f4ad4563938f1ed5' into eclair-plus-aosp

* commit 'f428f8aecea9ae7a258dfc05f4ad4563938f1ed5':
  Load bitmap resources entirely from native code.
 2009-08-31 17:17:13 -07:00
Android (Google) Code Review
f428f8aece Merge change 23329 into eclair 
* changes:
  Load bitmap resources entirely from native code.
 2009-08-31 17:15:42 -07:00
Jaikumar Ganesh
5ba22e9e11 am 2ebf7793: am c91ad28f: Merge change 23218 into eclair 
Merge commit '2ebf7793e42df72d4198461487f3bd73f17b32a4'

* commit '2ebf7793e42df72d4198461487f3bd73f17b32a4':
  Fix property being cleared when DeviceFound signal is received.
 2009-08-31 16:56:52 -07:00
Andreas Huber
cf68d5b82a am 81002eb9: am bf1071c0: Merge change 23356 into eclair 
Merge commit '81002eb9ccd60e936b8960ddd3ce92af81dd2c14'

* commit '81002eb9ccd60e936b8960ddd3ce92af81dd2c14':
  Temporarily unlock our mutex while fetching a buffer from the upstream source.
 2009-08-31 16:56:46 -07:00
Jaikumar Ganesh
2ebf7793e4 am c91ad28f: Merge change 23218 into eclair 
Merge commit 'c91ad28ff9173971c1d886f884250b1e774a40a6' into eclair-plus-aosp

* commit 'c91ad28ff9173971c1d886f884250b1e774a40a6':
  Fix property being cleared when DeviceFound signal is received.
 2009-08-31 16:54:37 -07:00
Android (Google) Code Review
c91ad28ff9 Merge change 23218 into eclair 
* changes:
  Fix property being cleared when DeviceFound signal is received.
 2009-08-31 16:52:38 -07:00
Andreas Huber
81002eb9cc am bf1071c0: Merge change 23356 into eclair 
Merge commit 'bf1071c07979b03a9f5e8281aba82ed05513185e' into eclair-plus-aosp

* commit 'bf1071c07979b03a9f5e8281aba82ed05513185e':
  Temporarily unlock our mutex while fetching a buffer from the upstream source.
 2009-08-31 16:47:09 -07:00
Daisuke Miyakawa
61e06289bb am 08761779: am 450ff8a4: Merge change 23357 into eclair 
Merge commit '08761779616949b496c002bed7ce88eb909c65fc'

* commit '08761779616949b496c002bed7ce88eb909c65fc':
  Fix double-free problem in EmojiFactory.
 2009-08-31 16:46:18 -07:00
Jean-Michel Trivi
9a87e50744 am 8b8077e4: am 6896aef0: Merge change 23338 into eclair 
Merge commit '8b8077e427389d5f0328598bc25428ae6147e9e5'

* commit '8b8077e427389d5f0328598bc25428ae6147e9e5':
  Clean TTS logs: use a common TAG in the TTS service, don't show
 2009-08-31 16:46:10 -07:00