1608 Commits

Author SHA1 Message Date
Ken Shirriff
630432e424 am d44c2f2c: am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2
Merge commit 'd44c2f2c85c8720763837b89a8988b6e5cc248bf'

* commit 'd44c2f2c85c8720763837b89a8988b6e5cc248bf':
  Migration to TrafficStats.
2009-12-10 07:06:25 -08:00
Dianne Hackborn
314664d247 am 68a3b8b6: am 24eca800: Merge change I887f355f into eclair-mr2
Merge commit '68a3b8b66044d0a9fa901ad306fc6db6d13f94d3'

* commit '68a3b8b66044d0a9fa901ad306fc6db6d13f94d3':
  Propagate background scheduling class across processes.
2009-12-10 07:05:18 -08:00
Ken Shirriff
d44c2f2c85 am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2
Merge commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb' into eclair-mr2-plus-aosp

* commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb':
  Migration to TrafficStats.
2009-12-09 15:50:28 -08:00
Dianne Hackborn
68a3b8b660 am 24eca800: Merge change I887f355f into eclair-mr2
Merge commit '24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1' into eclair-mr2-plus-aosp

* commit '24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1':
  Propagate background scheduling class across processes.
2009-12-09 15:49:02 -08:00
Jaikumar Ganesh
7b94457311 am 1fbc280d: am 47cc8112: am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '1fbc280dac0ce5089ff1491612944344af8d72b4'

* commit '1fbc280dac0ce5089ff1491612944344af8d72b4':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-08 14:50:15 -08:00
Robert Greenwalt
a1b04c01ca resolved conflicts for merge of 47a2573e to master 2009-12-08 13:30:56 -08:00
Android (Google) Code Review
1270e2e22b Merge change I96ddd6e2 into eclair-mr2
* changes:
  Migration to TrafficStats.
2009-12-08 12:41:51 -08:00
Ken Shirriff
1719a39a4c Migration to TrafficStats.
TrafficStats is the SDK version of NetStat.
2009-12-08 11:14:03 -08:00
Dianne Hackborn
887f355f99 Propagate background scheduling class across processes.
This is a very simply implementation: upon receiving an IPC, if the handling
thread is at a background priority (the driver will have taken care of
propagating this from the calling thread), then stick it in to the background
scheduling group.  Plus an API to turn this off for the process, which is
used by the system process.

This also pulls some of the code for managing scheduling classes out of
the Process JNI wrappers and in to some convenience methods in thread.h.
2009-12-07 19:11:14 -08:00
Jaikumar Ganesh
1fbc280dac am 47cc8112: am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '47cc8112c3f77637ef408ef18e48d146e8250a27' into eclair-mr2-plus-aosp

* commit '47cc8112c3f77637ef408ef18e48d146e8250a27':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:36:19 -08:00
Jaikumar Ganesh
47cc8112c3 am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-mr2

* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:31:43 -08:00
Android (Google) Code Review
9d3cb9bfc6 Merge change I204e4787 into eclair
* changes:
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:27:02 -08:00
Jaikumar Ganesh
084c665421 Fix updating Bluetooth icon on status bar and for Wifi.
Status bar uses the SINK_STATE_CHANGE intent to determine the icon.
This intent also has the device. Thus, we can get this intent for any
device and we update the icon wrongly. The same problem is with Wifi.

This was not commonly observed till now, but with the car dock changes
its easy to reproduce as we can get an incoming connection from the
car's bluetooth system. For Wifi, this will cause coexistance issues
especially with desk docks.

Dr No: Eastham
Bug: 2133530
2009-12-07 15:16:22 -08:00
Robert Greenwalt
47a2573e54 am 096871e7: am 90d1b745: Merge change I53e91db7 into eclair
Merge commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4' into eclair-mr2-plus-aosp

* commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4':
  Filter out minor Connectivity Notifications.
2009-12-07 15:13:51 -08:00
Robert Greenwalt
096871e7e1 am 90d1b745: Merge change I53e91db7 into eclair
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-mr2

* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
  Filter out minor Connectivity Notifications.
2009-12-07 15:09:46 -08:00
Doug Zongker
97d7f79aef am 0f91f870: am f6683bb5: Merge change I5f1d2d24 into eclair-mr2
Merge commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61'

* commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61':
  move event log tags used by ActivityManager into this package
2009-12-07 14:56:30 -08:00
Suchi Amalapurapu
d8ec3d87db am 32c66ee4: am ccbf4c28: am ae952b3b: Merge change Ibe1c422a into eclair
Merge commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2'

* commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2':
  If the usage stats file doesn't exist in the first place there is no need to
