2273 Commits

Author SHA1 Message Date
Eric Olsen
8d72c64404 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
f26cf98ffa 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
6a362a97f7 Add thermal shutdown. If battery temp >= 68C.
Change-Id: I625fa47939d8ecc532457b5c6e13f91d83bfbcc5
2010-03-31 09:33:47 -07:00
Jeff Brown
a749f86974 Fix a previous bad merge.
Change-Id: I12e577873389d6200f8add252867e63dee2d2c3c
2010-03-31 00:43:36 -07:00
Jeff Brown
767225d820 resolved conflicts for merge of d9ee01a9 to kraken
Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d
2010-03-30 23:49:17 -07:00
Jeff Brown
d9ee01a95c am 07330791: Show SD unavailable icon for apps on SD when ejected.
Merge commit '07330791116513710d879c45b2f095cd314cbfd0' into froyo-plus-aosp

* commit '07330791116513710d879c45b2f095cd314cbfd0':
  Show SD unavailable icon for apps on SD when ejected.
2010-03-30 23:32:12 -07:00
Jeff Brown
0733079111 Show SD unavailable icon for apps on SD when ejected.
This change include a minor refactoring of PackageItemInfo and related
classes to eliminate code duplication and to avoid redundant work
searching for an ApplicationInfo instance we already have.

Bug: b/2537578
Change-Id: Id0794c3f055ea58b943028f7a84abc7dec9d0aac
2010-03-30 22:20:42 -07:00
Irfan Sheriff
bdb59f66b9 am 295eb97c: am 59610c04: cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
Merge commit '295eb97c7623105d6199fa91e58394e474a0abb1' into kraken

* commit '295eb97c7623105d6199fa91e58394e474a0abb1':
  cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
2010-03-30 13:55:21 -07:00
Irfan Sheriff
295eb97c76 am 59610c04: cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
Merge commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d' into froyo-plus-aosp

* commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d':
  cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
2010-03-30 13:51:46 -07:00
Dianne Hackborn
b4915265a0 am ab86fc91: am de2722af: Merge "Package manager optimizations." into froyo
Merge commit 'ab86fc91f5b54b8b730c0f594f04bbfb4c41697a' into kraken

* commit 'ab86fc91f5b54b8b730c0f594f04bbfb4c41697a':
  Package manager optimizations.
2010-03-30 13:42:50 -07:00
Dianne Hackborn
ab86fc91f5 am de2722af: Merge "Package manager optimizations." into froyo
Merge commit 'de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8' into froyo-plus-aosp

* commit 'de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8':
  Package manager optimizations.
2010-03-30 13:40:24 -07:00
Irfan Sheriff
59610c041a cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
Setting the allowed channel count in the
driver can take a long time to potentially
cause ANR in the phone process. Make the call
asynchronous

Bug: 2555117
Change-Id: Ie3c2e6f90aa0ec8ee4b85c989ccae1ca0f2b94f9
2010-03-30 13:37:00 -07:00
Dianne Hackborn
d7c096845d Package manager optimizations.
Addresses:
Issue #2550648: PackageManagerService setComponentEnabledSetting unconditionally
writes Settings xml
Issue #2549084: Make PackageManager.addPermission have async version

Also make the writing of settings when changing the preferred activities to use
the same async mechanism, and fiddle with thread priorities in the background
thread to go up to foreground priority when holding the lock to write settings
and a few other places.  (At some point we should really clean this up to never
acquire the main lock while in the background.)

Change-Id: Ib2b7632543f6fb3f92a225518579f3b2d15e1413
2010-03-30 13:34:43 -07:00
Christopher Tate
4caee4f719 am b3f7fe44: am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo
Merge commit 'b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c' into kraken

* commit 'b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c':
  Make RestoreSession.getAvailableRestoreSets() asynchronous
2010-03-30 13:17:23 -07:00
Christopher Tate
b3f7fe44f5 am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo
Merge commit '22375e4a736c0d646c3cf0905c15126f7f4107c2' into froyo-plus-aosp

* commit '22375e4a736c0d646c3cf0905c15126f7f4107c2':
  Make RestoreSession.getAvailableRestoreSets() asynchronous
2010-03-30 13:13:52 -07:00
Christopher Tate
22375e4a73 Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo 2010-03-30 13:09:50 -07:00
Daniel Sandler
2fa4ab04b4 am 454a956b: am a7035909: Remove logspew.
Merge commit '454a956b52884083e3436fe2ea7e478df2bcbeea' into kraken

* commit '454a956b52884083e3436fe2ea7e478df2bcbeea':
  Remove logspew.
2010-03-30 12:56:36 -07:00
Daniel Sandler
454a956b52 am a7035909: Remove logspew.
Merge commit 'a7035909453c9980a5f8547f5090c70c4281156c' into froyo-plus-aosp

* commit 'a7035909453c9980a5f8547f5090c70c4281156c':
  Remove logspew.
