20821 Commits

Author SHA1 Message Date
Jeff Brown
c254ce3ab0 am 6801cedb: am 6a3e7dfa: am c738783c: Merge "Fix alarms with negative or very large wakup times." into froyo 2010-03-31 16:14:45 -07:00
Jeff Brown
6801cedb76 am 6a3e7dfa: am c738783c: Merge "Fix alarms with negative or very large wakup times." into froyo
Merge commit '6a3e7dfa87345244190403eaad71e760f11305ba' into kraken

* commit '6a3e7dfa87345244190403eaad71e760f11305ba':
  Fix alarms with negative or very large wakup times.
2010-03-31 16:06:53 -07:00
Jeff Brown
6a3e7dfa87 am c738783c: Merge "Fix alarms with negative or very large wakup times." into froyo
Merge commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc' into froyo-plus-aosp

* commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc':
  Fix alarms with negative or very large wakup times.
2010-03-31 16:00:58 -07:00
Jeff Brown
c738783cc2 Merge "Fix alarms with negative or very large wakup times." into froyo 2010-03-31 15:56:30 -07:00
Glenn Kasten
7f9b1fa671 Add isSilentMode initially hidden before API council approval, test case to be added separately.
Change-Id: Id9384a2caf45b8775705cde6c990c3c65c7c6312
2010-03-31 15:54:12 -07:00
Jeff Brown
11c5f1a65d Fix alarms with negative or very large wakup times.
When the wakeup time is negative, the kernel /dev/alarm driver
never triggers the alarm.  This can cause alarms to back up in the
priority queue since an alarm at the head with a negative wakup time
will never be triggered.  Now we use 0 as the wakup time which causes
an immediate triggering.

When the wakeup time is very large, it is possible for a numeric
overflow to occur when converting the timestamp from milliseconds
since epoch to nanoseconds.  This has been fixed by avoiding the
intermediate conversion in the JNI call so that overflow cannot
occur.

Bug: b/2558820
Change-Id: I4f5b4646a04090cc749a9fc5d3982a68402954ef
2010-03-31 15:38:08 -07:00
Dirk Dougherty
9fadfe3ac4 am 0da58f15: am e4fa5d76: am 36b3b5fc: doc change: several fixes for UI Guidelines doc. 2010-03-31 15:10:59 -07:00
Dirk Dougherty
0da58f15c4 am e4fa5d76: am 36b3b5fc: doc change: several fixes for UI Guidelines doc.
Merge commit 'e4fa5d7669bba2cdb6f72379933005407a5bedc5' into kraken

* commit 'e4fa5d7669bba2cdb6f72379933005407a5bedc5':
  doc change: several fixes for UI Guidelines doc.
2010-03-31 15:04:25 -07:00
Dirk Dougherty
e4fa5d7669 am 36b3b5fc: doc change: several fixes for UI Guidelines doc.
Merge commit '36b3b5fc9a86a77488ed8b2497621ddca03d3cba' into froyo-plus-aosp

* commit '36b3b5fc9a86a77488ed8b2497621ddca03d3cba':
  doc change: several fixes for UI Guidelines doc.
2010-03-31 14:58:48 -07:00
Dirk Dougherty
8eb1f5b7b0 am d94a2bb0: am d1a1ea05: am 59e644e3: doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master 2010-03-31 14:55:50 -07:00
Dirk Dougherty
d94a2bb07f am d1a1ea05: am 59e644e3: doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
Merge commit 'd1a1ea05ba3aa48fd65ea225d5c5c757232e4979' into kraken

* commit 'd1a1ea05ba3aa48fd65ea225d5c5c757232e4979':
  doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
2010-03-31 14:49:19 -07:00
Dirk Dougherty
36b3b5fc9a doc change: several fixes for UI Guidelines doc.
Change-Id: I351a076929e1fde0348460f4dfb269cfbcb262f2
2010-03-31 14:45:59 -07:00
Dirk Dougherty
d1a1ea05ba am 59e644e3: doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
Merge commit '59e644e399e9a8dce48f28c34b5ed66974c41bd4' into froyo-plus-aosp

* commit '59e644e399e9a8dce48f28c34b5ed66974c41bd4':
  doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
2010-03-31 14:45:50 -07:00
Dirk Dougherty
59e644e399 doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master 2010-03-31 14:24:34 -07:00
The Android Open Source Project
9bab8f115b am 4790259c: am 8de2cf4c: merge from open-source master 2010-03-31 14:23:19 -07:00
The Android Open Source Project
4790259c32 am 8de2cf4c: merge from open-source master
Merge commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102' into kraken

* commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102':
  Fix last character of password field being visible after rotation
  gl_code : add end of line.
2010-03-31 14:17:32 -07:00
The Android Open Source Project
8de2cf4cce merge from open-source master
Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
2010-03-31 14:01:45 -07:00
Jean-Michel Trivi
27efd39170 am f788add0: am 93511f38: am 3ce1648f: Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo 2010-03-31 14:01:07 -07:00
Jean-Michel Trivi
f788add075 am 93511f38: am 3ce1648f: Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
Merge commit '93511f384b1180bf5277a26ceeff568fa6aa858d' into kraken

* commit '93511f384b1180bf5277a26ceeff568fa6aa858d':
  Fix bug 2553575 API REVIEW: android.media  Change 1 of 3
2010-03-31 13:49:56 -07:00
Jean-Michel Trivi
93511f384b am 3ce1648f: Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
Merge commit '3ce1648fce73496c6ea6a208e5d13141ff7f34e1' into froyo-plus-aosp

* commit '3ce1648fce73496c6ea6a208e5d13141ff7f34e1':
  Fix bug 2553575 API REVIEW: android.media  Change 1 of 3
2010-03-31 13:44:20 -07:00
Jean-Michel Trivi
3ce1648fce Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo 2010-03-31 13:40:42 -07:00
Doug Felt
9f7a4442b8 Enable nested bidi levels in a paragraph.
Changes the internal representation of direction information in the Directions object to be a visually-ordered list of start/length+direction pairs instead of a list of directionality inversion offsets.

Rewrite Layout.getOffsetToLeft/RightOf to use run information instead of width metrics.

Remove java Bidi, use native.  Switch bidi tests to test native, expect levels instead of dirs.

Add test of directionality.  Leave in switch to turn new code off and restore previous behavior for now.

Change-Id: Iea8bb46c678a18820e237c90f76007a084c83051
2010-03-31 12:08:55 -07:00
Jean-Michel Trivi
7f7e67f1b6 Fix bug 2553575 API REVIEW: android.media Change 1 of 3
Notes from API Council review:
  Rename onAudioFocusChanged -> onAudioFocusChange

Change-Id: I8296cc84381506dabe8a9ceb1b5e3c0ab6d4af25
2010-03-31 12:08:26 -07:00
Andreas Huber
5833ae3c9d am ed46ba26: am 41e8e4a2: am 804878f3: Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo 2010-03-31 11:50:37 -07:00
Andreas Huber
ed46ba262b am 41e8e4a2: am 804878f3: Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
Merge commit '41e8e4a29df084e2e82fe13123d603b26a9eaefb' into kraken

* commit '41e8e4a29df084e2e82fe13123d603b26a9eaefb':
  Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
2010-03-31 11:44:01 -07:00
Andreas Huber
41e8e4a29d am 804878f3: Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
Merge commit '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b' into froyo-plus-aosp

* commit '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b':
  Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
2010-03-31 11:38:54 -07:00
Andreas Huber
804878f3a3 Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo 2010-03-31 11:33:19 -07:00
Dianne Hackborn
7878238ebd am 8cb52c8a: am bc50bdca: am e259bc77: Fix issue #2558391: Package manager problem when not replacing existing system partition app 2010-03-31 11:23:56 -07:00
Dianne Hackborn
8cb52c8a7d am bc50bdca: am e259bc77: Fix issue #2558391: Package manager problem when not replacing existing system partition app
Merge commit 'bc50bdca0ae1f7d173e4f589db250dc519740c16' into kraken

* commit 'bc50bdca0ae1f7d173e4f589db250dc519740c16':
  Fix issue #2558391: Package manager problem when not replacing existing system partition app
2010-03-31 11:17:01 -07:00
Fred Quintana
fdeb5dce61 am 92065ad7: am fa41ccf1: am 9b9a89a5: Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo 2010-03-31 11:14:36 -07:00
Patrick Scott
d2085c8844 am e4424326: am 09c49a8a: am 92534469: Use case insensitive matching. 2010-03-31 11:14:33 -07:00
Dianne Hackborn
bc50bdca0a am e259bc77: Fix issue #2558391: Package manager problem when not replacing existing system partition app
Merge commit 'e259bc770b3eeb88eb7a03ec0af2522ca9929f58' into froyo-plus-aosp

* commit 'e259bc770b3eeb88eb7a03ec0af2522ca9929f58':
  Fix issue #2558391: Package manager problem when not replacing existing system partition app
