2432 Commits

Author SHA1 Message Date
Eric Olsen
2544a74dff am 8d72c644: am f26cf98f: am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo 2010-03-31 10:18:15 -07:00
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
99669b7089 am a749f869: Fix a previous bad merge. 2010-03-31 00:56:05 -07:00
Jeff Brown
a749f86974 Fix a previous bad merge.
Change-Id: I12e577873389d6200f8add252867e63dee2d2c3c
2010-03-31 00:43:36 -07:00
Jeff Brown
41f7cb398e am 767225d8: resolved conflicts for merge of d9ee01a9 to kraken 2010-03-31 00:08:13 -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
3faf05452b am b4915265: am ab86fc91: am de2722af: Merge "Package manager optimizations." into froyo 2010-03-30 13:51:45 -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
Irfan Sheriff
d4f3958bde Merge "Make setNumAllowedChannels asynchronous" 2010-03-30 13:30:11 -07:00
Irfan Sheriff
d8f614c9bf Make setNumAllowedChannels asynchronous
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: I66506093af0ba77c491079c29e7649732db509d1
2010-03-30 13:29:27 -07:00
Christopher Tate
e1bd78b4d1 am 4caee4f7: am b3f7fe44: am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo 2010-03-30 13:25:51 -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
0c03f69c9d am 2fa4ab04: am 454a956b: am a7035909: Remove logspew. 2010-03-30 13:03:06 -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
The Android Open Source Project
b7248b7b81 merge from open-source master
Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525
2010-03-30 11:13:47 -07:00
Dianne Hackborn
3684f59138 am 93d71444: am e5132805: am e2522466: Fix issue #2547337: switching night modes 2010-03-29 21:35:25 -07:00
Dianne Hackborn
ba2ff33009 am 839e1b6c: am 2fecae38: am ad5499dd: Hopefully get rid of some ANRs. 2010-03-29 21:35:22 -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
de0d50f8b7 am 2eb13d3f: am 245df5ad: am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo 2010-03-29 16:07:47 -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
3330ae6324 am b5d9614f: am 9d0f6dfd: Fix build 2010-03-29 13:09:15 -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
d646f69c4e am f29c7d4d: am c89704a7: merge from open-source master 2010-03-29 11:21:33 -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
bc46432b68 am 462e4a90: am 0737d77a: Merge "Implement audio focus support in the notification manager." into froyo 2010-03-29 10:25:57 -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