Commit Graph

38903 Commits

Author SHA1 Message Date
Mike Lockwood
e27ccd8c6f am 195cb33f: am 84c4548d: Merge changes 23429,23430 into eclair
Merge commit '195cb33f3f3f5adf62be0999d746444aa6c945f2'

* commit '195cb33f3f3f5adf62be0999d746444aa6c945f2':
  LocationManagerService: Remove caching of last known locations to flash.
  LocationManagerService: Add null pointer check and remove useless finalize() method.
2009-09-01 05:06:25 -07:00
Tammo Spalink
5ee5df47eb am 15606b3c: am c98d68cd: Merge change 22886 into eclair
Merge commit '15606b3c7e304e12af7fde745a72b9453a66385d'

* commit '15606b3c7e304e12af7fde745a72b9453a66385d':
  Move SMS pdu creation fully into the central Phone process.
2009-09-01 05:06:20 -07:00
Mike Lockwood
195cb33f3f am 84c4548d: Merge changes 23429,23430 into eclair
Merge commit '84c4548d046c7426cd346602cec18b98fdcdbf3c' into eclair-plus-aosp

* commit '84c4548d046c7426cd346602cec18b98fdcdbf3c':
  LocationManagerService: Remove caching of last known locations to flash.
  LocationManagerService: Add null pointer check and remove useless finalize() method.
2009-09-01 05:03:47 -07:00
Tammo Spalink
15606b3c7e am c98d68cd: Merge change 22886 into eclair
Merge commit 'c98d68cd56338ec57695b3c35114fbde88d4bde8' into eclair-plus-aosp

* commit 'c98d68cd56338ec57695b3c35114fbde88d4bde8':
  Move SMS pdu creation fully into the central Phone process.
2009-09-01 05:03:42 -07:00
Android (Google) Code Review
84c4548d04 Merge changes 23429,23430 into eclair
* changes:
  LocationManagerService: Remove caching of last known locations to flash.
  LocationManagerService: Add null pointer check and remove useless finalize() method.
2009-09-01 05:01:26 -07:00
Mike Lockwood
9aa1fa2d36 LocationManagerService: Remove caching of last known locations to flash.
Change-Id: Ibbab20a7c48823fb74c2e175824f55248f25bf8a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-01 07:51:15 -04:00
Mike Lockwood
3a76fd6279 LocationManagerService: Add null pointer check and remove useless finalize() method.
Change-Id: I4017d38a1bea7564a85575486a7c2aef569dfe5d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-01 07:26:56 -04:00
Steve Block
b599315910 Moves GoogleLocationSettingManager to its correct location.
This fixes bug http://b/issue?id=2089259.
2009-09-01 10:18:38 +01:00
Chung-yih Wang
09960230bf Store CA certificate chain into one single key entry with PEM format.
Extract all CA certificates in a PKCS12 keystore into a single entry in keystore with multiple PEMs.
2009-09-01 16:45:13 +08:00
Android (Google) Code Review
c98d68cd56 Merge change 22886 into eclair
* changes:
  Move SMS pdu creation fully into the central Phone process.
2009-08-31 22:39:22 -07:00
Chih-Chung Chang
fdf3b764b4 am 4bd0a118: am 808c739a: Merge change 23402 into eclair
Merge commit '4bd0a1188d5e59429af831c35f7efeeaf318d4fd'

* commit '4bd0a1188d5e59429af831c35f7efeeaf318d4fd':
  Fix 2081525: NPE in MediaScannerService.
2009-08-31 22:38:09 -07:00
Tammo Spalink
1f952a178d Move SMS pdu creation fully into the central Phone process.
Previously pdu creation was haphazardly done sometimes by the app and
sometimes centrally by the phone process -- specifically the phone
process did creation for multipart texts.  This change gets rid of the
previous IPC interface for sending raw pdus to SMSDispatch in the
phone process, and instead makes everything work like multipart
messages worked before, namely the structured data is passed and pdu
encoding done centrally.

The motivation for this was the need to ensure that CDMA message id
numbers were strictly monotonic, including across reboots, which
necessitated central state in the form of a system property, which
could in turn only be modified by the phone process.

Hence, this (in part) addresses issue: http://buganizer/issue?id=2075760

Change-Id: I94ca207b6e657c465e8472534704db8646ee277c
2009-09-01 13:37:03 +08:00
Chih-Chung Chang
4bd0a1188d am 808c739a: Merge change 23402 into eclair
Merge commit '808c739a9428b11a811659403bbb46a0814a2928' into eclair-plus-aosp

* commit '808c739a9428b11a811659403bbb46a0814a2928':
  Fix 2081525: NPE in MediaScannerService.
2009-08-31 22:35:51 -07:00
Android (Google) Code Review
808c739a94 Merge change 23402 into eclair
* changes:
  Fix 2081525: NPE in MediaScannerService.
2009-08-31 22:33:41 -07:00
Guang Zhu
28faac388c am dcd21531: am ce54003a: Merge change 23406 into eclair
Merge commit 'dcd21531a7107421ecf7f88828040bc3a39cfbf3'

* commit 'dcd21531a7107421ecf7f88828040bc3a39cfbf3':
  allow a longer timeout for layout tests, see if it stabilizes pass/fail numbers
2009-08-31 22:08:49 -07:00
Guang Zhu
dcd21531a7 am ce54003a: Merge change 23406 into eclair
Merge commit 'ce54003aa8961764763c4045991b730974fa9083' into eclair-plus-aosp

* commit 'ce54003aa8961764763c4045991b730974fa9083':
  allow a longer timeout for layout tests, see if it stabilizes pass/fail numbers
2009-08-31 22:06:30 -07:00
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
Owen Lin
f9b702e212 Open some methods on PrefereneManager to allow others use the inflater.
Change-Id: I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162
2009-09-01 09:57:09 +08: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