1613 Commits

Author SHA1 Message Date
Tom Taylor
ad2fa35d88 am d4a4729c: Update imports to android-common
Merge commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0' into eclair-mr2-plus-aosp

* commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0':
  Update imports to android-common
2009-12-21 15:44:34 -08:00
Tom Taylor
d4a4729c0c Update imports to android-common
Several files were moved to android-common. Update all the references
to import those files from the new location.
2009-12-21 13:59:18 -08:00
Robert Greenwalt
24317443fd am 421c72b6: Cleanup of process-specific DNS.
Merge commit '421c72b6773582dd1473ace44c42d4e0ee1287e3' into eclair-mr2-plus-aosp

* commit '421c72b6773582dd1473ace44c42d4e0ee1287e3':
  Cleanup of process-specific DNS.
2009-12-18 14:33:55 -08:00
Robert Greenwalt
421c72b677 Cleanup of process-specific DNS.
Removes entries sooner.  A bug.
Doesn't add one for phone process at all.  This was intended to be removed long ago.

bug: 2329900
2009-12-18 11:57:52 -08:00
Dianne Hackborn
83652ebfe1 am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2
Merge commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e' into eclair-mr2-plus-aosp

* commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e':
  Implement API to have new broadcasts replace existing broadcasts.
2009-12-14 16:10:13 -08:00
Eric Laurent
2cb1fe2f40 am 59e03a0a: am da4cc343: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit '59e03a0a4d62f214cf5cfab49f16223f89670f2a' into eclair-mr2-plus-aosp

* commit '59e03a0a4d62f214cf5cfab49f16223f89670f2a':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 15:26:41 -08:00
Dianne Hackborn
1c633fc89b Implement API to have new broadcasts replace existing broadcasts.
Use this in various places where it should serve no purpose to deliver
both broadcasts.  This is intended to reduce somewhat the flurry of
broadcasts that we churn through during boot.
2009-12-14 15:03:35 -08:00
Eric Laurent
59e03a0a4d am da4cc343: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit 'da4cc34308d65730c404b669926a92e37b378555' into eclair-mr2

* commit 'da4cc34308d65730c404b669926a92e37b378555':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 11:57:24 -08:00
Eric Laurent
da4cc34308 Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
The problem is due to spurious headset connection indications received from event observer when a 3.5mm headset w/o mic is connected.
In this particular case, The HeadsetObserver first received a valid indication of headset with mic connection, followed by a headset with mic disconnection and finally a headset w/o mic connection.
The HeadsetObserver delays the headset disconnection intent to leave time to music app to pause music before the output path is switched.
As the last headset w/o mic connection indication is received from the event observer before the intent corresponding to the spurious headset with mic disconnection is broadcast, the later is discarded. Results a state where the headset with mic is always considered as connected.

The fix consists in not canceling pending intents when a new headset state is received and carrying the HeadsetObserver state with the delayed message triggering the broacast of the disconnection intent.
2009-12-14 03:45:41 -08:00
Dianne Hackborn
6a6f43f577 am 8091424e: am 9b52a218: Fix Sometimes camera preview screen is truncated
Merge commit '8091424ea332f754e6f1c712a9e28bfa7d02741e' into eclair-mr2-plus-aosp

* commit '8091424ea332f754e6f1c712a9e28bfa7d02741e':
  Fix  Sometimes camera preview screen is truncated
2009-12-13 12:34:18 -08:00
Dianne Hackborn
c1e6b91d75 am c9ca93fb: am 474731d5: Merge change I2ffe306f into eclair
Merge commit 'c9ca93fbf9ff49ca4b74c4ec72d3f7580b3b7659' into eclair-mr2-plus-aosp

* commit 'c9ca93fbf9ff49ca4b74c4ec72d3f7580b3b7659':
  Fix issue : contacts/dialer/recentcalls constantly flashing
2009-12-13 12:34:09 -08:00
Dianne Hackborn
8091424ea3 am 9b52a218: Fix Sometimes camera preview screen is truncated
Merge commit '9b52a2184e99565bcd7f77effb321c95a2a4837e' into eclair-mr2

* commit '9b52a2184e99565bcd7f77effb321c95a2a4837e':
  Fix  Sometimes camera preview screen is truncated
2009-12-13 12:25:10 -08:00
Dianne Hackborn
c9ca93fbf9 am 474731d5: Merge change I2ffe306f into eclair
Merge commit '474731d5efb30c1e9184f998610054747eb8e764' into eclair-mr2

* commit '474731d5efb30c1e9184f998610054747eb8e764':
  Fix issue : contacts/dialer/recentcalls constantly flashing
2009-12-13 12:25:00 -08:00
Dianne Hackborn
9b52a2184e Fix Sometimes camera preview screen is truncated
There were a few places in the window manager where we wouldn't cause
a layout after making a window visible.  This would leave it using
whatever size and position it last have since we don't layout windows
when they are not visible.

Also includes a little part I missed in the security issue that
allowed wallpapers to see input on the lock screen.

Change-Id: Icd7e037ad9a67ac936bc7039d87ed68f49502d73
2009-12-11 18:35:07 -08:00
Android (Google) Code Review
474731d5ef Merge change I2ffe306f into eclair
* changes:
  Fix issue : contacts/dialer/recentcalls constantly flashing
2009-12-11 18:25:21 -08:00
Dianne Hackborn
871ecdce67 Fix issue : contacts/dialer/recentcalls constantly flashing
Make sure the application is always given the most recent configuration
when launcher.  Use the current configuration, instead of whatever happens
to be set by the app, for reporting what it was launched with.

