2703 Commits

Author SHA1 Message Date
Robert Greenwalt
bf7de39727 Trim throttle logs.
Removing unwanted sntp logging and throttle logging.

bug:2614927
Change-Id: Ic0b1c3502ebbc1f04130d09d715591af6513f439
2010-04-22 09:04:27 -07:00
Christopher Tate
1d6ff5a1f7 am 7e93aad4: am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo
Merge commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411' into kraken

* commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411':
  Fix security hole in Google backup transport registration
2010-04-21 18:19:38 -07:00
Christopher Tate
7e93aad42d am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo
Merge commit '36fa47139d4621dc4bf8d89caa8650495d901b00' into froyo-plus-aosp

* commit '36fa47139d4621dc4bf8d89caa8650495d901b00':
  Fix security hole in Google backup transport registration
2010-04-21 18:15:44 -07:00
Christopher Tate
36fa47139d Merge "Fix security hole in Google backup transport registration" into froyo 2010-04-21 18:10:20 -07:00
Christopher Tate
a32504fce8 Fix security hole in Google backup transport registration
Previously, it was conceivable that a 3rd party application on a non-GED
device could publish a service that supported the (hidden) IBackupTransport
interface and spoofed the Google backup transport's package and component
name.  This could allow it to secretly intercept all data moved through the
backup mechanism.

Fix by ensuring that the package in question exists and is part of the
OS itself (FLAG_SYSTEM in its ApplicationInfo description) before binding
to it.

Fixes bug #2457063

Change-Id: I3487572be45c2014fa209beacfe3ac6f8270f872
2010-04-21 18:02:56 -07:00
Jeff Brown
bba573c211 am ccc96754: am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Merge commit 'ccc96754c5c6e31d6f782c3adeb06ad1694221d8' into kraken

* commit 'ccc96754c5c6e31d6f782c3adeb06ad1694221d8':
  Fix PM crash due to bad array bookkeeping logic.
2010-04-20 17:57:29 -07:00
Jeff Brown
ccc96754c5 am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Merge commit '22caecda8a24c971972d78a112279c48f242d529' into froyo-plus-aosp

* commit '22caecda8a24c971972d78a112279c48f242d529':
  Fix PM crash due to bad array bookkeeping logic.
2010-04-20 17:54:59 -07:00
Jeff Brown
22caecda8a Merge "Fix PM crash due to bad array bookkeeping logic." into froyo 2010-04-20 17:53:00 -07:00
Robert Greenwalt
54f5ecc6d1 am 9127d9a5: am be348964: Merge "Move Tethering off the ServerThread." into froyo
Merge commit '9127d9a5fd95d7454a10d44acb79079720f6bb91' into kraken

* commit '9127d9a5fd95d7454a10d44acb79079720f6bb91':
  Move Tethering off the ServerThread.
2010-04-20 17:42:08 -07:00
Robert Greenwalt
9127d9a5fd am be348964: Merge "Move Tethering off the ServerThread." into froyo
Merge commit 'be34896457bb37b4e263efa87316d2e2420adab3' into froyo-plus-aosp

* commit 'be34896457bb37b4e263efa87316d2e2420adab3':
  Move Tethering off the ServerThread.
2010-04-20 17:39:38 -07:00
Robert Greenwalt
be34896457 Merge "Move Tethering off the ServerThread." into froyo 2010-04-20 17:37:22 -07:00
Jeff Brown
8c8bb8b3c4 Fix PM crash due to bad array bookkeeping logic.
Bug: 2586093
Change-Id: I320deeef65a434060e608015dc2dd97b8200e025
2010-04-20 17:21:47 -07:00
Robert Greenwalt
7eae25021d Move Tethering off the ServerThread.
An ANR has been reported because somebody else was hogging the Netd
link.  We can't pause the server thread for that, so make a new thread.

bug:2609904
Change-Id: I0430a08621da1cda0a0010ce15826cceee59a529
2010-04-20 15:51:20 -07:00
Daniel Sandler
29019cb977 am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
Merge commit 'c96307efd2829cdd0fa7c835484f2f89edf7d883' into froyo-plus-aosp

