10601 Commits

Author SHA1 Message Date
Derek Sollenberger
3dafca1842 Enabling plugin surfaces to update their position in the UI. 2009-10-13 11:45:47 -04:00
Robert Greenwalt
f1acb2ddcd Add a little logging to diagnose wifi cycle bug
Hiroshi approved (with serious code review).
bug: 2171575
2009-10-13 08:20:55 -07:00
Android (Google) Code Review
69e2ef473c Merge change I9f93ce61 into eclair
* changes:
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 06:02:59 -04:00
Dave Sparks
a6118c6383 Throttle camera preview frames to the app. Bug 2180302.
With higher frame rates and larger preview frames, we can easily
flood the application with too much data. This patch fakes the
old camera preview mode by doing continuous one-shot frames.
After the previous frame is handled, if the application hasn't
cleared the preview callback, we start another one-shot preview
frame. With this change, the application should never have more
than one preview frame unless it is explicitly saving references
to them.

	modified:   core/java/android/hardware/Camera.java
2009-10-13 02:52:00 -07:00
Grace Kloba
4d915e00dc am d5ad08bd: am 2e778c17: Merge change I124356f6 into eclair
Merge commit 'd5ad08bd4230c2f5d58969c624c39a3f5a2019d1' into eclair-mr2-plus-aosp

* commit 'd5ad08bd4230c2f5d58969c624c39a3f5a2019d1':
  Continue caching "POST" result so that we won't get
2009-10-12 18:41:22 -07:00
Chung-yih Wang
3adcc21849 am cf4f2c22: Merge change Ic6d1545d into eclair-mr2
Merge commit 'cf4f2c22cbe62843324718f657021ce0c459a3db' into eclair-mr2-plus-aosp

* commit 'cf4f2c22cbe62843324718f657021ce0c459a3db':
  Support double-quote SSID in WifiService.
2009-10-12 18:41:15 -07:00
Grace Kloba
d5ad08bd42 am 2e778c17: Merge change I124356f6 into eclair
Merge commit '2e778c176d17c295f475141bddda9dca5cd65fce' into eclair-mr2

* commit '2e778c176d17c295f475141bddda9dca5cd65fce':
  Continue caching "POST" result so that we won't get
2009-10-12 18:36:17 -07:00
Android (Google) Code Review
cf4f2c22cb Merge change Ic6d1545d into eclair-mr2
* changes:
  Support double-quote SSID in WifiService.
2009-10-12 21:33:04 -04:00
Android (Google) Code Review
2e778c176d Merge change I124356f6 into eclair
* changes:
  Continue caching "POST" result so that we won't get the resubmission warning when back to Google search result.
2009-10-12 21:30:04 -04:00
Chung-yih Wang
a8d1594139 Support double-quote SSID in WifiService.
+ push the double-quote handling down to framework.

wpa_supplicant keeps the ssid in a quoted string in the config file. However,
the UI currently needs to handle the quoted string which makes it difficult
to handle the SSID containing the quotes. The change will move the
supplicant-specific double-quote handling from UI to framework, i.e. to
add/remove doubel-quotes in framework instead of in UI settings.
2009-10-13 09:03:35 +08:00
Grace Kloba
124356f630 Continue caching "POST" result so that we won't get
the resubmission warning when back to Google search result.

Fix http://b/issue?id=1490379
Break/reopen http://b/issue?id=1980031
2009-10-12 17:39:50 -07:00
Ken Shirriff
3b000937f5 Add "deleted" row to Events table.
This will replace the DeletedEvents table when moving Calendar to the
new sync framework.
2009-10-12 17:37:42 -07:00
Andreas Huber
96c1dfccb2 am 63f20ec1: Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
Merge commit '63f20ec1a8d31c85261056c6c171140b93bcde0a' into eclair-mr2-plus-aosp

* commit '63f20ec1a8d31c85261056c6c171140b93bcde0a':
  Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
2009-10-12 16:24:53 -07:00
Andreas Huber
c55bb59e54 am ef703f60: Merge change I98276091 into eclair-mr2
Merge commit 'ef703f60d5c00527048fdaf1c24984762f6fd434' into eclair-mr2-plus-aosp

* commit 'ef703f60d5c00527048fdaf1c24984762f6fd434':
  Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
2009-10-12 16:24:46 -07:00
Andreas Huber
63f20ec1a8 Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
related-to-bug: 1986192
2009-10-12 16:04:30 -07:00
Android (Google) Code Review
ef703f60d5 Merge change I98276091 into eclair-mr2
* changes:
  Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
