diff options
| author | 2013-06-18 22:41:19 +0000 | |
|---|---|---|
| committer | 2013-06-18 22:41:19 +0000 | |
| commit | 9829016e5b629f4e459c5ce597023edd17b55cd1 (patch) | |
| tree | bc679320235f1bb2002f8aa198c7eb8db0041964 | |
| parent | 736d4ddcdcd74165ad292b136468207644b28f9d (diff) | |
| parent | 9512953c66d66d08c58c93cce0def30be6856b79 (diff) | |
Merge "Move Keyguard to the systemui process."
| -rw-r--r-- | packages/Keyguard/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/am/ActiveServices.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/Keyguard/AndroidManifest.xml b/packages/Keyguard/AndroidManifest.xml index 7a40a9e7ac9d..7d77c48b5636 100644 --- a/packages/Keyguard/AndroidManifest.xml +++ b/packages/Keyguard/AndroidManifest.xml @@ -39,7 +39,7 @@ <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" /> <application android:label="@string/app_name" - android:process="com.android.systemui.keyguard" + android:process="com.android.systemui" android:persistent="true" > <service android:name=".KeyguardService" diff --git a/services/java/com/android/server/am/ActiveServices.java b/services/java/com/android/server/am/ActiveServices.java index c558fbdca2f1..cd718a271a40 100644 --- a/services/java/com/android/server/am/ActiveServices.java +++ b/services/java/com/android/server/am/ActiveServices.java @@ -1511,6 +1511,7 @@ public final class ActiveServices { mPendingServices.remove(i); i--; + proc.addPackage(sr.appInfo.packageName, mAm.mProcessTracker); realStartServiceLocked(sr, proc); didSomething = true; } |