Change-Id: I2ffe306f56cc9092b640546dd0a28d2c29b9c0b3
2009-12-11 15:24:33 -08:00
Dan Egnor
f6bb01b0d8 am b7f0367c: Eliminate CrashData and friends.
Merge commit 'b7f0367cec1c744aa66ef397b0244e25d507491c' into eclair-mr2-plus-aosp

* commit 'b7f0367cec1c744aa66ef397b0244e25d507491c':
  Eliminate CrashData and friends.
2009-12-11 14:32:40 -08:00
Dan Egnor
b7f0367cec Eliminate CrashData and friends.
(CrashData was a custom-marshalled crash-info class used for a server crash
reporting system I am deprecating).  Use ApplicationErrorReport.CrashInfo
instead to report crash details (mostly the stack trace) from RuntimeInfo to
ActivityManagerService, since we're likely to need the crash information in
that form anyway.

Remove the (long-disabled) flags and support for the "Debug" button
in the crash dialog.

Further gut the ICheckinService interface by removing the crash-reporting
APIs (and everything that calls them), plus the synchronous checkin()
method (which has been stubbed out for a while now).

A new dropbox-based crash reporting system is in the works, but not part
of this change.
2009-12-11 13:27:04 -08:00
Christopher Tate
09f82ec61c am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2
Merge commit 'af1255dab8fa3eab1caf9bae799f80de14a74470' into eclair-mr2-plus-aosp

* commit 'af1255dab8fa3eab1caf9bae799f80de14a74470':
  Fix : Device hang then runtime restart
2009-12-11 13:20:15 -08:00
Christopher Tate
af1255dab8 resolved conflicts for merge of 2624fbca to eclair-mr2 2009-12-11 13:16:41 -08:00
Christopher Tate
2624fbcaaa Fix : Device hang then runtime restart
The system_server process is deadlocking between event dispatch and window
manager code.  This change fixes the lock scoping to eliminate the deadlock.

Change-Id: I00f029e4d51d7432119ad3aeec260df215b52546
2009-12-11 12:49:33 -08:00
Dianne Hackborn
436b93b5f5 am 221fa910: am d3cfb1bd: Merge change Ia48b3f2a into eclair
Merge commit '221fa910301606f8374d97e538af11c3416a76a2' into eclair-mr2-plus-aosp

* commit '221fa910301606f8374d97e538af11c3416a76a2':
  Fix : Device doesn't boot after rebooting device...
2009-12-10 18:08:01 -08:00
Dianne Hackborn
221fa91030 am d3cfb1bd: Merge change Ia48b3f2a into eclair
Merge commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37' into eclair-mr2

* commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37':
  Fix : Device doesn't boot after rebooting device...
2009-12-10 17:56:39 -08:00
Dianne Hackborn
f3bea9cb75 Fix : Device doesn't boot after rebooting device...
...in setup wizard ->Wifi setup screen.

We were stopped waiting for the wallpaper to draw, which it would never do
because it had been obscured and thus hidden.

Change-Id: Ia48b3f2a46ca970f143cbaee99f5f2a054378986
2009-12-09 18:26:21 -08:00
Dianne Hackborn
0f62abd986 am 4c8454d8: am e851cdc6: Merge change Ifd95b9f5 into eclair
Merge commit '4c8454d8699cbedf473565bb92a80defaf95af09' into eclair-mr2-plus-aosp

* commit '4c8454d8699cbedf473565bb92a80defaf95af09':
  Fix : SECURITY: Live wallpapers get touch events through the lock screen.
2009-12-09 15:57:27 -08:00
Dianne Hackborn
eb68a22656 am af9788a9: Merge change Ia53c6725 into eclair-mr2
Merge commit 'af9788a9d6c238dd97f40dc020e036739daf0811' into eclair-mr2-plus-aosp

* commit 'af9788a9d6c238dd97f40dc020e036739daf0811':
  Add bindService API to not bring ot foreground.
2009-12-09 15:55:28 -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
Dianne Hackborn
4c8454d869 am e851cdc6: Merge change Ifd95b9f5 into eclair
Merge commit 'e851cdc6c48c977d05096847001a0601d892fd55' into eclair-mr2

* commit 'e851cdc6c48c977d05096847001a0601d892fd55':
  Fix : SECURITY: Live wallpapers get touch events through the lock screen.
2009-12-08 18:44:03 -08:00
Dianne Hackborn
09c916bccb Add bindService API to not bring ot foreground.
Add a new flag for bindService that tells the system to not bring the
target service's process in to the foreground scheduling class.  This is
used by the sync system to not cause the current sync adapter to come to
the foreground as it is running.

Also some small improvements to the debug output of the process list
of oom adj and scheduling info.
2009-12-08 16:33:59 -08:00
Dianne Hackborn
00c1fc97c1 Fix : SECURITY: Live wallpapers get touch events through the lock screen.
This is a quick and dirty hack to not deliver touch events to the wallpaper when
they are being sent to the keyguard.  Perhaps we should have a separate window
flag for this, but...  bleah.  Maybe later.  Or maybe I'll use that secure flag.
Or something.

Change-Id: Ifd95b9f5b10db24a0854a93b925a833b24331b4c
2009-12-08 15:51:43 -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
9ae9763b7e Merge change Ib097fbbf into eclair
* changes:
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:27:19 -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
Robert Greenwalt
b097fbbff3 DO NOT MERGE Reverting change I53e91db7.
Accidentally submitted into eclair instead of eclair-mr2.
I apparently rebased my mr2 working dir to eclair by mistake.

Do not merge this so the desired change will survive on mr2 as intended.

bug: 2265222
2009-12-07 15:20:50 -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
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
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