2010-03-30 12:53:28 -07:00
Daniel Sandler
a703590945 Remove logspew.
Change-Id: I8b56a9c289dcc87080116e6af27721e24d49c3b0
2010-03-30 15:45:31 -04:00
Christopher Tate
2d449afe3d Make RestoreSession.getAvailableRestoreSets() asynchronous
This transaction can involve the transport having to query a remote backend
over the wire, so it can take a Long Time(tm).  Make it main-thread-safe by
making it asynchronous, with the results passed as a callback to the invoker's
RestoreObserver.  We also make the IRestoreObserver callback interface
properly oneway.

Bug #2550665
Bug #2549422

Change-Id: If18a233a0a3d54c7b55101715c9e6195b762c5a0
2010-03-30 12:42:35 -07:00
Dianne Hackborn
93d7144462 am e5132805: am e2522466: Fix issue #2547337: switching night modes
Merge commit 'e5132805110ba98e301b792cc0c2141b1729b680' into kraken

* commit 'e5132805110ba98e301b792cc0c2141b1729b680':
  Fix issue #2547337: switching night modes
2010-03-29 21:23:08 -07:00
Dianne Hackborn
839e1b6c39 am 2fecae38: am ad5499dd: Hopefully get rid of some ANRs.
Merge commit '2fecae386d952197d63fb75f8ec245d87159a684' into kraken

* commit '2fecae386d952197d63fb75f8ec245d87159a684':
  Hopefully get rid of some ANRs.
2010-03-29 21:23:03 -07:00
Dianne Hackborn
e513280511 am e2522466: Fix issue #2547337: switching night modes
Merge commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8' into froyo-plus-aosp

* commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8':
  Fix issue #2547337: switching night modes
2010-03-29 21:19:39 -07:00
Dianne Hackborn
2fecae386d am ad5499dd: Hopefully get rid of some ANRs.
Merge commit 'ad5499dd204a1512471778462a805a288595f2f2' into froyo-plus-aosp

* commit 'ad5499dd204a1512471778462a805a288595f2f2':
  Hopefully get rid of some ANRs.
2010-03-29 21:19:36 -07:00
Dianne Hackborn
e252246655 Fix issue #2547337: switching night modes
Dumb.

Change-Id: Iaa72eaac54422f7fd95cf1050f6b7b6da55af0c3
2010-03-29 21:13:31 -07:00
Dianne Hackborn
ad5499dd20 Hopefully get rid of some ANRs.
Don't hold the activity manager lock the entire time we are processing an ANR,
which often causes us to cause a second ANR as someone else calls into the
activity manager and gets blocked.

Change-Id: Ife4db82b12d6f4378ac2705bd6f60beb1244a1e6
2010-03-29 21:07:23 -07:00
Oscar Montemayor
1ec71365f9 am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo
Merge commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740' into froyo-plus-aosp

* commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740':
  DO NOT MERGE
2010-03-29 19:01:16 -07:00
Oscar Montemayor
1f4df90bfa DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
2010-03-29 18:12:24 -07:00
Christopher Tate
245df5ad16 am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
Merge commit '3f264c4fba416f55247da3fafd6afbe55bf93598' into froyo-plus-aosp

* commit '3f264c4fba416f55247da3fafd6afbe55bf93598':
  API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
2010-03-29 15:53:54 -07:00
Christopher Tate
cc84c69726 API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
Part of bug #2545514

Change-Id: Ic775e3b942c485252149c1b6c15c88517fa4e3e5
2010-03-29 15:48:14 -07:00
Jean-Baptiste Queru
9d0f6dfdc1 Fix build
Change-Id: I8c68731786ab648dc916b09333b67acb26f81594
2010-03-29 12:55:09 -07:00
Irfan Sheriff
92380919cc am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
Merge commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a' into froyo-plus-aosp

* commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a':
  cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
2010-03-29 12:07:37 -07:00
Irfan Sheriff
b99fe5e622 cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
Killing the WifiWatchdogService thread from
WifiService can cause messages to be handled on
a dead thread. Quit the thread on the broadcast
instead.

A couple of more fixes:
- Do an asynchronous bring up of Wifi. This will
allow WifiWatchdogServiceThread to be immediately
brought up, instead of relying on an update.

- There is no need to listen on supplicant connection
in wifiwatchdog anymore. We kill the thread when
supplicant connection is no more.

Bug: 2546756
Change-Id: I15a188e031bc79856c55aabdd271287b0df0377d
2010-03-29 12:02:44 -07:00
The Android Open Source Project
c89704a77f merge from open-source master
Change-Id: I6a8109d11dabc579501c598ab2927cf802797130
2010-03-29 10:57:04 -07:00
Jean-Michel Trivi
211957f639 Implement audio focus support in the notification manager.
This change introduces the NotificationPlayer class which was
created from the code of android.media.AsyncPlayer. The only modification
was to modify the construction of the MediaPlayer so it properly issues
onCompletion notifications (which are used to abandon audio focus).

