ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,825 Commits 2 Branches 0 Tags 54 MiB
3a79a081de
Commit Graph

13825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
3a79a081de am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 
Merge commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23' into kraken

* commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23':
  Fix issue #2560791: Expose API to go in to car mode.
 2010-03-31 23:23:16 -07:00
Dianne Hackborn
6b7794adbd am 025f3933: am 686f7911: Merge "Fix issue #2561067: Screen Display half faded..." into froyo 
Merge commit '025f3933cfc21655bfc5a5068c69303f1fe321ee' into kraken

* commit '025f3933cfc21655bfc5a5068c69303f1fe321ee':
  Fix issue #2561067: Screen Display half faded...
 2010-03-31 23:23:10 -07:00
Xia Wang
4e2125a0d6 am c2eb4094: am de1b1872: Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo 
Merge commit 'c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9' into kraken

* commit 'c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9':
  Test connecitvity manager functionality in state change.
 2010-03-31 23:23:06 -07:00
Adam Powell
05b5ea7a98 am 5af7ef60: am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 
Merge commit '5af7ef60277060b94604a0b9679bb08a4dc1e731' into kraken

* commit '5af7ef60277060b94604a0b9679bb08a4dc1e731':
  Fix bug 2562240 and clean up scrollbar behavior
 2010-03-31 23:23:02 -07:00
Suchi Amalapurapu
f4561c9426 am 1aa64b53: am ae18171a: Change certificate policy. 
Merge commit '1aa64b53eb9b3cc7904705076a015a5cd0e3b536' into kraken

* commit '1aa64b53eb9b3cc7904705076a015a5cd0e3b536':
  Change certificate policy.
 2010-03-31 23:22:56 -07:00
Jaikumar Ganesh
975a92f2f9 am b8fc825d: am 3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo 
Merge commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5' into kraken

* commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5':
  Fix crash while turning bluetooth on, due to a race condition.
 2010-03-31 23:22:51 -07:00
Dianne Hackborn
836e97da75 am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 
Merge commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256' into froyo-plus-aosp

* commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256':
  Fix issue #2560791: Expose API to go in to car mode.
 2010-03-31 23:18:28 -07:00
Dianne Hackborn
ea8e1512e3 am 686f7911: Merge "Fix issue #2561067: Screen Display half faded..." into froyo 
Merge commit '686f7911a3462d6847d2a9396572eaaf04a9f175' into froyo-plus-aosp

* commit '686f7911a3462d6847d2a9396572eaaf04a9f175':
  Fix issue #2561067: Screen Display half faded...
 2010-03-31 23:18:24 -07:00
Xia Wang
62faa6bcb5 am de1b1872: Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo 
Merge commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9' into froyo-plus-aosp

* commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9':
  Test connecitvity manager functionality in state change.
 2010-03-31 23:18:21 -07:00
Adam Powell
4b311de50d am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 
Merge commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705' into froyo-plus-aosp

* commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705':
  Fix bug 2562240 and clean up scrollbar behavior
 2010-03-31 23:18:17 -07:00
Suchi Amalapurapu
73b5f73bae am ae18171a: Change certificate policy. 
Merge commit 'ae18171acd3c70fc6d27fc6bbe85828e0f928fad' into froyo-plus-aosp

* commit 'ae18171acd3c70fc6d27fc6bbe85828e0f928fad':
  Change certificate policy.
 2010-03-31 23:18:12 -07:00
Jaikumar Ganesh
6a591a524b am 3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo 
Merge commit '3a0d1d11eba05d74d0461083eb6f31321588a0f6' into froyo-plus-aosp

* commit '3a0d1d11eba05d74d0461083eb6f31321588a0f6':
  Fix crash while turning bluetooth on, due to a race condition.
 2010-03-31 23:18:05 -07:00
Dianne Hackborn
678a358930 Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 2010-03-31 23:03:26 -07:00
Dianne Hackborn
e651e76ee4 Merge "Fix issue #2561067: Screen Display half faded..." into froyo 2010-03-31 22:49:30 -07:00
Xia Wang
55ae1b22e6 Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo 2010-03-31 20:29:10 -07:00
Adam Powell
aec2819346 Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 2010-03-31 20:11:33 -07:00
Jaikumar Ganesh
dc03e510fe Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo 2010-03-31 18:36:35 -07:00
Dirk Dougherty
6e9e4b98af am 8557df02: am 058e385b: doc change: fix link in guidelines index. 
Merge commit '8557df02d3aad448823cba5496908a45730d3ef8' into kraken

* commit '8557df02d3aad448823cba5496908a45730d3ef8':
  doc change: fix link in guidelines index.
 2010-03-31 16:20:20 -07:00
Dirk Dougherty
03706c6220 am 058e385b: doc change: fix link in guidelines index. 
Merge commit '058e385b8bca0376c27a24a54f3b00777ef30e0a' into froyo-plus-aosp

* commit '058e385b8bca0376c27a24a54f3b00777ef30e0a':
  doc change: fix link in guidelines index.
 2010-03-31 16:17:36 -07:00
Jeff Brown
7190711d0f 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
d98e68ef4a 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
48bec69042 Merge "Fix alarms with negative or very large wakup times." into froyo 2010-03-31 15:56:30 -07:00
Dirk Dougherty
e025276efa 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
001da71727 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
546b1e065f 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
ebec5d195f 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
The Android Open Source Project
ad19edbdcd 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
45ef27a260 merge from open-source master 
Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
 2010-03-31 14:01:45 -07:00
Jean-Michel Trivi
f4d7fb4bbe 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
ff46e2eed3 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
e4cdfce1be 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
Andreas Huber
72439952fb 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
dee5c122f5 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
54de5d19bc 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
9ef810bce8 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
Dianne Hackborn
4b0a8055b8 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
Fred Quintana
b0cf8e24c2 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
a9536b912b 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
49e3f3ebcd 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
30bc0f57cb Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo 2010-03-31 11:01:41 -07:00
Patrick Scott
46c2394a89 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
Eric Olsen
76fe6c5c90 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
2ea66597ef 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
c8e4213d9c Merge "Add thermal shutdown. If battery temp >= 68C." into froyo 2010-03-31 10:04:24 -07:00
Andreas Huber
674fd6f5a1 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
Andreas Huber
659623dd11 am 5c1e96bb: Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo 
Merge commit '5c1e96bbc7f71fc3512706af878599fdfbdb7690' into froyo-plus-aosp

* commit '5c1e96bbc7f71fc3512706af878599fdfbdb7690':
  Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
 2010-03-31 09:51:33 -07:00
Andreas Huber
fffdeb00ae Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo 2010-03-31 09:48:22 -07:00
Robert Greenwalt
e45f2c5445 am 676f7052: am 0a08b194: Merge "Fix HttpProxy." into froyo 
Merge commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2' into kraken

* commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2':
  Fix HttpProxy.
 2010-03-31 08:37:45 -07:00
Robert Greenwalt
178ff3da72 am 0a08b194: Merge "Fix HttpProxy." into froyo 
Merge commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d' into froyo-plus-aosp

* commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d':
  Fix HttpProxy.
 2010-03-31 08:35:16 -07:00
Robert Greenwalt
8aaf5a5113 Merge "Fix HttpProxy." into froyo 2010-03-31 08:32:03 -07:00