Commit Graph

4750 Commits

Author SHA1 Message Date
Android (Google) Code Review
883be83eab Merge change I2effb21e into eclair-mr2
* changes:
  Add UPDATE_ACTION to Gservices, used by the new checkin service.
2009-11-06 16:08:38 -05:00
Charles Mendis
6b07bf3d8f am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:46:43 -08:00
Android (Google) Code Review
3cba72880b Merge change I6ccd2ebc into eclair
* changes:
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 14:39:22 -05:00
Charles Mendis
322591cb4b Expose PowerManager.isScreenOn in the public api.
Change-Id: I6ccd2ebcbf3f8ad9ffa4b86a9c037cb0c25a7b78
2009-11-06 14:37:07 -05:00
Android (Google) Code Review
300160edc9 Merge change I29a3be5b into eclair-mr2
* changes:
  Calendar: add CALLER_IS_SYNCADAPTER parameter.
2009-11-06 13:23:27 -05:00
Cary Clark
4e9fe62b37 do not merge -- original checkin to mr2 here:
https://android-git.corp.google.com/g/#change,30204

check for native initialization before calling public function

Added more checks where it is possible to call a native function
after creating a WebView but before the native side is initialized.

These cases can be triggered by the monkey.

Fixes http://b/issue?id=2187719
2009-11-06 10:29:30 -05:00
Jared Suttles
1ae7831b8a am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting
Merge commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f' into eclair-mr2

* commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f':
  jni: GpsLocationProvider: Check for pending callbacks before waiting
2009-11-06 06:31:37 -08:00
Jared Suttles
8b1243e5e4 jni: GpsLocationProvider: Check for pending callbacks before waiting
This change fixes a corner case where a callback may not get handled until
a second callback arrives.  This can happen because there is a significant
section of the wait_for_event function where the mutex is not locked, and
the sPendingCallbacks member could be updated.  We now check to see if
there is a pending callback to handle before we wait for another callback.

Change-Id: I20cfae1e780944bb74133940dda032efc4c55540
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-06 08:28:58 -05:00
Dianne Hackborn
892574f5f9 am 13bf8260: Fix SDK build: a few things missing, a link that was wrong.
Merge commit '13bf8260134d516cbcc982d360d9f21067f47fa6' into eclair-mr2

* commit '13bf8260134d516cbcc982d360d9f21067f47fa6':
  Fix SDK build: a few things missing, a link that was wrong.
2009-11-05 21:57:51 -08:00
Dianne Hackborn
13bf826013 Fix SDK build: a few things missing, a link that was wrong.
Change-Id: I55c9c510b3f0866ce6085927afa00b9fb69dd8c5
2009-11-05 21:45:51 -08:00
Dianne Hackborn
237cc15c17 am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '274b120f3975c8db6daeeab51a5fe08d6dede479' into eclair-mr2

* commit '274b120f3975c8db6daeeab51a5fe08d6dede479':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK
2009-11-05 20:41:50 -08:00
Dianne Hackborn
274b120f39 Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Change-Id: I7e996bf549922c1bb8e8c00d051650ffe12d818c
2009-11-05 20:35:23 -08:00
Romain Guy
15b9de8cf2 am 1d5b3a63: Fix the build
Merge commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0' into eclair-mr2

* commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0':
  Fix the build
2009-11-05 20:27:53 -08:00
Dan Egnor
2effb21e89 Add UPDATE_ACTION to Gservices, used by the new checkin service. 2009-11-05 20:08:49 -08:00
Romain Guy
1d5b3a631c Fix the build
Change-Id: Id7514858594772ab79c0f3db745b00f0bb59218b
2009-11-05 18:45:10 -08:00
Romain Guy
8426319c5a am f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-mr2

* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
  Prevent crash in Home when using widgets whose ids collide with Home's
2009-11-05 15:47:43 -08:00
Android (Google) Code Review
f20e9a88a3 Merge change Idf40f3b0 into eclair
* changes:
  Prevent crash in Home when using widgets whose ids collide with Home's resources.
2009-11-05 18:42:14 -05:00
Romain Guy
ae8dd29c03 Prevent crash in Home when using widgets whose ids collide with Home's
resources.

Bug #2228943.

Approved by mcleron, triaged by ryanpc.

Change-Id: Idf40f3b09502ae5d0d3b9a6a72c265a2de2ffca2
2009-11-05 15:40:35 -08:00
Jaikumar Ganesh
f53f86a743 am 8de4e0ad: Merge change I21d0dca3 into eclair
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-mr2

* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
2009-11-05 15:39:40 -08:00
Ken Shirriff
5b387e16f7 Calendar: add CALLER_IS_SYNCADAPTER parameter. 2009-11-05 15:24:18 -08:00
Android (Google) Code Review
8de4e0ad8f Merge change I21d0dca3 into eclair
* changes:
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
2009-11-05 17:15:51 -05:00
Daniel Sandler
1bca7612df am eca41b31: Merge change Id1458b01 into eclair
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-mr2

* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
  New live wallpaper API to expose author and description strings.
2009-11-05 13:54:40 -08:00
Daniel Sandler
18a509d8fa New live wallpaper API to expose author and description strings.
First in a sequence of CLs to address
http://b/issue?id=2235307 .