* commit 'c96307efd2829cdd0fa7c835484f2f89edf7d883':
  Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
2010-04-20 13:01:58 -07:00
Daniel Sandler
c96307efd2 Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo 2010-04-20 12:57:54 -07:00
Robert Greenwalt
3d27a2e6a1 am 2f8c9e68: am f06f2eb2: Merge "Misc fixes for throttling." into froyo
Merge commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e' into kraken

* commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e':
  Misc fixes for throttling.
2010-04-19 13:31:24 -07:00
Robert Greenwalt
2f8c9e6825 am f06f2eb2: Merge "Misc fixes for throttling." into froyo
Merge commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768' into froyo-plus-aosp

* commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768':
  Misc fixes for throttling.
2010-04-19 13:25:46 -07:00
Robert Greenwalt
f06f2eb2d6 Merge "Misc fixes for throttling." into froyo 2010-04-19 13:21:01 -07:00
Robert Greenwalt
05d0673bfc Misc fixes for throttling.
Cleanup of duplicate code
Caching Ntp data so we don't hit the network as often
Clearing out of MRU data when we switch to a new sim
Sending notification after we reset byte counts

bug:2605277
bug:2605272
bug:2597530
bug:2576057
Change-Id: I3df526bae6374f6ae56fed67b0defad2b4fabefd
2010-04-19 12:29:29 -07:00
Brad Fitzpatrick
eb82845977 am bb9739c5: am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Merge commit 'bb9739c5d74404b9155565f2a08509079b719a22' into kraken

* commit 'bb9739c5d74404b9155565f2a08509079b719a22':
  Reduce lock contention, removing unnecessary synchronization.
2010-04-19 12:23:58 -07:00
Brad Fitzpatrick
bb9739c5d7 am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Merge commit '11bea2e216800c5612144f76d307da653d565be3' into froyo-plus-aosp

* commit '11bea2e216800c5612144f76d307da653d565be3':
  Reduce lock contention, removing unnecessary synchronization.
2010-04-19 12:22:07 -07:00
Brad Fitzpatrick
b213d103d3 Reduce lock contention, removing unnecessary synchronization.
The value returned is purely a function of what's passed in, all
following final members.

BUG=2606839

Change-Id: I506fb9b1f3be965576c2b3317a30ff1f990ccda3
2010-04-19 11:58:52 -07:00
Brad Fitzpatrick
db5b7d018f am 9a9b09f6: am afbf9f8d: Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo
Merge commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b' into kraken

* commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b':
  Ease contention on the mProcessStatsThread mutex in updateCpuStats.
2010-04-19 11:56:19 -07:00
Brad Fitzpatrick
9a9b09f6bd am afbf9f8d: Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo
Merge commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5' into froyo-plus-aosp

* commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5':
  Ease contention on the mProcessStatsThread mutex in updateCpuStats.
2010-04-19 11:54:05 -07:00
Brad Fitzpatrick
afbf9f8d6d Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo 2010-04-19 11:50:53 -07:00
Daniel Sandler
c210b65cd2 Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
Previously, this status icon reflected just the incoming
call behavior:
 - gone for audible (with or without vibrate),
 - wiggling phone for vibrate,
 - silent (speaker + X) for no audible ring or vibrate.

Now that silent mode has changed (see VIBRATE_IN_SILENT),
you can easily get into a state where this icon is
confusing by setting the incoming call ringer to *never*
vibrate but setting the overall device silent state to allow
vibration (VIBRATE_IN_SILENT=true).  In this case, rocking
the volume all the way down would show a wiggling phone
(because the device is in vibrate-only mode) but the status
bar would show speaker+X (because the incoming call would
neither ring nor vibrate).

Now these two icons are consistent. This means, however,
that if this special condition is set by the user (device
vibrates in silent mode, but incoming calls should never
vibrate) and the device is in silent mode, the status bar
will show a wiggling phone even though incoming calls will
not vibrate the device. This puts the ringer on a more even
footing with other apps on the device, which may elect not
to vibrate even if VIBRATE_IN_SILENT=true overall.