2009-12-07 14:54:22 -08:00
Robert Greenwalt
511288a046 Filter out minor Connectivity Notifications.
Don't send a connectivity change notification if the change is in detailed state only.
IE, Disconnect/Idle -> Disconnect/Scanning should not trigger a connection change
notification.

bug: 2265222
2009-12-07 14:20:08 -08:00
Doug Zongker
18803d37e2 resolved conflicts for merge of 5a2fdbba to master 2009-12-07 14:12:02 -08:00
Doug Zongker
0f91f87002 am f6683bb5: Merge change I5f1d2d24 into eclair-mr2
Merge commit 'f6683bb5592825a62e30760abb0734deaaf7bd93' into eclair-mr2-plus-aosp

* commit 'f6683bb5592825a62e30760abb0734deaaf7bd93':
  move event log tags used by ActivityManager into this package
2009-12-04 16:50:50 -08:00
Android (Google) Code Review
f6683bb559 Merge change I5f1d2d24 into eclair-mr2
* changes:
  move event log tags used by ActivityManager into this package
2009-12-04 16:46:28 -08:00
Doug Zongker
2bec3d4498 move event log tags used by ActivityManager into this package
We can now locate event log tag definitions in individual packages
(and java constants for the tag numbers get auto-generated), so move
all the tags used by the system server into the package.
2009-12-04 16:36:17 -08:00
Suchi Amalapurapu
32c66ee497 am ccbf4c28: am ae952b3b: Merge change Ibe1c422a into eclair
Merge commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d' into eclair-mr2-plus-aosp

* commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d':
  If the usage stats file doesn't exist in the first place there is no need to
2009-12-04 15:04:35 -08:00
Suchi Amalapurapu
ccbf4c282f am ae952b3b: Merge change Ibe1c422a into eclair
Merge commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-mr2

* commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
  If the usage stats file doesn't exist in the first place there is no need to
2009-12-04 15:01:49 -08:00
Suchi Amalapurapu
be1c422a73 If the usage stats file doesn't exist in the first place there is no need to
backup and short return.
2009-12-04 13:59:38 -08:00
Doug Zongker
5a2fdbba3d am 48476b0a: Merge change Iab5c49c7 into eclair-mr2
Merge commit '48476b0ade7594a64612db2b867792737193b2ec' into eclair-mr2-plus-aosp

* commit '48476b0ade7594a64612db2b867792737193b2ec':
  move event log tags used by system server into this package
2009-12-04 12:02:09 -08:00
Doug Zongker
ab5c49c7e7 move event log tags used by system server into this package
We can now locate event log tag definitions in individual packages
(and java constants for the tag numbers get auto-generated), so move
all the tags used by the system server into the package.
2009-12-04 10:31:43 -08:00
Jaikumar Ganesh
ab4a32d8d8 am 0b18c94f: am 11a2853e: am 8c411fb1: Merge change I79420b02 into eclair
Merge commit '0b18c94f765d8e98be3da037ce9757f099b541b2'

* commit '0b18c94f765d8e98be3da037ce9757f099b541b2':
  Add support for Car Dock.
2009-12-04 04:26:46 -08:00
Mike Lockwood
626c77e021 am 20e7c267: am 44000eb2: am 678c2e35: Merge change I9ef88863 into eclair
Merge commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997'

* commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997':
  Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
2009-12-04 04:26:04 -08:00
Jaikumar Ganesh
0b18c94f76 am 11a2853e: am 8c411fb1: Merge change I79420b02 into eclair
Merge commit '11a2853e0196905e25a2dc5c227320688e04e950' into eclair-mr2-plus-aosp

* commit '11a2853e0196905e25a2dc5c227320688e04e950':
  Add support for Car Dock.
2009-12-03 16:36:29 -08:00
Mike Lockwood
20e7c267c8 am 44000eb2: am 678c2e35: Merge change I9ef88863 into eclair
Merge commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc' into eclair-mr2-plus-aosp

* commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc':
  Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
2009-12-03 16:33:14 -08:00
Jaikumar Ganesh
11a2853e01 am 8c411fb1: Merge change I79420b02 into eclair
Merge commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338' into eclair-mr2

* commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338':
  Add support for Car Dock.
2009-12-03 12:01:38 -08:00
Android (Google) Code Review
8c411fb139 Merge change I79420b02 into eclair
* changes:
  Add support for Car Dock.
2009-12-03 11:49:38 -08:00
Jaikumar Ganesh
3fbf7b62bb Add support for Car Dock.
Dr No: Eastham
Bug: 2133530
2009-12-03 11:35:37 -08:00
Mike Lockwood
44000eb2a2 am 678c2e35: Merge change I9ef88863 into eclair
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2

