diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-07 13:19:28 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-07 13:20:23 -0700 |
| commit | 3bbef521d4b07f86010ba0729a36ff8b73bcb0ac (patch) | |
| tree | ababc0f3b85480a1ceabdacd8664098ad1398639 /services/core/java/com/android/server/power | |
| parent | 424edf064fb705b07f5f7d41e875dd2b24ccf271 (diff) | |
| parent | f2db00fdcd4e3dd97afd071f3af058d307a152f9 (diff) | |
| download | frameworks_base-3bbef521d4b07f86010ba0729a36ff8b73bcb0ac.zip frameworks_base-3bbef521d4b07f86010ba0729a36ff8b73bcb0ac.tar.gz frameworks_base-3bbef521d4b07f86010ba0729a36ff8b73bcb0ac.tar.bz2 | |
resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp
Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0
Diffstat (limited to 'services/core/java/com/android/server/power')
| -rw-r--r-- | services/core/java/com/android/server/power/ShutdownThread.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java index 88a27f5..126d4c0 100644 --- a/services/core/java/com/android/server/power/ShutdownThread.java +++ b/services/core/java/com/android/server/power/ShutdownThread.java @@ -44,6 +44,7 @@ import android.os.storage.IMountService; import android.os.storage.IMountShutdownObserver; import com.android.internal.telephony.ITelephony; +import com.android.server.pm.PackageManagerService; import android.util.Log; import android.view.WindowManager; @@ -328,6 +329,14 @@ public final class ShutdownThread extends Thread { } } + Log.i(TAG, "Shutting down package manager..."); + + final PackageManagerService pm = (PackageManagerService) + ServiceManager.getService("package"); + if (pm != null) { + pm.shutdown(); + } + // Shutdown radios. shutdownRadios(MAX_RADIO_WAIT_TIME); |