Unless the sound to be played is looped, the notification is transient
and other apps may duck (uses AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK in
audio focus request).
Change-Id: I69cbb71d0892447b934351384e4e24a2e239295b
2010-03-29 09:37:02 -07:00
Christopher Tate
9c3cee9824 API CHANGE: Backup/restore API changes requested by the API Council
* @hide the android.app.backup.RestoreSession class and functionality

* Provide a public method on android.app.backup.BackupManager that apps
  can use to request a restore pass of their last-known-good dataset.
  The new method is called requestRestore().

* Provide the name of the package being restored, not just its ordinal,
  in the RestoreObserver's onUpdate() callback.

Part of bug #2545514

Change-Id: I9689bf8d6e2b808b4ee412424a36a835be0a5ca8
2010-03-26 14:26:44 -07:00
Dianne Hackborn
d49258fed4 Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83
There was a really dumb bug that was causing us to not always apply
the new configuration.  As a result of fixing this, there were new
glithes in the transition between car and regular mode, so further
work here to fix that.  And since I was actually working during the
night and seeing night mode, I noticed how obnoxiously bright the
status bar is compared to the car home at night, so it now nicely
dims itself when we switch to the night config.  Oh and in doing
that I also found and fixed a bug in dispatching config changes to
a window (where they wouldn't get dispatched if the window didn't
resize).

FINALLY...  tweak the wallpaper enter/exit animations a bit to
make them a little smoother.

Change-Id: I4e062093cbcfbc919307799a794846db2920216f
2010-03-26 12:52:53 -07:00
Joe Onorato
1aedcce92f Fix StatusBarService deadlock for real this time.
The lock is now only held long enough to swap the queue with a new ArrayList.

Bug: 2542233
Change-Id: I8c1c3d4d0b5b53166cc239fc0069d69929b43f91
2010-03-26 12:13:29 -07:00
Dianne Hackborn
0d3b202bde Merge "Fix Memory Leak When Switching Input Methods" 2010-03-25 19:23:09 -07:00
Dan Egnor
621bc54598 Add "dumpsys diskstats" to get a dump of disk-free values.
Also includes a trivial test of I/O latency.  (Mostly useful to be invoked
from checkin to poll disk-free and latency issues.  Also moderately useful
to see in a bugreport.)

Also make "dumpsys netstat" a non-no-op, in case we want this data.

Change-Id: Ia93550a23ca6b35586c5d9217890ee0a5801aae1
2010-03-25 17:16:01 -07:00
Joe Onorato
53d7c23443 Merge "Fix 2495749 - System process crash when a notification switches sections." 2010-03-25 16:00:25 -07:00
Joe Onorato
32b51436c6 Fix 2495749 - System process crash when a notification switches sections.
Change-Id: I86ff1b78fc309b758c6457be867509b71042d42e
2010-03-25 15:57:49 -07:00
Robert Greenwalt
b012e15441 Merge "Fix Tethering of multiple downstream ifaces." 2010-03-25 15:50:25 -07:00
Robert Greenwalt
b37f0c6513 Fix Tethering of multiple downstream ifaces.
We weren't notifying the second tethered iface of it's upstream iface name so its traffic
was not getting routed correctly.
We also weren't clearing out our connected iface name when we untethered, so the route rules
weren't getting flushed when the last tether came down.

Change-Id: I34e5d672ea882c89c8f582d69d6dc421cb52d4b4
2010-03-25 15:29:57 -07:00
Irfan Sheriff
a3bd409a0a settings variable for wifi saved state
We add a variable for saving wifi state
to restore after tethering.

Bring up wifi on boot up if the state indicates so.

Bug: 2537983
Change-Id: I9c6548b93df6fcbc0cec1e6b857f7224dc6d1b2c
2010-03-25 15:10:34 -07:00
Robert Greenwalt
bfb7bfa538 Update Framework to support multiple dhpc ranges
Previously we only supported a single range - this was inadequate for
multiple interfaces.  Adding a second range so we can support
both usb and wifi tethering.

Also moving out of the zero-conf range as our dhcp client won't
accept ip addrs in that range (no nexus to nexus wifi action).

bug: 2537963
bug: 2533491
bug: 2538303
Change-Id: I600b421343c28c2f9839ed2076122ae3d0ff5d3d
2010-03-25 14:46:13 -07:00
Daniel Sandler
c68b5b7e5b Merge "Use a more benign icon for ADB notifications." 2010-03-25 13:26:36 -07:00
Daniel Sandler
39576c8df3 Use a more benign icon for ADB notifications.
Also suppress vibe & noise for ADB notifications.

Bug: 2544480
Bug: 2545486

Change-Id: I955a7271f47601f9b35f0d3fcd48363370ebd252
2010-03-25 16:19:53 -04:00
Dianne Hackborn
529bef6925 Dumb late-night typo.
Change-Id: If5e5d8c3728ffc06d686c793ed94a7e18328e5ab
2010-03-25 11:48:43 -07:00
San Mehat
a507859797 MountService: Switch all Log -> Slog
Change-Id: Id33c76497e9d963f295ef6e99d850223ca59b6cd
Signed-off-by: San Mehat <san@google.com>
2010-03-25 10:03:39 -07:00