summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jim Miller <jaggies@google.com> 2013-06-12 14:18:07 -0700
committer Jim Miller <jaggies@google.com> 2013-06-18 15:28:28 -0700
commit9512953c66d66d08c58c93cce0def30be6856b79 (patch)
treec17dbc167066a3a9d8822998bced69f03a8feb9b
parent9f6bb77eb61a465f13147ada9a920d7ba9567c92 (diff)
Move Keyguard to the systemui process.
This should save some memory on devices with limited amounts of RAM by allowing it to share the graphics context with systemui. Initially, adding this to the systemui process triggered a bug where the shared process id didn't exist in the table yet. The change to ActiveServices tries to work around this by explicitly adding the package in attachApplicationLocked(). Change-Id: I9e97d5d69ddd15d7f16aca83a57bdf381811a13b
-rw-r--r--packages/Keyguard/AndroidManifest.xml2
-rw-r--r--services/java/com/android/server/am/ActiveServices.java1
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;
}