Bug: 2598014
Change-Id: Ib942f68738d77ab0d9b9da4fac718ae5957c133c
2010-04-19 14:36:57 -04:00
Brad Fitzpatrick
01fad4a526 Ease contention on the mProcessStatsThread mutex in updateCpuStats.
BUG=2606839

Change-Id: I444af0bb4a7b0be7ebf9ee5887805f2f09a426d0
2010-04-19 10:47:40 -07:00
Jean-Michel Trivi
98bccfdd4d am 6aa2acca: am 04152f98: Merge "Fix bug 2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it\'s using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player w
Merge commit '6aa2accae3f58e4139f890f51c699901ee3abb88' into kraken

* commit '6aa2accae3f58e4139f890f51c699901ee3abb88':
  Fix bug 2599698 Music paused by itself
2010-04-19 09:48:18 -07:00
Jean-Michel Trivi
6aa2accae3 am 04152f98: Merge "Fix bug 2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it\'s using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player was started bef
Merge commit '04152f98ffbd17f54a6b771636ff7f440f0edc78' into froyo-plus-aosp

* commit '04152f98ffbd17f54a6b771636ff7f440f0edc78':
  Fix bug 2599698 Music paused by itself
2010-04-19 09:45:41 -07:00
Jean-Michel Trivi
04152f98ff Merge "Fix bug 2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it's using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player was started before the listener was set. The theory about the bug is that the player finished playing before the listener was called. Therefore the audio focus was never abandonned, and the music didn't resume." into froyo 2010-04-19 09:41:19 -07:00
Mike Lockwood
ea7c123f98 am daa107c8: am 3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo
Merge commit 'daa107c81db31b7fbaaf4219b0552ff07d44a29e' into kraken

* commit 'daa107c81db31b7fbaaf4219b0552ff07d44a29e':
  Fix inconsistency in how we handle light sensor when battery is low.
2010-04-19 08:26:50 -07:00
Mike Lockwood
daa107c81d am 3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo
Merge commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a' into froyo-plus-aosp

* commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a':
  Fix inconsistency in how we handle light sensor when battery is low.
2010-04-19 08:22:39 -07:00
Mike Lockwood
3110bf6df1 Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo 2010-04-19 08:18:58 -07:00
Robert Greenwalt
8987f110c6 am c2093636: am 7171ea81: Make ThrottleService more tamper resistant.
Merge commit 'c2093636db6141426ca7fe88f07b30a284e36759' into kraken

* commit 'c2093636db6141426ca7fe88f07b30a284e36759':
  Make ThrottleService more tamper resistant.
2010-04-18 12:35:10 -07:00
Robert Greenwalt
c2093636db am 7171ea81: Make ThrottleService more tamper resistant.
Merge commit '7171ea8179e09270e4d6ab825a2320816eee39c5' into froyo-plus-aosp

* commit '7171ea8179e09270e4d6ab825a2320816eee39c5':
  Make ThrottleService more tamper resistant.
2010-04-18 12:27:03 -07:00
Robert Greenwalt
7171ea8179 Make ThrottleService more tamper resistant.
Use elapsed time not wall time for alarms so users can't play with the
system time to get around things.

Also using NTP servers to pull in an authoritative time - if we the build
is configured with an NTP server we will not advance to the next cycle
without it, but we also will not trottle - rather not throttle users
on an error.

Note that the poll alarm is just relative to the last poll time and real
time doesn't matter.

Defining the time-fetching API's as returning time in the system wallclock
range (correcting if we are using NTP time internally).

bug:2597530
Change-Id: I1c0ac0923314c2f8a04edd0b36c4845352eae99a
2010-04-18 10:21:20 -07:00
Mike Lockwood
48358bd5c1 Fix inconsistency in how we handle light sensor when battery is low.
In lightSensorChangedLocked we ignore the light sensor if the battery is low.
But in applyButtonState() and applyKeyboardState() we were still using the previous
mLightSensorScreenBrightness value, which resulted in a race condition that could
leave the button lights on after the screen turns off.
Now we ignore the light sensor value and button brightness override if the battery
is low so the low battery behavior is consistent.