2009-10-12 19:01:28 -04:00
Andreas Huber
fa8de75250 Change to a int64_t usecs representation for timestamps and duration throughout stagefright. 2009-10-12 16:00:07 -07:00
Daisuke Miyakawa
4fce5c81d5 am 7c6770c2: Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which enables vCard composer to append "TYPE=" to type param/attribute everytime possible, which should fix the issue 2180800.
Merge commit '7c6770c26ba819bcad3d9522e046f9d1fdf9e222' into eclair-mr2-plus-aosp

* commit '7c6770c26ba819bcad3d9522e046f9d1fdf9e222':
  Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
2009-10-12 15:58:32 -07:00
Daisuke Miyakawa
7c6770c26b Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
enables vCard composer to append "TYPE=" to type param/attribute
everytime possible, which should fix the issue 2180800.

issue number: 2180800
2009-10-12 15:14:09 -07:00
Daisuke Miyakawa
2c0fe9b0f6 am d48e25d4: Merge change I83b3bddf into eclair-mr2
Merge commit 'd48e25d4e3278c5e975db01adb98661ee59923fe' into eclair-mr2-plus-aosp

* commit 'd48e25d4e3278c5e975db01adb98661ee59923fe':
  Add a new TestSuites: VCardTests
2009-10-12 14:53:43 -07:00
Android (Google) Code Review
d48e25d4e3 Merge change I83b3bddf into eclair-mr2
* changes:
  Add a new TestSuites: VCardTests
2009-10-12 17:44:19 -04:00
Daisuke Miyakawa
221bc127c4 Add a new TestSuites: VCardTests
Now, the following command is available.
adb shell am instrument -w -e class com.android.unit_tests.vcard.VCardTests com.android.unit_tests/android.test.InstrumentationTestRunner

Internal Issuer number: 2160039
2009-10-12 14:43:30 -07:00
Libin Tang
715aba5a7a am edb98812: am febb94cd: Make standard roaming indicator display indications configurable
Merge commit 'edb988128e5b14b46c692d19ea4f536d7daa7b39' into eclair-mr2-plus-aosp

* commit 'edb988128e5b14b46c692d19ea4f536d7daa7b39':
  Make standard roaming indicator display indications configurable
2009-10-12 14:30:25 -07:00
Libin Tang
edb988128e am febb94cd: Make standard roaming indicator display indications configurable
Merge commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5' into eclair-mr2

* commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5':
  Make standard roaming indicator display indications configurable
2009-10-12 14:23:09 -07:00
Libin Tang
febb94cdbb Make standard roaming indicator display indications configurable
Allow the ERI overlay file to specify the text for any built-in strings.
Currently only the hard-coded strings are used for those.

Bug: 2170881
Change-Id: I5d6169696a4558e62587585e17f908f823c54a2b
2009-10-12 14:13:04 -07:00
Daisuke Miyakawa
74a2d09cba am 347daf3a: Merge change I2a52a60a into eclair-mr2
Merge commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7' into eclair-mr2-plus-aosp

* commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7':
  Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
2009-10-12 14:12:17 -07:00
Android (Google) Code Review
347daf3a98 Merge change I2a52a60a into eclair-mr2
* changes:
  Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
2009-10-12 17:03:12 -04:00
Daisuke Miyakawa
ba2b21bee8 Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
In order to share the logic between tests for importer and those for exporter,
PropertyNodesVerifier is now a separated class and drastically modified.
Now the class accept "unordered" expected PropertyNode objects, which allows vCard
composer to not care the exact order of each elements.

MockCursor is added, which may be added into the public API in the future, but in
the test directory for now.
Another MockContentProvider is (temporarily) developed so that it can be accepted by
MockContentResolver#addProvider(), which does not allow IContentProvider and its
descendants but only exact ContentProvider, while the original MockContentProvider in
android.test.mock.MockContentProvider implements IContentProvider.

The test development is still on-going, but this test suffices minimal requirement of
vCard tests.

Internal issue number: 2160039
2009-10-12 13:42:42 -07:00
Ray Chen
73b0050111 Check cursor and URI value for nullity to prevent NPE. 2009-10-12 13:19:34 -07:00
Robert Greenwalt
e93f07c3f8 am 1cf6c2c3: am 6d02f3f3: Merge change I71f48a21 into eclair
Merge commit '1cf6c2c3cc397333653b6f061db4ca9f5d88c7f3' into eclair-mr2-plus-aosp

* commit '1cf6c2c3cc397333653b6f061db4ca9f5d88c7f3':
  Reduce the amount of EriManager Logging.
2009-10-12 12:38:57 -07:00
Dima Zavin
0b2dd95d2e am 0c559a4b: am 98b3def2: Merge change I6261ab54 into eclair
Merge commit '0c559a4b0f8918fe89921d7984001d00285f226f' into eclair-mr2-plus-aosp

