ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
14,491 Commits 2 Branches 0 Tags 54 MiB
523a8089b1
Commit Graph

14491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
15d3fb1e18 am cab133a7: am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 
Merge commit 'cab133a7fa39969f136e3f401f97f6ce843514bb' into kraken

* commit 'cab133a7fa39969f136e3f401f97f6ce843514bb':
  NetworkManagementService: Add interface counters & throttle API
 2010-04-01 10:27:04 -07:00
Robert Greenwalt
87f083fc8d am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 
Merge commit '33eb7767fb49482643df80c8b5567da83aa0e49f' into froyo-plus-aosp

* commit '33eb7767fb49482643df80c8b5567da83aa0e49f':
  NetworkManagementService: Add interface counters & throttle API
 2010-04-01 10:22:51 -07:00
Robert Greenwalt
e146999bc8 Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 2010-04-01 10:19:57 -07:00
Kristian Monsen
5969285a3c am 4ba57a4e: am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo 
Merge commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken

* commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578':
  Fix for bug 2558156: Encodig is null
 2010-04-01 10:00:08 -07:00
Kristian Monsen
08326ed4e4 am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo 
Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp

* commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
  Fix for bug 2558156: Encodig is null
 2010-04-01 09:57:12 -07:00
Kristian Monsen
97ad6b7683 Merge "Fix for bug 2558156: Encodig is null" into froyo 2010-04-01 09:54:47 -07:00
Dave Sparks
f96f63d9ce am 5100df84: am 49e5a4c5: Update AMR codec. 
Merge commit '5100df844c209b93b912917fad3e402e00241210' into kraken

* commit '5100df844c209b93b912917fad3e402e00241210':
  Update AMR codec.
 2010-04-01 09:51:42 -07:00
Dave Sparks
ca08c653bb am 49e5a4c5: Update AMR codec. 
Merge commit '49e5a4c5be2e8ba114efff8d0634a34867cb2c26' into froyo-plus-aosp

* commit '49e5a4c5be2e8ba114efff8d0634a34867cb2c26':
  Update AMR codec.
 2010-04-01 09:47:58 -07:00
Ben Murdoch
09c5ec7796 am bf691348: am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo 
Merge commit 'bf6913481eff68a69d1e6ba312227e2fcea29793' into kraken

* commit 'bf6913481eff68a69d1e6ba312227e2fcea29793':
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:47:58 -07:00
Ben Murdoch
9859ba197a am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo 
Merge commit '352cf1a45e26803a466d096ca2d679ea5a3ac249' into froyo-plus-aosp

* commit '352cf1a45e26803a466d096ca2d679ea5a3ac249':
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:44:58 -07:00
Ben Murdoch
057779af45 Merge changes Ic9531e3c,I3f04433b into froyo 
* changes:
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:42:14 -07:00
Grace Kloba
798304e752 am fe72c533: am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 
Merge commit 'fe72c533fe210e147111e0a862360032365dd987' into kraken

* commit 'fe72c533fe210e147111e0a862360032365dd987':
  As we don't support over scroll any more, we need
 2010-04-01 08:20:48 -07:00
Grace Kloba
9129fe7980 am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 
Merge commit '461cef5d209fd072c82f6a70eb106e4690b7ef97' into froyo-plus-aosp

* commit '461cef5d209fd072c82f6a70eb106e4690b7ef97':
  As we don't support over scroll any more, we need
 2010-04-01 08:17:35 -07:00
Grace Kloba
b346d80e8c Merge "As we don't support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 2010-04-01 08:15:09 -07:00
Eric Laurent
3902aadefc am 110c432e: am 3fe1708d: Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo 
Merge commit '110c432e6c90c604d955b795f91fe08c35f49e60' into kraken

* commit '110c432e6c90c604d955b795f91fe08c35f49e60':
  Fix isssue 2548710: Native AudioTrack resources never freed.
 2010-03-31 23:39:41 -07:00
Eric Laurent
c3f48fd34b am 3fe1708d: Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo 
Merge commit '3fe1708d9d204fa63e8abe6e434378d89e963752' into froyo-plus-aosp

* commit '3fe1708d9d204fa63e8abe6e434378d89e963752':
  Fix isssue 2548710: Native AudioTrack resources never freed.
 2010-03-31 23:37:02 -07:00
Eric Laurent
09806e4578 Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo 2010-03-31 23:33:52 -07:00
Dianne Hackborn
2411741616 am 6ff57ee3: am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo 
Merge commit '6ff57ee310290715c000fd771cd7e18b1537ccbc' into kraken

* commit '6ff57ee310290715c000fd771cd7e18b1537ccbc':
  Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
 2010-03-31 23:23:20 -07:00
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
22de8e037c am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo 
Merge commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982' into froyo-plus-aosp

* commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982':
  Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
 2010-03-31 23:18:32 -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
ca85c03c8f Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo 2010-03-31 23:04:22 -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