Change-Id: Id1458b01c8a7918f345823b45e5726e02285d8b5
2009-11-05 15:05:27 -05:00
Jaikumar Ganesh
21d0dca33e Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
This may force some Motorola headsets to thow up the Pairing Request.

Bug: 2210365
Dr No: Eastham
2009-11-05 11:30:18 -08:00
Android (Google) Code Review
195a507fc3 Merge change I272af007 into eclair-mr2
* changes:
  a possible fix for the bug http://b/issue?id=2200637
2009-11-05 12:53:34 -05:00
Eric Laurent
fcae6c7179 am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 00:01:33 -08:00
Android (Google) Code Review
67b692920c Merge change I93f500a5 into eclair
* changes:
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 02:55:26 -05:00
Eric Laurent
bda7469d9b Fix issue 2203561: Sholes: audio playing out of earpiece.
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.

Same modifications for AudioRecord.

Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
2009-11-04 23:47:21 -08:00
Android (Google) Code Review
dc0f9efd35 Merge change I0d442f0d into eclair-mr2
* changes:
  Add tests for Japanization part of vCard.
2009-11-04 23:49:46 -05:00
Daisuke Miyakawa
4fe2c57c3c Add tests for Japanization part of vCard.
Fix several bugs around name construction.

Internal issue number: 2195990
2009-11-05 13:47:48 +09:00
Romain Guy
05abe8d01d am 131564d2: Merge change I3bbfb4f9 into eclair
Merge commit '131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-mr2

* commit '131564d26ac5b7f963c60802089b9fe1472659f7':
  Remove unused field and add new API to control the children drawing order.
2009-11-04 17:36:46 -08:00
Android (Google) Code Review
131564d26a Merge change I3bbfb4f9 into eclair
* changes:
  Remove unused field and add new API to control the children drawing order.
2009-11-04 19:58:00 -05:00
Romain Guy
293451e4f0 Remove unused field and add new API to control the children drawing order.
Approved by: xav, hackbod, mcleron.

Change-Id: I3bbfb4f96e3c9adedbb68d78703059a2df1e2013
2009-11-04 16:57:07 -08:00
Eric Olsen
76922b8378 am 9053fdb3: Merge change I76127f6f into eclair
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-mr2

* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
  Add support for colored LED on jogball backlight.
2009-11-04 16:49:31 -08:00
Android (Google) Code Review
5dbeef6e98 Merge change I76588b56 into eclair-mr2
* changes:
  Make vCard importer handle "PAGER" phone number correctly.
2009-11-04 19:45:14 -05:00
Daisuke Miyakawa
26ee0ae9de Make vCard importer handle "PAGER" phone number correctly.
Add tests for it.

Internal issue number: 2239492
2009-11-05 09:44:42 +09:00
Vasu Nori
272af00768 a possible fix for the bug http://b/issue?id=2200637 2009-11-04 16:26:55 -08:00
Leon Scroggins
3613385fbc Do not update the progress if it is the same as the last given progress. 2009-11-04 14:50:14 -08:00
Eric Olsen
f42f15cf45 Add support for colored LED on jogball backlight.
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-04 14:31:26 -08:00
Dirk Dougherty
0d55daffc3 am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '5fc71e67498ed64ad2d41c23471b008f93cb580e' into eclair-mr2

* commit '5fc71e67498ed64ad2d41c23471b008f93cb580e':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 14:21:20 -08:00
Dirk Dougherty
5fc71e6749 am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4' into eclair

* commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 14:12:29 -08:00
Android (Google) Code Review
00e44ef217 Merge change I54545dfd into eclair-sdk
* changes:
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 17:04:41 -05:00
Romain Guy
1503f739f8 am e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356' into eclair-mr2

* commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356':
  Make sure we relayout the TextView when the text changes and marquee is enabled.
2009-11-04 06:10:26 -08:00
Daisuke Miyakawa
f035b47774 Make test compontent support multiple vCard input.
Internal issue number: 2195990
2009-11-04 21:51:54 +09:00
Romain Guy
e1e0dc8e6e Make sure we relayout the TextView when the text changes and marquee is enabled.
Bug #2192881.

Change-Id: Iffc2d15947a11974d9dc175740e3a5489cd43d21
2009-11-03 17:24:55 -08:00
Leon Scroggins
405d785f86 Do not scroll the title bar off screen until the page finishes loading.
Fix http://b/issue?id=2139418
2009-11-03 16:01:44 -08:00
Dirk Dougherty
59ad275e93 doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Bug: 2230588
Change-Id: I54545dfd9d26acef567e586cfc916f6b883a4de7
2009-11-03 15:33:37 -08:00
Romain Guy
4d7860d408 am 9ed30f93: Merge change I96444af2 into eclair
Merge commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84' into eclair-mr2

* commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84':
  Unhide View.isOpaque().
2009-11-03 12:15:11 -08:00
Romain Guy
732046f874 Unhide View.isOpaque().
Change-Id: I96444af2a7e66a330a2c4b3fa0a173ec5ab4ed40
2009-11-03 12:09:04 -08:00
Evan Millar
97c5a99344 am 326eaa33: Merge change I0fae86b8 into eclair
Merge commit '326eaa334da566c3dcae29b17f255c63c8bb919a' into eclair-mr2

* commit '326eaa334da566c3dcae29b17f255c63c8bb919a':
  Make QuickContact styles public.
2009-11-03 11:04:53 -08:00