Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fdf53a46: Merge change 26935 into eclair

Browse Source 
Merge commit 'fdf53a4628f915203752660aa07049aa22c01b5a' into eclair-plus-aosp

* commit 'fdf53a4628f915203752660aa07049aa22c01b5a':
  Fix bug 2129190
This commit is contained in:
Mike Cleron
2009-09-24 21:54:03 -07:00
committed by Android Git Automerger
parent d503453ca0 fdf53a4628
commit f45076dd37
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/ActivityThread.java
View File

@@ -292,9 +292,9 @@ public final class ActivityThread {
} }
public PackageInfo(ActivityThread activityThread, String name, public PackageInfo(ActivityThread activityThread, String name,
Context systemContext) { Context systemContext, ApplicationInfo info) {
mActivityThread = activityThread; mActivityThread = activityThread;
mApplicationInfo = new ApplicationInfo(); mApplicationInfo = info != null ? info : new ApplicationInfo();
mApplicationInfo.packageName = name; mApplicationInfo.packageName = name;
mPackageName = name; mPackageName = name;
mAppDir = null; mAppDir = null;
@@ -2202,7 +2202,7 @@ public final class ActivityThread {
if (mSystemContext == null) { if (mSystemContext == null) {
ApplicationContext context = ApplicationContext context =
ApplicationContext.createSystemContext(this); ApplicationContext.createSystemContext(this);
PackageInfo info = new PackageInfo(this, "android", context); PackageInfo info = new PackageInfo(this, "android", context, null);
context.init(info, null, this); context.init(info, null, this);
context.getResources().updateConfiguration( context.getResources().updateConfiguration(
getConfiguration(), getDisplayMetricsLocked(false)); getConfiguration(), getDisplayMetricsLocked(false));
@@ -2214,6 +2214,13 @@ public final class ActivityThread {
return mSystemContext; return mSystemContext;
} }
public void installSystemApplicationInfo(ApplicationInfo info) {
synchronized (this) {
ApplicationContext context = getSystemContext();
context.init(new PackageInfo(this, "android", context, info), null, this);
}
}
void scheduleGcIdler() { void scheduleGcIdler() {
if (!mGcIdlerScheduled) { if (!mGcIdlerScheduled) {
mGcIdlerScheduled = true; mGcIdlerScheduled = true;

2
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -1221,6 +1221,8 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
ApplicationInfo info = ApplicationInfo info =
mSelf.mContext.getPackageManager().getApplicationInfo( mSelf.mContext.getPackageManager().getApplicationInfo(
"android", STOCK_PM_FLAGS); "android", STOCK_PM_FLAGS);
mSystemThread.installSystemApplicationInfo(info);
synchronized (mSelf) { synchronized (mSelf) {
ProcessRecord app = mSelf.newProcessRecordLocked( ProcessRecord app = mSelf.newProcessRecordLocked(
mSystemThread.getApplicationThread(), info, mSystemThread.getApplicationThread(), info,