Change-Id: I4943f8904299883211a95596ee207df69d1eaea2
BUG: 2570962

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-17 22:29:20 -04:00
Irfan Sheriff
c2477a924f am 2572b046: am 975d86df: Merge "Dont check on interface value on API" into froyo
Merge commit '2572b046d64a2d0b43d74870e1e899364f2bc721' into kraken

* commit '2572b046d64a2d0b43d74870e1e899364f2bc721':
  Dont check on interface value on API
2010-04-17 09:36:44 -07:00
Irfan Sheriff
2572b046d6 am 975d86df: Merge "Dont check on interface value on API" into froyo
Merge commit '975d86dfc6407314491a18bc715c8c95a8f8f0b1' into froyo-plus-aosp

* commit '975d86dfc6407314491a18bc715c8c95a8f8f0b1':
  Dont check on interface value on API
2010-04-17 09:31:19 -07:00
Irfan Sheriff
cf28236b37 Dont check on interface value on API
The interface check in API could be used
in future.

Bug: 2576057
Change-Id: Icfb78a88be44d1e6a8350c4b65efe70970e658d8
2010-04-16 16:53:20 -07:00
Jean-Michel Trivi
a99f5f43cd Fix bug 2599698 Music paused by itself
The NotificationPlayer sets an OnCompletionListener on the
MediaPlayer it's using to play the notification.
NotificationPlayer relies on the completion event to abandon
audio focus.
 The player was started before the listener was set. The theory
about the bug is that the player finished playing before the listener
was called. Therefore the audio focus was never abandonned, and
the music didn't resume.

Change-Id: Ic3baf359ea24de0d832a655dc47e745b25bc3dec
2010-04-16 16:40:47 -07:00
Mike Lockwood
48b8b4fd46 Merge "GpsLocationProvider: Eliminate MIN_FIX_COUNT." into kraken 2010-04-15 20:26:33 -07:00
Mike Lockwood
ad903e8010 Merge "GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed." into kraken 2010-04-15 20:26:09 -07:00
Robert Greenwalt
9e17d7408b am 32ebaf57: am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo
Merge commit '32ebaf57d8646542b80e848441830a5ef834aed3' into kraken

* commit '32ebaf57d8646542b80e848441830a5ef834aed3':
  Add multi-sim support to ThrottleService.
2010-04-15 17:45:26 -07:00
Robert Greenwalt
32ebaf57d8 am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo
Merge commit 'e80c6f49d5055e299b7ada91b5967feab66e467b' into froyo-plus-aosp

* commit 'e80c6f49d5055e299b7ada91b5967feab66e467b':
  Add multi-sim support to ThrottleService.
2010-04-15 17:42:24 -07:00
Mike Lockwood
d53ba017ee GpsLocationProvider: Eliminate MIN_FIX_COUNT.
Now we stop after one fix rather than waiting for 10 when requesting occasional
fixes to conserve power.

Change-Id: Ic420f2d20780db983fc4db22246e0a486eecc58e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-15 20:41:26 -04:00
Robert Greenwalt
e80c6f49d5 Merge "Add multi-sim support to ThrottleService." into froyo 2010-04-15 17:37:55 -07:00
Robert Greenwalt
e6e9882341 Add multi-sim support to ThrottleService.
Uses the last used data until the SIM is available (if ever).  Supports data from
several SIMs for all the world travelers out there.

bug: 2576057
Change-Id: I70e34a51f1c2ccda41a480652b0233b68ff3f538
2010-04-15 17:23:59 -07:00
Mike Lockwood
1879d284bf GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed.
Change-Id: Iedf3f5ff333db7298de6cd6e86fface1f8421738
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-15 20:05:24 -04:00
David 'Digit' Turner
ee193607a8 am 7a4b22f6: am 4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA.
Merge commit '7a4b22f6293c7dce2dd667b7ebd171af2eff91a9' into kraken

* commit '7a4b22f6293c7dce2dd667b7ebd171af2eff91a9':
  Remove native binaries when an updated system application is upgraded through OTA.
2010-04-15 12:23:59 -07:00