2010-03-31 11:14:13 -07:00
Andreas Huber
0d34d8b4d5 Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
Change-Id: I30b93b21de9bd5509b617cca21f46331562c30ac
related-to-bug: 2553445
2010-03-31 11:08:23 -07:00
Dianne Hackborn
e259bc770b Fix issue #2558391: Package manager problem when not replacing existing system partition app
This fixes the package manager to ensure we can't get in this bad state of
an update to a system app being installed as a separate app.

Change-Id: I2a3f601bbc06b74f31ca09192993614bc6885ff7
2010-03-31 11:07:47 -07:00
Fred Quintana
92065ad772 am fa41ccf1: am 9b9a89a5: Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
Merge commit 'fa41ccf18cfb9b366c859e09112f8f98797bf152' into kraken

* commit 'fa41ccf18cfb9b366c859e09112f8f98797bf152':
  added a cleanspec since ActiveSyncInfo.aidl was removed
2010-03-31 11:07:38 -07:00
Patrick Scott
e4424326ce am 09c49a8a: am 92534469: Use case insensitive matching.
Merge commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510' into kraken

* commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510':
  Use case insensitive matching.
2010-03-31 11:04:50 -07:00
Fred Quintana
fa41ccf18c am 9b9a89a5: Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
Merge commit '9b9a89a58f50c3004959c36252489fae54fb9c58' into froyo-plus-aosp

* commit '9b9a89a58f50c3004959c36252489fae54fb9c58':
  added a cleanspec since ActiveSyncInfo.aidl was removed
2010-03-31 11:04:48 -07:00
Fred Quintana
9b9a89a58f Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo 2010-03-31 11:01:41 -07:00
San Mehat
ab0bee4b60 am 6f63dd5d: (-s ours) framework: Hide StorageManager for froyo - do not merge 2010-03-31 11:01:00 -07:00
Patrick Scott
09c49a8a6c am 92534469: Use case insensitive matching.
Merge commit '9253446922d925f6a5453b60d539beed292921a7' into froyo-plus-aosp

* commit '9253446922d925f6a5453b60d539beed292921a7':
  Use case insensitive matching.
2010-03-31 11:00:39 -07:00
Fred Quintana
28d5e74b42 added a cleanspec since ActiveSyncInfo.aidl was removed
Change-Id: I1fb57d2a4d28211f0adaf8c1d184a8c5f7701d7f
2010-03-31 10:59:43 -07:00
San Mehat
6f63dd5dc8 framework: Hide StorageManager for froyo - do not merge
Change-Id: I9a871e49cc9e1accb28c7e4b76bb0796eaf26d7b
2010-03-31 10:46:42 -07:00
Patrick Scott
9253446922 Use case insensitive matching.
Use the lowercase version of the protocol.

Bug: 2560217
Change-Id: Ibfadf4ba363968df9caf22c9ab36f666ee44d1db
2010-03-31 13:36:47 -04:00
Eric Olsen
2544a74dff am 8d72c644: am f26cf98f: am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo 2010-03-31 10:18:15 -07:00
Eric Olsen
8d72c64404 am f26cf98f: am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Merge commit 'f26cf98ffa087670a5ad849d7dd3c568d4f03ec9' into kraken

* commit 'f26cf98ffa087670a5ad849d7dd3c568d4f03ec9':
  Add thermal shutdown.  If battery temp >= 68C.
2010-03-31 10:12:26 -07:00
Eric Olsen
f26cf98ffa am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Merge commit '711065587b46ea0279788757c49a273ff796f844' into froyo-plus-aosp

* commit '711065587b46ea0279788757c49a273ff796f844':
  Add thermal shutdown.  If battery temp >= 68C.
2010-03-31 10:07:36 -07:00
Eric Olsen
711065587b Merge "Add thermal shutdown. If battery temp >= 68C." into froyo 2010-03-31 10:04:24 -07:00
Andreas Huber
9a8c4dcada am 4f0be1a8: am c7418149: am 5c1e96bb: Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo 2010-03-31 10:03:15 -07:00
Robert Greenwalt
955728a97d am f9112090: am 676f7052: am 0a08b194: Merge "Fix HttpProxy." into froyo 2010-03-31 09:55:27 -07:00
Andreas Huber
4f0be1a8f3 am c7418149: am 5c1e96bb: Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
Merge commit 'c7418149fafc7ded51a527b1d756028b33af3ac0' into kraken

* commit 'c7418149fafc7ded51a527b1d756028b33af3ac0':
  Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
2010-03-31 09:54:12 -07:00