PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev

Browse Source 
* commit '33080be20a58d340f860feed444167edb527d689':
  Use user-specific PackageManager.
This commit is contained in:
Jeff Sharkey
2012-10-10 14:30:30 -07:00
committed by Android Git Automerger
parent ec994cd777 33080be20a
commit 2a6f25115f
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/applications/RunningState.java
View File

@@ -29,6 +29,7 @@ import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Handler; import android.os.Handler;
@@ -447,11 +448,10 @@ public class RunningState {
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
} }
} }
boolean updateService(Context context, boolean updateService(Context userContext, ActivityManager.RunningServiceInfo service) {
ActivityManager.RunningServiceInfo service) { final PackageManager pm = userContext.getPackageManager();
final PackageManager pm = context.getPackageManager();
boolean changed = false; boolean changed = false;
ServiceItem si = mServices.get(service.service); ServiceItem si = mServices.get(service.service);
if (si == null) { if (si == null) {
@@ -484,7 +484,7 @@ public class RunningState {
try { try {
Resources clientr = pm.getResourcesForApplication(service.clientPackage); Resources clientr = pm.getResourcesForApplication(service.clientPackage);
String label = clientr.getString(service.clientLabel); String label = clientr.getString(service.clientLabel);
si.mDescription = context.getResources().getString( si.mDescription = userContext.getResources().getString(
R.string.service_client_name, label); R.string.service_client_name, label);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
si.mDescription = null; si.mDescription = null;
@@ -494,7 +494,7 @@ public class RunningState {
si.mShownAsStarted = true; si.mShownAsStarted = true;
changed = true; changed = true;
} }
si.mDescription = context.getResources().getString( si.mDescription = userContext.getResources().getString(
R.string.service_started_by_app); R.string.service_started_by_app);
} }
@@ -903,6 +903,15 @@ public class RunningState {
for (int i=0; i<NS; i++) { for (int i=0; i<NS; i++) {
ActivityManager.RunningServiceInfo si = services.get(i); ActivityManager.RunningServiceInfo si = services.get(i);
final Context userContext;
try {
userContext = context.createPackageContextAsUser(
"android", 0, new UserHandle(UserHandle.getUserId(si.uid)));
} catch (NameNotFoundException e) {
// Should always have "android" package
throw new RuntimeException(e);
}
// If this service's process is in use at a higher importance // If this service's process is in use at a higher importance
// due to another process bound to one of its services, then we // due to another process bound to one of its services, then we
// won't put it in the top-level list of services. Instead we // won't put it in the top-level list of services. Instead we
@@ -944,7 +953,7 @@ public class RunningState {
ProcessItem proc = procs.get(si.process); ProcessItem proc = procs.get(si.process);
if (proc == null) { if (proc == null) {
changed = true; changed = true;
proc = new ProcessItem(context, si.uid, si.process); proc = new ProcessItem(userContext, si.uid, si.process);
procs.put(si.process, proc); procs.put(si.process, proc);
} }
@@ -965,7 +974,7 @@ public class RunningState {
proc.mDependentProcesses.clear(); proc.mDependentProcesses.clear();
proc.mCurSeq = mSequence; proc.mCurSeq = mSequence;
} }
changed |= proc.updateService(context, si); changed |= proc.updateService(userContext, si);
} }
// Now update the map of other processes that are running (but // Now update the map of other processes that are running (but