* commit '0c559a4b0f8918fe89921d7984001d00285f226f':
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
2009-10-12 12:38:49 -07:00
Robert Greenwalt
1cf6c2c3cc am 6d02f3f3: Merge change I71f48a21 into eclair
Merge commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-mr2

* commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
  Reduce the amount of EriManager Logging.
2009-10-12 12:33:42 -07:00
Android (Google) Code Review
6d02f3f3ff Merge change I71f48a21 into eclair
* changes:
  Reduce the amount of EriManager Logging.
2009-10-12 15:25:51 -04:00
Robert Greenwalt
71f48a21b0 Reduce the amount of EriManager Logging.
It was filling the radio log with noise.  Added a VDBG set to false to preserve the logging
but deactivate it.

bug: 2180891
2009-10-12 12:13:14 -07:00
Dima Zavin
0c559a4b0f am 98b3def2: Merge change I6261ab54 into eclair
Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-mr2

* commit '98b3def2983e78409002cf406574bbc8eeef8bfd':
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
2009-10-12 12:08:19 -07:00
Android (Google) Code Review
98b3def298 Merge change I6261ab54 into eclair
* changes:
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
2009-10-12 15:01:43 -04:00
Mike Reed
8547ce6ada am bd5662a1: Merge change Ifd71653f into eclair-mr2
Merge commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315' into eclair-mr2-plus-aosp

* commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315':
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
2009-10-12 12:00:46 -07:00
Android (Google) Code Review
bd5662a1a2 Merge change Ifd71653f into eclair-mr2
* changes:
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
2009-10-12 14:52:45 -04:00
Mike Reed
fd71653f6a add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs 2009-10-12 14:42:56 -04:00
Mike Lockwood
a7cdac0329 am 5ad40971: am 6abf7c8f: Merge change Iad66a274 into eclair
Merge commit '5ad409719809b4070ba0bb36c5326c7cac7c75ea' into eclair-mr2-plus-aosp

* commit '5ad409719809b4070ba0bb36c5326c7cac7c75ea':
  Fix race condition in WindowManagerService.disableKeyguard()
2009-10-12 11:26:58 -07:00
Mike Lockwood
5ad4097198 am 6abf7c8f: Merge change Iad66a274 into eclair
Merge commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b' into eclair-mr2

* commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b':
  Fix race condition in WindowManagerService.disableKeyguard()
2009-10-12 11:21:28 -07:00
Nick Pelly
132570cbf4 am 77df9d6e: am d301c904: Merge change I305c181c into eclair
Merge commit '77df9d6e0ca56a34c66a1e30e9696085ddbd9038' into eclair-mr2-plus-aosp

* commit '77df9d6e0ca56a34c66a1e30e9696085ddbd9038':
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 11:21:12 -07:00
Dianne Hackborn
8cbafb83b4 am 7fa61063: am f836acf2: Merge change I067d55ea into eclair
Merge commit '7fa610638b09f2a4a29d7df1b16d2fe686b5e5e6' into eclair-mr2-plus-aosp

* commit '7fa610638b09f2a4a29d7df1b16d2fe686b5e5e6':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 11:21:04 -07:00
Christoffer Gurell
78077455a8 am f555bf65: Merge change I4a4323c0 into eclair-mr2
Merge commit 'f555bf65e18407314f569c1c767e5334cf3f56bf' into eclair-mr2-plus-aosp

* commit 'f555bf65e18407314f569c1c767e5334cf3f56bf':
  Fixes scroll/measure bug in EditText
2009-10-12 11:20:56 -07:00
Android (Google) Code Review
6abf7c8fcc Merge change Iad66a274 into eclair
* changes:
  Fix race condition in WindowManagerService.disableKeyguard()
2009-10-12 14:14:44 -04:00
Nick Pelly
77df9d6e0c am d301c904: Merge change I305c181c into eclair
Merge commit 'd301c90446644f63cda9b9263f83332676065bb4' into eclair-mr2

* commit 'd301c90446644f63cda9b9263f83332676065bb4':
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 11:11:38 -07:00
Dianne Hackborn
7fa610638b am f836acf2: Merge change I067d55ea into eclair
Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-mr2

* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 11:11:30 -07:00
Android (Google) Code Review
d301c90446 Merge change I305c181c into eclair
* changes:
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 14:05:44 -04:00
Android (Google) Code Review
f836acf241 Merge change I067d55ea into eclair
* changes:
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 14:04:31 -04:00
Android (Google) Code Review
f555bf65e1 Merge change I4a4323c0 into eclair-mr2
* changes:
  Fixes scroll/measure bug in EditText
2009-10-12 13:31:19 -04:00