* commit '678c2e35768a5426b4ad8f67c836008e7751a353':
  Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
2009-12-03 11:18:48 -08:00
Joe Onorato
06253f58fb am a6c4556d: am a8974b63: am 19a4157c: Make the notification panel send the position as well.
Merge commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda'

* commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda':
  Make the notification panel send the position as well.
2009-12-03 10:54:04 -08:00
Mike Lockwood
435eb6464c Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Part of a fix for bug b/2300622 (Proximity sensor always blows up the lock screen while in call)

Change-Id: I9ef888638b19540a78a34507d52ff522f505102f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-03 08:56:53 -05:00
Joe Onorato
a6c4556dea am a8974b63: am 19a4157c: Make the notification panel send the position as well.
Merge commit 'a8974b637c384d10bac10d94fae7487afdb2c16d' into eclair-mr2-plus-aosp

* commit 'a8974b637c384d10bac10d94fae7487afdb2c16d':
  Make the notification panel send the position as well.
2009-12-02 23:39:16 -08:00
Joe Onorato
a8974b637c am 19a4157c: Make the notification panel send the position as well.
Merge commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-mr2

* commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a':
  Make the notification panel send the position as well.
2009-12-02 23:33:56 -08:00
Joe Onorato
19a4157ce4 Make the notification panel send the position as well. 2009-12-02 23:26:27 -08:00
Dianne Hackborn
f623fbc45d am 1dde14bc: am a45e9251: am dcd58cfd: Merge change I7b9328c7 into eclair
Merge commit '1dde14bc84e39b81df7108a2d64a7918a97b20df'

* commit '1dde14bc84e39b81df7108a2d64a7918a97b20df':
  Fix issue #2300232: Bugs in resolving conflicting pointers
2009-12-02 20:49:44 -08:00
Mike Lockwood
af942bf8b3 am cd753d16: am f72fb68b: resolved conflicts for merge of 9b7dba93 to eclair-mr2
Merge commit 'cd753d168f9d62b6e852c5ab0f61436619085e6f'

* commit 'cd753d168f9d62b6e852c5ab0f61436619085e6f':
  Implement new notification LED blinking logic:
2009-12-02 20:45:24 -08:00
Dianne Hackborn
8a1b6decfb am e2585127: am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair
Merge commit 'e2585127974ce972a013407e2af95d8776a99a8e'

* commit 'e2585127974ce972a013407e2af95d8776a99a8e':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-02 20:24:44 -08:00
Dianne Hackborn
1dde14bc84 am a45e9251: am dcd58cfd: Merge change I7b9328c7 into eclair
Merge commit 'a45e925108f6c9d35d9e7b5e8def9aba49ee0dba' into eclair-mr2-plus-aosp

* commit 'a45e925108f6c9d35d9e7b5e8def9aba49ee0dba':
  Fix issue #2300232: Bugs in resolving conflicting pointers
2009-12-02 19:01:31 -08:00
Dianne Hackborn
a45e925108 am dcd58cfd: Merge change I7b9328c7 into eclair
Merge commit 'dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-mr2

* commit 'dcd58cfda366c915b1f0739cb115f9d972351c73':
  Fix issue #2300232: Bugs in resolving conflicting pointers
2009-12-02 18:56:20 -08:00
Dianne Hackborn
709d6db48d Fix issue #2300232: Bugs in resolving conflicting pointers
Change-Id: I7b9328c7a1c4f6b731e64cdca2ed9de71b84587f
2009-12-02 18:42:39 -08:00
Mike Lockwood
cd753d168f am f72fb68b: resolved conflicts for merge of 9b7dba93 to eclair-mr2
Merge commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9' into eclair-mr2-plus-aosp

* commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9':
  Implement new notification LED blinking logic:
2009-12-02 17:51:09 -08:00
Mike Lockwood
f72fb68bf3 resolved conflicts for merge of 9b7dba93 to eclair-mr2
Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59
2009-12-02 19:57:33 -05:00
Mike Lockwood
c22404a4e7 Implement new notification LED blinking logic:
1) Do not pulse notification LED when screen is on.
2) Pulse once on new notification if Settings.System.NOTIFICATION_LIGHT_PULSE is false,
   otherwise pulse persistently while screen is off.

Fixes part of bug b/2238250 (trackball should pulse occasionally to indicate new email)

Change-Id: Icc49422a4e9d14412fc159a8e2596503a85bac51
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-02 14:30:13 -05:00
Dianne Hackborn
e258512797 am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair
Merge commit '9ed7dc10d263a505da32522139098f085fee811a' into eclair-mr2-plus-aosp

* commit '9ed7dc10d263a505da32522139098f085fee811a':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-02 05:35:46 -08:00