Merge "Minor LoadedApk refactoring."
This commit is contained in:
@@ -366,7 +366,7 @@ public final class ActivityThread {
|
||||
|
||||
ActivityInfo activityInfo;
|
||||
CompatibilityInfo compatInfo;
|
||||
LoadedApk packageInfo;
|
||||
LoadedApk loadedApk;
|
||||
|
||||
List<ResultInfo> pendingResults;
|
||||
List<ReferrerIntent> pendingIntents;
|
||||
@@ -542,7 +542,7 @@ public final class ActivityThread {
|
||||
}
|
||||
|
||||
static final class AppBindData {
|
||||
LoadedApk info;
|
||||
LoadedApk loadedApk;
|
||||
String processName;
|
||||
ApplicationInfo appInfo;
|
||||
List<ProviderInfo> providers;
|
||||
@@ -1584,7 +1584,7 @@ public final class ActivityThread {
|
||||
Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityStart");
|
||||
final ActivityClientRecord r = (ActivityClientRecord) msg.obj;
|
||||
|
||||
r.packageInfo = getPackageInfoNoCheck(
|
||||
r.loadedApk = getLoadedApkNoCheck(
|
||||
r.activityInfo.applicationInfo, r.compatInfo);
|
||||
handleLaunchActivity(r, null, "LAUNCH_ACTIVITY");
|
||||
Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
|
||||
@@ -1971,13 +1971,13 @@ public final class ActivityThread {
|
||||
return mH;
|
||||
}
|
||||
|
||||
public final LoadedApk getPackageInfo(String packageName, CompatibilityInfo compatInfo,
|
||||
int flags) {
|
||||
return getPackageInfo(packageName, compatInfo, flags, UserHandle.myUserId());
|
||||
public final LoadedApk getLoadedApkForPackageName(String packageName,
|
||||
CompatibilityInfo compatInfo, int flags) {
|
||||
return getLoadedApkForPackageName(packageName, compatInfo, flags, UserHandle.myUserId());
|
||||
}
|
||||
|
||||
public final LoadedApk getPackageInfo(String packageName, CompatibilityInfo compatInfo,
|
||||
int flags, int userId) {
|
||||
public final LoadedApk getLoadedApkForPackageName(String packageName,
|
||||
CompatibilityInfo compatInfo, int flags, int userId) {
|
||||
final boolean differentUser = (UserHandle.myUserId() != userId);
|
||||
synchronized (mResourcesManager) {
|
||||
WeakReference<LoadedApk> ref;
|
||||
@@ -1990,13 +1990,13 @@ public final class ActivityThread {
|
||||
ref = mResourcePackages.get(packageName);
|
||||
}
|
||||
|
||||
LoadedApk packageInfo = ref != null ? ref.get() : null;
|
||||
//Slog.i(TAG, "getPackageInfo " + packageName + ": " + packageInfo);
|
||||
//if (packageInfo != null) Slog.i(TAG, "isUptoDate " + packageInfo.mResDir
|
||||
// + ": " + packageInfo.mResources.getAssets().isUpToDate());
|
||||
if (packageInfo != null && (packageInfo.mResources == null
|
||||
|| packageInfo.mResources.getAssets().isUpToDate())) {
|
||||
if (packageInfo.isSecurityViolation()
|
||||
LoadedApk loadedApk = ref != null ? ref.get() : null;
|
||||
//Slog.i(TAG, "getLoadedApkForPackageName " + packageName + ": " + loadedApk);
|
||||
//if (loadedApk != null) Slog.i(TAG, "isUptoDate " + loadedApk.mResDir
|
||||
// + ": " + loadedApk.mResources.getAssets().isUpToDate());
|
||||
if (loadedApk != null && (loadedApk.mResources == null
|
||||
|| loadedApk.mResources.getAssets().isUpToDate())) {
|
||||
if (loadedApk.isSecurityViolation()
|
||||
&& (flags&Context.CONTEXT_IGNORE_SECURITY) == 0) {
|
||||
throw new SecurityException(
|
||||
"Requesting code from " + packageName
|
||||
@@ -2004,7 +2004,7 @@ public final class ActivityThread {
|
||||
+ mBoundApplication.processName
|
||||
+ "/" + mBoundApplication.appInfo.uid);
|
||||
}
|
||||
return packageInfo;
|
||||
return loadedApk;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2019,13 +2019,13 @@ public final class ActivityThread {
|
||||
}
|
||||
|
||||
if (ai != null) {
|
||||
return getPackageInfo(ai, compatInfo, flags);
|
||||
return getLoadedApk(ai, compatInfo, flags);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public final LoadedApk getPackageInfo(ApplicationInfo ai, CompatibilityInfo compatInfo,
|
||||
public final LoadedApk getLoadedApk(ApplicationInfo ai, CompatibilityInfo compatInfo,
|
||||
int flags) {
|
||||
boolean includeCode = (flags&Context.CONTEXT_INCLUDE_CODE) != 0;
|
||||
boolean securityViolation = includeCode && ai.uid != 0
|
||||
@@ -2047,16 +2047,16 @@ public final class ActivityThread {
|
||||
throw new SecurityException(msg);
|
||||
}
|
||||
}
|
||||
return getPackageInfo(ai, compatInfo, null, securityViolation, includeCode,
|
||||
return getLoadedApk(ai, compatInfo, null, securityViolation, includeCode,
|
||||
registerPackage);
|
||||
}
|
||||
|
||||
public final LoadedApk getPackageInfoNoCheck(ApplicationInfo ai,
|
||||
public final LoadedApk getLoadedApkNoCheck(ApplicationInfo ai,
|
||||
CompatibilityInfo compatInfo) {
|
||||
return getPackageInfo(ai, compatInfo, null, false, true, false);
|
||||
return getLoadedApk(ai, compatInfo, null, false, true, false);
|
||||
}
|
||||
|
||||
public final LoadedApk peekPackageInfo(String packageName, boolean includeCode) {
|
||||
public final LoadedApk peekLoadedApk(String packageName, boolean includeCode) {
|
||||
synchronized (mResourcesManager) {
|
||||
WeakReference<LoadedApk> ref;
|
||||
if (includeCode) {
|
||||
@@ -2068,7 +2068,7 @@ public final class ActivityThread {
|
||||
}
|
||||
}
|
||||
|
||||
private LoadedApk getPackageInfo(ApplicationInfo aInfo, CompatibilityInfo compatInfo,
|
||||
private LoadedApk getLoadedApk(ApplicationInfo aInfo, CompatibilityInfo compatInfo,
|
||||
ClassLoader baseLoader, boolean securityViolation, boolean includeCode,
|
||||
boolean registerPackage) {
|
||||
final boolean differentUser = (UserHandle.myUserId() != UserHandle.getUserId(aInfo.uid));
|
||||
@@ -2083,35 +2083,35 @@ public final class ActivityThread {
|
||||
ref = mResourcePackages.get(aInfo.packageName);
|
||||
}
|
||||
|
||||
LoadedApk packageInfo = ref != null ? ref.get() : null;
|
||||
if (packageInfo == null || (packageInfo.mResources != null
|
||||
&& !packageInfo.mResources.getAssets().isUpToDate())) {
|
||||
LoadedApk loadedApk = ref != null ? ref.get() : null;
|
||||
if (loadedApk == null || (loadedApk.mResources != null
|
||||
&& !loadedApk.mResources.getAssets().isUpToDate())) {
|
||||
if (localLOGV) Slog.v(TAG, (includeCode ? "Loading code package "
|
||||
: "Loading resource-only package ") + aInfo.packageName
|
||||
+ " (in " + (mBoundApplication != null
|
||||
? mBoundApplication.processName : null)
|
||||
+ ")");
|
||||
packageInfo =
|
||||
loadedApk =
|
||||
new LoadedApk(this, aInfo, compatInfo, baseLoader,
|
||||
securityViolation, includeCode &&
|
||||
(aInfo.flags&ApplicationInfo.FLAG_HAS_CODE) != 0, registerPackage);
|
||||
|
||||
if (mSystemThread && "android".equals(aInfo.packageName)) {
|
||||
packageInfo.installSystemApplicationInfo(aInfo,
|
||||
getSystemContext().mPackageInfo.getClassLoader());
|
||||
loadedApk.installSystemApplicationInfo(aInfo,
|
||||
getSystemContext().mLoadedApk.getClassLoader());
|
||||
}
|
||||
|
||||
if (differentUser) {
|
||||
// Caching not supported across users
|
||||
} else if (includeCode) {
|
||||
mPackages.put(aInfo.packageName,
|
||||
new WeakReference<LoadedApk>(packageInfo));
|
||||
new WeakReference<LoadedApk>(loadedApk));
|
||||
} else {
|
||||
mResourcePackages.put(aInfo.packageName,
|
||||
new WeakReference<LoadedApk>(packageInfo));
|
||||
new WeakReference<LoadedApk>(loadedApk));
|
||||
}
|
||||
}
|
||||
return packageInfo;
|
||||
return loadedApk;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2645,8 +2645,8 @@ public final class ActivityThread {
|
||||
// System.out.println("##### [" + System.currentTimeMillis() + "] ActivityThread.performLaunchActivity(" + r + ")");
|
||||
|
||||
ActivityInfo aInfo = r.activityInfo;
|
||||
if (r.packageInfo == null) {
|
||||
r.packageInfo = getPackageInfo(aInfo.applicationInfo, r.compatInfo,
|
||||
if (r.loadedApk == null) {
|
||||
r.loadedApk = getLoadedApk(aInfo.applicationInfo, r.compatInfo,
|
||||
Context.CONTEXT_INCLUDE_CODE);
|
||||
}
|
||||
|
||||
@@ -2683,15 +2683,15 @@ public final class ActivityThread {
|
||||
}
|
||||
|
||||
try {
|
||||
Application app = r.packageInfo.makeApplication(false, mInstrumentation);
|
||||
Application app = r.loadedApk.makeApplication(false, mInstrumentation);
|
||||
|
||||
if (localLOGV) Slog.v(TAG, "Performing launch of " + r);
|
||||
if (localLOGV) Slog.v(
|
||||
TAG, r + ": app=" + app
|
||||
+ ", appName=" + app.getPackageName()
|
||||
+ ", pkg=" + r.packageInfo.getPackageName()
|
||||
+ ", pkg=" + r.loadedApk.getPackageName()
|
||||
+ ", comp=" + r.intent.getComponent().toShortString()
|
||||
+ ", dir=" + r.packageInfo.getAppDir());
|
||||
+ ", dir=" + r.loadedApk.getAppDir());
|
||||
|
||||
if (activity != null) {
|
||||
CharSequence title = r.activityInfo.loadLabel(appContext.getPackageManager());
|
||||
@@ -2809,7 +2809,7 @@ public final class ActivityThread {
|
||||
}
|
||||
|
||||
ContextImpl appContext = ContextImpl.createActivityContext(
|
||||
this, r.packageInfo, r.activityInfo, r.token, displayId, r.overrideConfig);
|
||||
this, r.loadedApk, r.activityInfo, r.token, displayId, r.overrideConfig);
|
||||
|
||||
final DisplayManagerGlobal dm = DisplayManagerGlobal.getInstance();
|
||||
// For debugging purposes, if the activity's package name contains the value of
|
||||
@@ -2817,7 +2817,7 @@ public final class ActivityThread {
|
||||
// its content on a secondary display if there is one.
|
||||
String pkgName = SystemProperties.get("debug.second-display.pkg");
|
||||
if (pkgName != null && !pkgName.isEmpty()
|
||||
&& r.packageInfo.mPackageName.contains(pkgName)) {
|
||||
&& r.loadedApk.mPackageName.contains(pkgName)) {
|
||||
for (int id : dm.getDisplayIds()) {
|
||||
if (id != Display.DEFAULT_DISPLAY) {
|
||||
Display display =
|
||||
@@ -3145,7 +3145,7 @@ public final class ActivityThread {
|
||||
|
||||
String component = data.intent.getComponent().getClassName();
|
||||
|
||||
LoadedApk packageInfo = getPackageInfoNoCheck(
|
||||
LoadedApk loadedApk = getLoadedApkNoCheck(
|
||||
data.info.applicationInfo, data.compatInfo);
|
||||
|
||||
IActivityManager mgr = ActivityManager.getService();
|
||||
@@ -3154,7 +3154,7 @@ public final class ActivityThread {
|
||||
BroadcastReceiver receiver;
|
||||
ContextImpl context;
|
||||
try {
|
||||
app = packageInfo.makeApplication(false, mInstrumentation);
|
||||
app = loadedApk.makeApplication(false, mInstrumentation);
|
||||
context = (ContextImpl) app.getBaseContext();
|
||||
if (data.info.splitName != null) {
|
||||
context = (ContextImpl) context.createContextForSplit(data.info.splitName);
|
||||
@@ -3178,9 +3178,9 @@ public final class ActivityThread {
|
||||
TAG, "Performing receive of " + data.intent
|
||||
+ ": app=" + app
|
||||
+ ", appName=" + app.getPackageName()
|
||||
+ ", pkg=" + packageInfo.getPackageName()
|
||||
+ ", pkg=" + loadedApk.getPackageName()
|
||||
+ ", comp=" + data.intent.getComponent().toShortString()
|
||||
+ ", dir=" + packageInfo.getAppDir());
|
||||
+ ", dir=" + loadedApk.getAppDir());
|
||||
|
||||
sCurrentBroadcastIntent.set(data.intent);
|
||||
receiver.setPendingResult(data);
|
||||
@@ -3225,8 +3225,8 @@ public final class ActivityThread {
|
||||
unscheduleGcIdler();
|
||||
|
||||
// instantiate the BackupAgent class named in the manifest
|
||||
LoadedApk packageInfo = getPackageInfoNoCheck(data.appInfo, data.compatInfo);
|
||||
String packageName = packageInfo.mPackageName;
|
||||
LoadedApk loadedApk = getLoadedApkNoCheck(data.appInfo, data.compatInfo);
|
||||
String packageName = loadedApk.mPackageName;
|
||||
if (packageName == null) {
|
||||
Slog.d(TAG, "Asked to create backup agent for nonexistent package");
|
||||
return;
|
||||
@@ -3252,11 +3252,11 @@ public final class ActivityThread {
|
||||
try {
|
||||
if (DEBUG_BACKUP) Slog.v(TAG, "Initializing agent class " + classname);
|
||||
|
||||
java.lang.ClassLoader cl = packageInfo.getClassLoader();
|
||||
java.lang.ClassLoader cl = loadedApk.getClassLoader();
|
||||
agent = (BackupAgent) cl.loadClass(classname).newInstance();
|
||||
|
||||
// set up the agent's context
|
||||
ContextImpl context = ContextImpl.createAppContext(this, packageInfo);
|
||||
ContextImpl context = ContextImpl.createAppContext(this, loadedApk);
|
||||
context.setOuterContext(agent);
|
||||
agent.attach(context);
|
||||
|
||||
@@ -3292,8 +3292,8 @@ public final class ActivityThread {
|
||||
private void handleDestroyBackupAgent(CreateBackupAgentData data) {
|
||||
if (DEBUG_BACKUP) Slog.v(TAG, "handleDestroyBackupAgent: " + data);
|
||||
|
||||
LoadedApk packageInfo = getPackageInfoNoCheck(data.appInfo, data.compatInfo);
|
||||
String packageName = packageInfo.mPackageName;
|
||||
LoadedApk loadedApk = getLoadedApkNoCheck(data.appInfo, data.compatInfo);
|
||||
String packageName = loadedApk.mPackageName;
|
||||
BackupAgent agent = mBackupAgents.get(packageName);
|
||||
if (agent != null) {
|
||||
try {
|
||||
@@ -3313,11 +3313,11 @@ public final class ActivityThread {
|
||||
// we are back active so skip it.
|
||||
unscheduleGcIdler();
|
||||
|
||||
LoadedApk packageInfo = getPackageInfoNoCheck(
|
||||
LoadedApk loadedApk = getLoadedApkNoCheck(
|
||||
data.info.applicationInfo, data.compatInfo);
|
||||
Service service = null;
|
||||
try {
|
||||
java.lang.ClassLoader cl = packageInfo.getClassLoader();
|
||||
java.lang.ClassLoader cl = loadedApk.getClassLoader();
|
||||
service = (Service) cl.loadClass(data.info.name).newInstance();
|
||||
} catch (Exception e) {
|
||||
if (!mInstrumentation.onException(service, e)) {
|
||||
@@ -3330,10 +3330,10 @@ public final class ActivityThread {
|
||||
try {
|
||||
if (localLOGV) Slog.v(TAG, "Creating service " + data.info.name);
|
||||
|
||||
ContextImpl context = ContextImpl.createAppContext(this, packageInfo);
|
||||
ContextImpl context = ContextImpl.createAppContext(this, loadedApk);
|
||||
context.setOuterContext(service);
|
||||
|
||||
Application app = packageInfo.makeApplication(false, mInstrumentation);
|
||||
Application app = loadedApk.makeApplication(false, mInstrumentation);
|
||||
service.attach(context, this, data.info.name, data.token, app,
|
||||
ActivityManager.getService());
|
||||
service.onCreate();
|
||||
@@ -3943,7 +3943,7 @@ public final class ActivityThread {
|
||||
Bundle.dumpStats(pw, persistentState);
|
||||
|
||||
if (ex instanceof TransactionTooLargeException
|
||||
&& activity.packageInfo.getTargetSdkVersion() < Build.VERSION_CODES.N) {
|
||||
&& activity.loadedApk.getTargetSdkVersion() < Build.VERSION_CODES.N) {
|
||||
Log.e(TAG, "App sent too much data in instance state, so it was ignored", ex);
|
||||
return;
|
||||
}
|
||||
@@ -4238,11 +4238,11 @@ public final class ActivityThread {
|
||||
}
|
||||
|
||||
private void handleUpdatePackageCompatibilityInfo(UpdateCompatibilityData data) {
|
||||
LoadedApk apk = peekPackageInfo(data.pkg, false);
|
||||
LoadedApk apk = peekLoadedApk(data.pkg, false);
|
||||
if (apk != null) {
|
||||
apk.setCompatibilityInfo(data.info);
|
||||
}
|
||||
apk = peekPackageInfo(data.pkg, true);
|
||||
apk = peekLoadedApk(data.pkg, true);
|
||||
if (apk != null) {
|
||||
apk.setCompatibilityInfo(data.info);
|
||||
}
|
||||
@@ -4739,7 +4739,7 @@ public final class ActivityThread {
|
||||
if (a != null) {
|
||||
Configuration thisConfig = applyConfigCompatMainThread(
|
||||
mCurDefaultDisplayDpi, newConfig,
|
||||
ar.packageInfo.getCompatibilityInfo());
|
||||
ar.loadedApk.getCompatibilityInfo());
|
||||
if (!ar.activity.mFinished && (allActivities || !ar.paused)) {
|
||||
// If the activity is currently resumed, its configuration
|
||||
// needs to change right now.
|
||||
@@ -5209,7 +5209,7 @@ public final class ActivityThread {
|
||||
}
|
||||
|
||||
final void handleDispatchPackageBroadcast(int cmd, String[] packages) {
|
||||
boolean hasPkgInfo = false;
|
||||
boolean hasLoadedApk = false;
|
||||
switch (cmd) {
|
||||
case ApplicationThreadConstants.PACKAGE_REMOVED:
|
||||
case ApplicationThreadConstants.PACKAGE_REMOVED_DONT_KILL:
|
||||
@@ -5220,14 +5220,14 @@ public final class ActivityThread {
|
||||
}
|
||||
synchronized (mResourcesManager) {
|
||||
for (int i = packages.length - 1; i >= 0; i--) {
|
||||
if (!hasPkgInfo) {
|
||||
if (!hasLoadedApk) {
|
||||
WeakReference<LoadedApk> ref = mPackages.get(packages[i]);
|
||||
if (ref != null && ref.get() != null) {
|
||||
hasPkgInfo = true;
|
||||
hasLoadedApk = true;
|
||||
} else {
|
||||
ref = mResourcePackages.get(packages[i]);
|
||||
if (ref != null && ref.get() != null) {
|
||||
hasPkgInfo = true;
|
||||
hasLoadedApk = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5247,21 +5247,21 @@ public final class ActivityThread {
|
||||
synchronized (mResourcesManager) {
|
||||
for (int i = packages.length - 1; i >= 0; i--) {
|
||||
WeakReference<LoadedApk> ref = mPackages.get(packages[i]);
|
||||
LoadedApk pkgInfo = ref != null ? ref.get() : null;
|
||||
if (pkgInfo != null) {
|
||||
hasPkgInfo = true;
|
||||
LoadedApk loadedApk = ref != null ? ref.get() : null;
|
||||
if (loadedApk != null) {
|
||||
hasLoadedApk = true;
|
||||
} else {
|
||||
ref = mResourcePackages.get(packages[i]);
|
||||
pkgInfo = ref != null ? ref.get() : null;
|
||||
if (pkgInfo != null) {
|
||||
hasPkgInfo = true;
|
||||
loadedApk = ref != null ? ref.get() : null;
|
||||
if (loadedApk != null) {
|
||||
hasLoadedApk = true;
|
||||
}
|
||||
}
|
||||
// If the package is being replaced, yet it still has a valid
|
||||
// LoadedApk object, the package was updated with _DONT_KILL.
|
||||
// Adjust it's internal references to the application info and
|
||||
// resources.
|
||||
if (pkgInfo != null) {
|
||||
if (loadedApk != null) {
|
||||
try {
|
||||
final String packageName = packages[i];
|
||||
final ApplicationInfo aInfo =
|
||||
@@ -5275,13 +5275,13 @@ public final class ActivityThread {
|
||||
if (ar.activityInfo.applicationInfo.packageName
|
||||
.equals(packageName)) {
|
||||
ar.activityInfo.applicationInfo = aInfo;
|
||||
ar.packageInfo = pkgInfo;
|
||||
ar.loadedApk = loadedApk;
|
||||
}
|
||||
}
|
||||
}
|
||||
final List<String> oldPaths =
|
||||
sPackageManager.getPreviousCodePaths(packageName);
|
||||
pkgInfo.updateApplicationInfo(aInfo, oldPaths);
|
||||
loadedApk.updateApplicationInfo(aInfo, oldPaths);
|
||||
} catch (RemoteException e) {
|
||||
}
|
||||
}
|
||||
@@ -5290,7 +5290,7 @@ public final class ActivityThread {
|
||||
break;
|
||||
}
|
||||
}
|
||||
ApplicationPackageManager.handlePackageBroadcast(cmd, packages, hasPkgInfo);
|
||||
ApplicationPackageManager.handlePackageBroadcast(cmd, packages, hasLoadedApk);
|
||||
}
|
||||
|
||||
final void handleLowMemory() {
|
||||
@@ -5494,7 +5494,7 @@ public final class ActivityThread {
|
||||
applyCompatConfiguration(mCurDefaultDisplayDpi);
|
||||
}
|
||||
|
||||
data.info = getPackageInfoNoCheck(data.appInfo, data.compatInfo);
|
||||
data.loadedApk = getLoadedApkNoCheck(data.appInfo, data.compatInfo);
|
||||
|
||||
/**
|
||||
* Switch this process to density compatibility mode if needed.
|
||||
@@ -5562,7 +5562,7 @@ public final class ActivityThread {
|
||||
// XXX should have option to change the port.
|
||||
Debug.changeDebugPort(8100);
|
||||
if (data.debugMode == ApplicationThreadConstants.DEBUG_WAIT) {
|
||||
Slog.w(TAG, "Application " + data.info.getPackageName()
|
||||
Slog.w(TAG, "Application " + data.loadedApk.getPackageName()
|
||||
+ " is waiting for the debugger on port 8100...");
|
||||
|
||||
IActivityManager mgr = ActivityManager.getService();
|
||||
@@ -5581,7 +5581,7 @@ public final class ActivityThread {
|
||||
}
|
||||
|
||||
} else {
|
||||
Slog.w(TAG, "Application " + data.info.getPackageName()
|
||||
Slog.w(TAG, "Application " + data.loadedApk.getPackageName()
|
||||
+ " can be debugged on port 8100...");
|
||||
}
|
||||
}
|
||||
@@ -5629,14 +5629,14 @@ public final class ActivityThread {
|
||||
mInstrumentationAppDir = ii.sourceDir;
|
||||
mInstrumentationSplitAppDirs = ii.splitSourceDirs;
|
||||
mInstrumentationLibDir = getInstrumentationLibrary(data.appInfo, ii);
|
||||
mInstrumentedAppDir = data.info.getAppDir();
|
||||
mInstrumentedSplitAppDirs = data.info.getSplitAppDirs();
|
||||
mInstrumentedLibDir = data.info.getLibDir();
|
||||
mInstrumentedAppDir = data.loadedApk.getAppDir();
|
||||
mInstrumentedSplitAppDirs = data.loadedApk.getSplitAppDirs();
|
||||
mInstrumentedLibDir = data.loadedApk.getLibDir();
|
||||
} else {
|
||||
ii = null;
|
||||
}
|
||||
|
||||
final ContextImpl appContext = ContextImpl.createAppContext(this, data.info);
|
||||
final ContextImpl appContext = ContextImpl.createAppContext(this, data.loadedApk);
|
||||
updateLocaleListFromAppContext(appContext,
|
||||
mResourcesManager.getConfiguration().getLocales());
|
||||
|
||||
@@ -5666,9 +5666,9 @@ public final class ActivityThread {
|
||||
final ApplicationInfo instrApp = new ApplicationInfo();
|
||||
ii.copyTo(instrApp);
|
||||
instrApp.initForUser(UserHandle.myUserId());
|
||||
final LoadedApk pi = getPackageInfo(instrApp, data.compatInfo,
|
||||
final LoadedApk loadedApk = getLoadedApk(instrApp, data.compatInfo,
|
||||
appContext.getClassLoader(), false, true, false);
|
||||
final ContextImpl instrContext = ContextImpl.createAppContext(this, pi);
|
||||
final ContextImpl instrContext = ContextImpl.createAppContext(this, loadedApk);
|
||||
|
||||
try {
|
||||
final ClassLoader cl = instrContext.getClassLoader();
|
||||
@@ -5712,7 +5712,7 @@ public final class ActivityThread {
|
||||
try {
|
||||
// If the app is being launched for full backup or restore, bring it up in
|
||||
// a restricted environment with the base application class.
|
||||
app = data.info.makeApplication(data.restrictedBackupMode, null);
|
||||
app = data.loadedApk.makeApplication(data.restrictedBackupMode, null);
|
||||
mInitialApplication = app;
|
||||
|
||||
// don't bring up providers in restricted mode; they may depend on the
|
||||
@@ -5766,7 +5766,7 @@ public final class ActivityThread {
|
||||
final int preloadedFontsResource = info.metaData.getInt(
|
||||
ApplicationInfo.METADATA_PRELOADED_FONTS, 0);
|
||||
if (preloadedFontsResource != 0) {
|
||||
data.info.getResources().preloadFonts(preloadedFontsResource);
|
||||
data.loadedApk.getResources().preloadFonts(preloadedFontsResource);
|
||||
}
|
||||
}
|
||||
} catch (RemoteException e) {
|
||||
@@ -6361,8 +6361,8 @@ public final class ActivityThread {
|
||||
try {
|
||||
mInstrumentation = new Instrumentation();
|
||||
ContextImpl context = ContextImpl.createAppContext(
|
||||
this, getSystemContext().mPackageInfo);
|
||||
mInitialApplication = context.mPackageInfo.makeApplication(true, null);
|
||||
this, getSystemContext().mLoadedApk);
|
||||
mInitialApplication = context.mLoadedApk.makeApplication(true, null);
|
||||
mInitialApplication.onCreate();
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(
|
||||
|
||||
@@ -187,7 +187,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 {
|
||||
*/
|
||||
/* package */ final void attach(Context context) {
|
||||
attachBaseContext(context);
|
||||
mLoadedApk = ContextImpl.getImpl(context).mPackageInfo;
|
||||
mLoadedApk = ContextImpl.getImpl(context).mLoadedApk;
|
||||
}
|
||||
|
||||
/* package */ void dispatchActivityCreated(Activity activity, Bundle savedInstanceState) {
|
||||
|
||||
@@ -1379,7 +1379,7 @@ public class ApplicationPackageManager extends PackageManager {
|
||||
sameUid ? app.sourceDir : app.publicSourceDir,
|
||||
sameUid ? app.splitSourceDirs : app.splitPublicSourceDirs,
|
||||
app.resourceDirs, app.sharedLibraryFiles, Display.DEFAULT_DISPLAY,
|
||||
mContext.mPackageInfo);
|
||||
mContext.mLoadedApk);
|
||||
if (r != null) {
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -159,7 +159,7 @@ class ContextImpl extends Context {
|
||||
private ArrayMap<String, File> mSharedPrefsPaths;
|
||||
|
||||
final @NonNull ActivityThread mMainThread;
|
||||
final @NonNull LoadedApk mPackageInfo;
|
||||
final @NonNull LoadedApk mLoadedApk;
|
||||
private @Nullable ClassLoader mClassLoader;
|
||||
|
||||
private final @Nullable IBinder mActivityToken;
|
||||
@@ -252,8 +252,8 @@ class ContextImpl extends Context {
|
||||
|
||||
@Override
|
||||
public Context getApplicationContext() {
|
||||
return (mPackageInfo != null) ?
|
||||
mPackageInfo.getApplication() : mMainThread.getApplication();
|
||||
return (mLoadedApk != null) ?
|
||||
mLoadedApk.getApplication() : mMainThread.getApplication();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -297,15 +297,15 @@ class ContextImpl extends Context {
|
||||
|
||||
@Override
|
||||
public ClassLoader getClassLoader() {
|
||||
return mClassLoader != null ? mClassLoader : (mPackageInfo != null ? mPackageInfo.getClassLoader() : ClassLoader.getSystemClassLoader());
|
||||
return mClassLoader != null ? mClassLoader : (mLoadedApk != null ? mLoadedApk.getClassLoader() : ClassLoader.getSystemClassLoader());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPackageName() {
|
||||
if (mPackageInfo != null) {
|
||||
return mPackageInfo.getPackageName();
|
||||
if (mLoadedApk != null) {
|
||||
return mLoadedApk.getPackageName();
|
||||
}
|
||||
// No mPackageInfo means this is a Context for the system itself,
|
||||
// No mLoadedApk means this is a Context for the system itself,
|
||||
// and this here is its name.
|
||||
return "android";
|
||||
}
|
||||
@@ -324,24 +324,24 @@ class ContextImpl extends Context {
|
||||
|
||||
@Override
|
||||
public ApplicationInfo getApplicationInfo() {
|
||||
if (mPackageInfo != null) {
|
||||
return mPackageInfo.getApplicationInfo();
|
||||
if (mLoadedApk != null) {
|
||||
return mLoadedApk.getApplicationInfo();
|
||||
}
|
||||
throw new RuntimeException("Not supported in system context");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPackageResourcePath() {
|
||||
if (mPackageInfo != null) {
|
||||
return mPackageInfo.getResDir();
|
||||
if (mLoadedApk != null) {
|
||||
return mLoadedApk.getResDir();
|
||||
}
|
||||
throw new RuntimeException("Not supported in system context");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPackageCodePath() {
|
||||
if (mPackageInfo != null) {
|
||||
return mPackageInfo.getAppDir();
|
||||
if (mLoadedApk != null) {
|
||||
return mLoadedApk.getAppDir();
|
||||
}
|
||||
throw new RuntimeException("Not supported in system context");
|
||||
}
|
||||
@@ -351,7 +351,7 @@ class ContextImpl extends Context {
|
||||
// At least one application in the world actually passes in a null
|
||||
// name. This happened to work because when we generated the file name
|
||||
// we would stringify it to "null.xml". Nice.
|
||||
if (mPackageInfo.getApplicationInfo().targetSdkVersion <
|
||||
if (mLoadedApk.getApplicationInfo().targetSdkVersion <
|
||||
Build.VERSION_CODES.KITKAT) {
|
||||
if (name == null) {
|
||||
name = "null";
|
||||
@@ -1093,11 +1093,11 @@ class ContextImpl extends Context {
|
||||
warnIfCallingFromSystemProcess();
|
||||
IIntentReceiver rd = null;
|
||||
if (resultReceiver != null) {
|
||||
if (mPackageInfo != null) {
|
||||
if (mLoadedApk != null) {
|
||||
if (scheduler == null) {
|
||||
scheduler = mMainThread.getHandler();
|
||||
}
|
||||
rd = mPackageInfo.getReceiverDispatcher(
|
||||
rd = mLoadedApk.getReceiverDispatcher(
|
||||
resultReceiver, getOuterContext(), scheduler,
|
||||
mMainThread.getInstrumentation(), false);
|
||||
} else {
|
||||
@@ -1197,11 +1197,11 @@ class ContextImpl extends Context {
|
||||
Handler scheduler, int initialCode, String initialData, Bundle initialExtras) {
|
||||
IIntentReceiver rd = null;
|
||||
if (resultReceiver != null) {
|
||||
if (mPackageInfo != null) {
|
||||
if (mLoadedApk != null) {
|
||||
if (scheduler == null) {
|
||||
scheduler = mMainThread.getHandler();
|
||||
}
|
||||
rd = mPackageInfo.getReceiverDispatcher(
|
||||
rd = mLoadedApk.getReceiverDispatcher(
|
||||
resultReceiver, getOuterContext(), scheduler,
|
||||
mMainThread.getInstrumentation(), false);
|
||||
} else {
|
||||
@@ -1251,11 +1251,11 @@ class ContextImpl extends Context {
|
||||
warnIfCallingFromSystemProcess();
|
||||
IIntentReceiver rd = null;
|
||||
if (resultReceiver != null) {
|
||||
if (mPackageInfo != null) {
|
||||
if (mLoadedApk != null) {
|
||||
if (scheduler == null) {
|
||||
scheduler = mMainThread.getHandler();
|
||||
}
|
||||
rd = mPackageInfo.getReceiverDispatcher(
|
||||
rd = mLoadedApk.getReceiverDispatcher(
|
||||
resultReceiver, getOuterContext(), scheduler,
|
||||
mMainThread.getInstrumentation(), false);
|
||||
} else {
|
||||
@@ -1333,11 +1333,11 @@ class ContextImpl extends Context {
|
||||
Bundle initialExtras) {
|
||||
IIntentReceiver rd = null;
|
||||
if (resultReceiver != null) {
|
||||
if (mPackageInfo != null) {
|
||||
if (mLoadedApk != null) {
|
||||
if (scheduler == null) {
|
||||
scheduler = mMainThread.getHandler();
|
||||
}
|
||||
rd = mPackageInfo.getReceiverDispatcher(
|
||||
rd = mLoadedApk.getReceiverDispatcher(
|
||||
resultReceiver, getOuterContext(), scheduler,
|
||||
mMainThread.getInstrumentation(), false);
|
||||
} else {
|
||||
@@ -1414,11 +1414,11 @@ class ContextImpl extends Context {
|
||||
Handler scheduler, Context context, int flags) {
|
||||
IIntentReceiver rd = null;
|
||||
if (receiver != null) {
|
||||
if (mPackageInfo != null && context != null) {
|
||||
if (mLoadedApk != null && context != null) {
|
||||
if (scheduler == null) {
|
||||
scheduler = mMainThread.getHandler();
|
||||
}
|
||||
rd = mPackageInfo.getReceiverDispatcher(
|
||||
rd = mLoadedApk.getReceiverDispatcher(
|
||||
receiver, context, scheduler,
|
||||
mMainThread.getInstrumentation(), true);
|
||||
} else {
|
||||
@@ -1445,8 +1445,8 @@ class ContextImpl extends Context {
|
||||
|
||||
@Override
|
||||
public void unregisterReceiver(BroadcastReceiver receiver) {
|
||||
if (mPackageInfo != null) {
|
||||
IIntentReceiver rd = mPackageInfo.forgetReceiverDispatcher(
|
||||
if (mLoadedApk != null) {
|
||||
IIntentReceiver rd = mLoadedApk.forgetReceiverDispatcher(
|
||||
getOuterContext(), receiver);
|
||||
try {
|
||||
ActivityManager.getService().unregisterReceiver(rd);
|
||||
@@ -1579,7 +1579,7 @@ class ContextImpl extends Context {
|
||||
@Override
|
||||
public IServiceConnection getServiceDispatcher(ServiceConnection conn, Handler handler,
|
||||
int flags) {
|
||||
return mPackageInfo.getServiceDispatcher(conn, getOuterContext(), handler, flags);
|
||||
return mLoadedApk.getServiceDispatcher(conn, getOuterContext(), handler, flags);
|
||||
}
|
||||
|
||||
/** @hide */
|
||||
@@ -1601,16 +1601,16 @@ class ContextImpl extends Context {
|
||||
if (conn == null) {
|
||||
throw new IllegalArgumentException("connection is null");
|
||||
}
|
||||
if (mPackageInfo != null) {
|
||||
sd = mPackageInfo.getServiceDispatcher(conn, getOuterContext(), handler, flags);
|
||||
if (mLoadedApk != null) {
|
||||
sd = mLoadedApk.getServiceDispatcher(conn, getOuterContext(), handler, flags);
|
||||
} else {
|
||||
throw new RuntimeException("Not supported in system context");
|
||||
}
|
||||
validateServiceIntent(service);
|
||||
try {
|
||||
IBinder token = getActivityToken();
|
||||
if (token == null && (flags&BIND_AUTO_CREATE) == 0 && mPackageInfo != null
|
||||
&& mPackageInfo.getApplicationInfo().targetSdkVersion
|
||||
if (token == null && (flags&BIND_AUTO_CREATE) == 0 && mLoadedApk != null
|
||||
&& mLoadedApk.getApplicationInfo().targetSdkVersion
|
||||
< android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
|
||||
flags |= BIND_WAIVE_PRIORITY;
|
||||
}
|
||||
@@ -1634,8 +1634,8 @@ class ContextImpl extends Context {
|
||||
if (conn == null) {
|
||||
throw new IllegalArgumentException("connection is null");
|
||||
}
|
||||
if (mPackageInfo != null) {
|
||||
IServiceConnection sd = mPackageInfo.forgetServiceDispatcher(
|
||||
if (mLoadedApk != null) {
|
||||
IServiceConnection sd = mLoadedApk.forgetServiceDispatcher(
|
||||
getOuterContext(), conn);
|
||||
try {
|
||||
ActivityManager.getService().unbindService(sd);
|
||||
@@ -1980,40 +1980,20 @@ class ContextImpl extends Context {
|
||||
}
|
||||
}
|
||||
|
||||
private static Resources createResources(IBinder activityToken, LoadedApk pi, String splitName,
|
||||
int displayId, Configuration overrideConfig, CompatibilityInfo compatInfo) {
|
||||
final String[] splitResDirs;
|
||||
final ClassLoader classLoader;
|
||||
try {
|
||||
splitResDirs = pi.getSplitPaths(splitName);
|
||||
classLoader = pi.getSplitClassLoader(splitName);
|
||||
} catch (NameNotFoundException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return ResourcesManager.getInstance().getResources(activityToken,
|
||||
pi.getResDir(),
|
||||
splitResDirs,
|
||||
pi.getOverlayDirs(),
|
||||
pi.getApplicationInfo().sharedLibraryFiles,
|
||||
displayId,
|
||||
overrideConfig,
|
||||
compatInfo,
|
||||
classLoader);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Context createApplicationContext(ApplicationInfo application, int flags)
|
||||
throws NameNotFoundException {
|
||||
LoadedApk pi = mMainThread.getPackageInfo(application, mResources.getCompatibilityInfo(),
|
||||
LoadedApk loadedApk = mMainThread.getLoadedApk(application,
|
||||
mResources.getCompatibilityInfo(),
|
||||
flags | CONTEXT_REGISTER_PACKAGE);
|
||||
if (pi != null) {
|
||||
ContextImpl c = new ContextImpl(this, mMainThread, pi, null, mActivityToken,
|
||||
if (loadedApk != null) {
|
||||
ContextImpl c = new ContextImpl(this, mMainThread, loadedApk, null, mActivityToken,
|
||||
new UserHandle(UserHandle.getUserId(application.uid)), flags, null);
|
||||
|
||||
final int displayId = mDisplay != null
|
||||
? mDisplay.getDisplayId() : Display.DEFAULT_DISPLAY;
|
||||
|
||||
c.setResources(createResources(mActivityToken, pi, null, displayId, null,
|
||||
c.setResources(loadedApk.createResources(mActivityToken, null, displayId, null,
|
||||
getDisplayAdjustments(displayId).getCompatibilityInfo()));
|
||||
if (c.mResources != null) {
|
||||
return c;
|
||||
@@ -2037,20 +2017,21 @@ class ContextImpl extends Context {
|
||||
if (packageName.equals("system") || packageName.equals("android")) {
|
||||
// The system resources are loaded in every application, so we can safely copy
|
||||
// the context without reloading Resources.
|
||||
return new ContextImpl(this, mMainThread, mPackageInfo, null, mActivityToken, user,
|
||||
return new ContextImpl(this, mMainThread, mLoadedApk, null, mActivityToken, user,
|
||||
flags, null);
|
||||
}
|
||||
|
||||
LoadedApk pi = mMainThread.getPackageInfo(packageName, mResources.getCompatibilityInfo(),
|
||||
LoadedApk loadedApk = mMainThread.getLoadedApkForPackageName(packageName,
|
||||
mResources.getCompatibilityInfo(),
|
||||
flags | CONTEXT_REGISTER_PACKAGE, user.getIdentifier());
|
||||
if (pi != null) {
|
||||
ContextImpl c = new ContextImpl(this, mMainThread, pi, null, mActivityToken, user,
|
||||
if (loadedApk != null) {
|
||||
ContextImpl c = new ContextImpl(this, mMainThread, loadedApk, null, mActivityToken, user,
|
||||
flags, null);
|
||||
|
||||
final int displayId = mDisplay != null
|
||||
? mDisplay.getDisplayId() : Display.DEFAULT_DISPLAY;
|
||||
|
||||
c.setResources(createResources(mActivityToken, pi, null, displayId, null,
|
||||
c.setResources(loadedApk.createResources(mActivityToken, null, displayId, null,
|
||||
getDisplayAdjustments(displayId).getCompatibilityInfo()));
|
||||
if (c.mResources != null) {
|
||||
return c;
|
||||
@@ -2064,30 +2045,21 @@ class ContextImpl extends Context {
|
||||
|
||||
@Override
|
||||
public Context createContextForSplit(String splitName) throws NameNotFoundException {
|
||||
if (!mPackageInfo.getApplicationInfo().requestsIsolatedSplitLoading()) {
|
||||
if (!mLoadedApk.getApplicationInfo().requestsIsolatedSplitLoading()) {
|
||||
// All Splits are always loaded.
|
||||
return this;
|
||||
}
|
||||
|
||||
final ClassLoader classLoader = mPackageInfo.getSplitClassLoader(splitName);
|
||||
final String[] paths = mPackageInfo.getSplitPaths(splitName);
|
||||
final ClassLoader classLoader = mLoadedApk.getSplitClassLoader(splitName);
|
||||
|
||||
final ContextImpl context = new ContextImpl(this, mMainThread, mPackageInfo, splitName,
|
||||
final ContextImpl context = new ContextImpl(this, mMainThread, mLoadedApk, splitName,
|
||||
mActivityToken, mUser, mFlags, classLoader);
|
||||
|
||||
final int displayId = mDisplay != null
|
||||
? mDisplay.getDisplayId() : Display.DEFAULT_DISPLAY;
|
||||
|
||||
context.setResources(ResourcesManager.getInstance().getResources(
|
||||
mActivityToken,
|
||||
mPackageInfo.getResDir(),
|
||||
paths,
|
||||
mPackageInfo.getOverlayDirs(),
|
||||
mPackageInfo.getApplicationInfo().sharedLibraryFiles,
|
||||
displayId,
|
||||
null,
|
||||
mPackageInfo.getCompatibilityInfo(),
|
||||
classLoader));
|
||||
context.setResources(mLoadedApk.getOrCreateResourcesForSplit(splitName,
|
||||
mActivityToken, displayId));
|
||||
return context;
|
||||
}
|
||||
|
||||
@@ -2097,11 +2069,11 @@ class ContextImpl extends Context {
|
||||
throw new IllegalArgumentException("overrideConfiguration must not be null");
|
||||
}
|
||||
|
||||
ContextImpl context = new ContextImpl(this, mMainThread, mPackageInfo, mSplitName,
|
||||
ContextImpl context = new ContextImpl(this, mMainThread, mLoadedApk, mSplitName,
|
||||
mActivityToken, mUser, mFlags, mClassLoader);
|
||||
|
||||
final int displayId = mDisplay != null ? mDisplay.getDisplayId() : Display.DEFAULT_DISPLAY;
|
||||
context.setResources(createResources(mActivityToken, mPackageInfo, mSplitName, displayId,
|
||||
context.setResources(mLoadedApk.createResources(mActivityToken, mSplitName, displayId,
|
||||
overrideConfiguration, getDisplayAdjustments(displayId).getCompatibilityInfo()));
|
||||
return context;
|
||||
}
|
||||
@@ -2112,11 +2084,11 @@ class ContextImpl extends Context {
|
||||
throw new IllegalArgumentException("display must not be null");
|
||||
}
|
||||
|
||||
ContextImpl context = new ContextImpl(this, mMainThread, mPackageInfo, mSplitName,
|
||||
ContextImpl context = new ContextImpl(this, mMainThread, mLoadedApk, mSplitName,
|
||||
mActivityToken, mUser, mFlags, mClassLoader);
|
||||
|
||||
final int displayId = display.getDisplayId();
|
||||
context.setResources(createResources(mActivityToken, mPackageInfo, mSplitName, displayId,
|
||||
context.setResources(mLoadedApk.createResources(mActivityToken, mSplitName, displayId,
|
||||
null, getDisplayAdjustments(displayId).getCompatibilityInfo()));
|
||||
context.mDisplay = display;
|
||||
return context;
|
||||
@@ -2126,7 +2098,7 @@ class ContextImpl extends Context {
|
||||
public Context createDeviceProtectedStorageContext() {
|
||||
final int flags = (mFlags & ~Context.CONTEXT_CREDENTIAL_PROTECTED_STORAGE)
|
||||
| Context.CONTEXT_DEVICE_PROTECTED_STORAGE;
|
||||
return new ContextImpl(this, mMainThread, mPackageInfo, mSplitName, mActivityToken, mUser,
|
||||
return new ContextImpl(this, mMainThread, mLoadedApk, mSplitName, mActivityToken, mUser,
|
||||
flags, mClassLoader);
|
||||
}
|
||||
|
||||
@@ -2134,7 +2106,7 @@ class ContextImpl extends Context {
|
||||
public Context createCredentialProtectedStorageContext() {
|
||||
final int flags = (mFlags & ~Context.CONTEXT_DEVICE_PROTECTED_STORAGE)
|
||||
| Context.CONTEXT_CREDENTIAL_PROTECTED_STORAGE;
|
||||
return new ContextImpl(this, mMainThread, mPackageInfo, mSplitName, mActivityToken, mUser,
|
||||
return new ContextImpl(this, mMainThread, mLoadedApk, mSplitName, mActivityToken, mUser,
|
||||
flags, mClassLoader);
|
||||
}
|
||||
|
||||
@@ -2183,14 +2155,14 @@ class ContextImpl extends Context {
|
||||
|
||||
@Override
|
||||
public File getDataDir() {
|
||||
if (mPackageInfo != null) {
|
||||
if (mLoadedApk != null) {
|
||||
File res = null;
|
||||
if (isCredentialProtectedStorage()) {
|
||||
res = mPackageInfo.getCredentialProtectedDataDirFile();
|
||||
res = mLoadedApk.getCredentialProtectedDataDirFile();
|
||||
} else if (isDeviceProtectedStorage()) {
|
||||
res = mPackageInfo.getDeviceProtectedDataDirFile();
|
||||
res = mLoadedApk.getDeviceProtectedDataDirFile();
|
||||
} else {
|
||||
res = mPackageInfo.getDataDirFile();
|
||||
res = mLoadedApk.getDataDirFile();
|
||||
}
|
||||
|
||||
if (res != null) {
|
||||
@@ -2241,10 +2213,10 @@ class ContextImpl extends Context {
|
||||
}
|
||||
|
||||
static ContextImpl createSystemContext(ActivityThread mainThread) {
|
||||
LoadedApk packageInfo = new LoadedApk(mainThread);
|
||||
ContextImpl context = new ContextImpl(null, mainThread, packageInfo, null, null, null, 0,
|
||||
LoadedApk loadedApk = new LoadedApk(mainThread);
|
||||
ContextImpl context = new ContextImpl(null, mainThread, loadedApk, null, null, null, 0,
|
||||
null);
|
||||
context.setResources(packageInfo.getResources());
|
||||
context.setResources(loadedApk.getResources());
|
||||
context.mResources.updateConfiguration(context.mResourcesManager.getConfiguration(),
|
||||
context.mResourcesManager.getDisplayMetrics());
|
||||
return context;
|
||||
@@ -2255,35 +2227,35 @@ class ContextImpl extends Context {
|
||||
* Make sure that the created system UI context shares the same LoadedApk as the system context.
|
||||
*/
|
||||
static ContextImpl createSystemUiContext(ContextImpl systemContext) {
|
||||
final LoadedApk packageInfo = systemContext.mPackageInfo;
|
||||
ContextImpl context = new ContextImpl(null, systemContext.mMainThread, packageInfo, null,
|
||||
final LoadedApk loadedApk = systemContext.mLoadedApk;
|
||||
ContextImpl context = new ContextImpl(null, systemContext.mMainThread, loadedApk, null,
|
||||
null, null, 0, null);
|
||||
context.setResources(createResources(null, packageInfo, null, Display.DEFAULT_DISPLAY, null,
|
||||
packageInfo.getCompatibilityInfo()));
|
||||
context.setResources(loadedApk.createResources(null, null, Display.DEFAULT_DISPLAY, null,
|
||||
loadedApk.getCompatibilityInfo()));
|
||||
return context;
|
||||
}
|
||||
|
||||
static ContextImpl createAppContext(ActivityThread mainThread, LoadedApk packageInfo) {
|
||||
if (packageInfo == null) throw new IllegalArgumentException("packageInfo");
|
||||
ContextImpl context = new ContextImpl(null, mainThread, packageInfo, null, null, null, 0,
|
||||
static ContextImpl createAppContext(ActivityThread mainThread, LoadedApk loadedApk) {
|
||||
if (loadedApk == null) throw new IllegalArgumentException("loadedApk");
|
||||
ContextImpl context = new ContextImpl(null, mainThread, loadedApk, null, null, null, 0,
|
||||
null);
|
||||
context.setResources(packageInfo.getResources());
|
||||
context.setResources(loadedApk.getResources());
|
||||
return context;
|
||||
}
|
||||
|
||||
static ContextImpl createActivityContext(ActivityThread mainThread,
|
||||
LoadedApk packageInfo, ActivityInfo activityInfo, IBinder activityToken, int displayId,
|
||||
LoadedApk loadedApk, ActivityInfo activityInfo, IBinder activityToken, int displayId,
|
||||
Configuration overrideConfiguration) {
|
||||
if (packageInfo == null) throw new IllegalArgumentException("packageInfo");
|
||||
if (loadedApk == null) throw new IllegalArgumentException("loadedApk");
|
||||
|
||||
String[] splitDirs = packageInfo.getSplitResDirs();
|
||||
ClassLoader classLoader = packageInfo.getClassLoader();
|
||||
String[] splitDirs = loadedApk.getSplitResDirs();
|
||||
ClassLoader classLoader = loadedApk.getClassLoader();
|
||||
|
||||
if (packageInfo.getApplicationInfo().requestsIsolatedSplitLoading()) {
|
||||
if (loadedApk.getApplicationInfo().requestsIsolatedSplitLoading()) {
|
||||
Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, "SplitDependencies");
|
||||
try {
|
||||
classLoader = packageInfo.getSplitClassLoader(activityInfo.splitName);
|
||||
splitDirs = packageInfo.getSplitPaths(activityInfo.splitName);
|
||||
classLoader = loadedApk.getSplitClassLoader(activityInfo.splitName);
|
||||
splitDirs = loadedApk.getSplitPaths(activityInfo.splitName);
|
||||
} catch (NameNotFoundException e) {
|
||||
// Nothing above us can handle a NameNotFoundException, better crash.
|
||||
throw new RuntimeException(e);
|
||||
@@ -2292,14 +2264,14 @@ class ContextImpl extends Context {
|
||||
}
|
||||
}
|
||||
|
||||
ContextImpl context = new ContextImpl(null, mainThread, packageInfo, activityInfo.splitName,
|
||||
ContextImpl context = new ContextImpl(null, mainThread, loadedApk, activityInfo.splitName,
|
||||
activityToken, null, 0, classLoader);
|
||||
|
||||
// Clamp display ID to DEFAULT_DISPLAY if it is INVALID_DISPLAY.
|
||||
displayId = (displayId != Display.INVALID_DISPLAY) ? displayId : Display.DEFAULT_DISPLAY;
|
||||
|
||||
final CompatibilityInfo compatInfo = (displayId == Display.DEFAULT_DISPLAY)
|
||||
? packageInfo.getCompatibilityInfo()
|
||||
? loadedApk.getCompatibilityInfo()
|
||||
: CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO;
|
||||
|
||||
final ResourcesManager resourcesManager = ResourcesManager.getInstance();
|
||||
@@ -2307,10 +2279,10 @@ class ContextImpl extends Context {
|
||||
// Create the base resources for which all configuration contexts for this Activity
|
||||
// will be rebased upon.
|
||||
context.setResources(resourcesManager.createBaseActivityResources(activityToken,
|
||||
packageInfo.getResDir(),
|
||||
loadedApk.getResDir(),
|
||||
splitDirs,
|
||||
packageInfo.getOverlayDirs(),
|
||||
packageInfo.getApplicationInfo().sharedLibraryFiles,
|
||||
loadedApk.getOverlayDirs(),
|
||||
loadedApk.getApplicationInfo().sharedLibraryFiles,
|
||||
displayId,
|
||||
overrideConfiguration,
|
||||
compatInfo,
|
||||
@@ -2321,7 +2293,7 @@ class ContextImpl extends Context {
|
||||
}
|
||||
|
||||
private ContextImpl(@Nullable ContextImpl container, @NonNull ActivityThread mainThread,
|
||||
@NonNull LoadedApk packageInfo, @Nullable String splitName,
|
||||
@NonNull LoadedApk loadedApk, @Nullable String splitName,
|
||||
@Nullable IBinder activityToken, @Nullable UserHandle user, int flags,
|
||||
@Nullable ClassLoader classLoader) {
|
||||
mOuterContext = this;
|
||||
@@ -2330,10 +2302,10 @@ class ContextImpl extends Context {
|
||||
// location for application.
|
||||
if ((flags & (Context.CONTEXT_CREDENTIAL_PROTECTED_STORAGE
|
||||
| Context.CONTEXT_DEVICE_PROTECTED_STORAGE)) == 0) {
|
||||
final File dataDir = packageInfo.getDataDirFile();
|
||||
if (Objects.equals(dataDir, packageInfo.getCredentialProtectedDataDirFile())) {
|
||||
final File dataDir = loadedApk.getDataDirFile();
|
||||
if (Objects.equals(dataDir, loadedApk.getCredentialProtectedDataDirFile())) {
|
||||
flags |= Context.CONTEXT_CREDENTIAL_PROTECTED_STORAGE;
|
||||
} else if (Objects.equals(dataDir, packageInfo.getDeviceProtectedDataDirFile())) {
|
||||
} else if (Objects.equals(dataDir, loadedApk.getDeviceProtectedDataDirFile())) {
|
||||
flags |= Context.CONTEXT_DEVICE_PROTECTED_STORAGE;
|
||||
}
|
||||
}
|
||||
@@ -2347,7 +2319,7 @@ class ContextImpl extends Context {
|
||||
}
|
||||
mUser = user;
|
||||
|
||||
mPackageInfo = packageInfo;
|
||||
mLoadedApk = loadedApk;
|
||||
mSplitName = splitName;
|
||||
mClassLoader = classLoader;
|
||||
mResourcesManager = ResourcesManager.getInstance();
|
||||
@@ -2358,8 +2330,8 @@ class ContextImpl extends Context {
|
||||
setResources(container.mResources);
|
||||
mDisplay = container.mDisplay;
|
||||
} else {
|
||||
mBasePackageName = packageInfo.mPackageName;
|
||||
ApplicationInfo ainfo = packageInfo.getApplicationInfo();
|
||||
mBasePackageName = loadedApk.mPackageName;
|
||||
ApplicationInfo ainfo = loadedApk.getApplicationInfo();
|
||||
if (ainfo.uid == Process.SYSTEM_UID && ainfo.uid != Process.myUid()) {
|
||||
// Special case: system components allow themselves to be loaded in to other
|
||||
// processes. For purposes of app ops, we must then consider the context as
|
||||
@@ -2382,7 +2354,7 @@ class ContextImpl extends Context {
|
||||
}
|
||||
|
||||
void installSystemApplicationInfo(ApplicationInfo info, ClassLoader classLoader) {
|
||||
mPackageInfo.installSystemApplicationInfo(info, classLoader);
|
||||
mLoadedApk.installSystemApplicationInfo(info, classLoader);
|
||||
}
|
||||
|
||||
final void scheduleFinalCleanup(String who, String what) {
|
||||
@@ -2391,7 +2363,7 @@ class ContextImpl extends Context {
|
||||
|
||||
final void performFinalCleanup(String who, String what) {
|
||||
//Log.i(TAG, "Cleanup up context: " + this);
|
||||
mPackageInfo.removeContextRegistrations(getOuterContext(), who, what);
|
||||
mLoadedApk.removeContextRegistrations(getOuterContext(), who, what);
|
||||
}
|
||||
|
||||
final Context getReceiverRestrictedContext() {
|
||||
|
||||
@@ -31,6 +31,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
|
||||
import android.content.pm.split.SplitDependencyLoader;
|
||||
import android.content.res.AssetManager;
|
||||
import android.content.res.CompatibilityInfo;
|
||||
import android.content.res.Configuration;
|
||||
import android.content.res.Resources;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
@@ -48,15 +49,13 @@ import android.text.TextUtils;
|
||||
import android.util.AndroidRuntimeException;
|
||||
import android.util.ArrayMap;
|
||||
import android.util.Log;
|
||||
import android.util.LogPrinter;
|
||||
import android.util.Slog;
|
||||
import android.util.SparseArray;
|
||||
import android.view.Display;
|
||||
import android.view.DisplayAdjustments;
|
||||
|
||||
import com.android.internal.util.ArrayUtils;
|
||||
|
||||
import dalvik.system.VMRuntime;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
@@ -948,14 +947,78 @@ public final class LoadedApk {
|
||||
throw new AssertionError("null split not found");
|
||||
}
|
||||
|
||||
mResources = ResourcesManager.getInstance().getResources(null, mResDir,
|
||||
splitPaths, mOverlayDirs, mApplicationInfo.sharedLibraryFiles,
|
||||
Display.DEFAULT_DISPLAY, null, getCompatibilityInfo(),
|
||||
mResources = ResourcesManager.getInstance().getResources(
|
||||
null,
|
||||
mResDir,
|
||||
splitPaths,
|
||||
mOverlayDirs,
|
||||
mApplicationInfo.sharedLibraryFiles,
|
||||
Display.DEFAULT_DISPLAY,
|
||||
null,
|
||||
getCompatibilityInfo(),
|
||||
getClassLoader());
|
||||
}
|
||||
return mResources;
|
||||
}
|
||||
|
||||
public Resources getOrCreateResourcesForSplit(@NonNull String splitName,
|
||||
@Nullable IBinder activityToken, int displayId) throws NameNotFoundException {
|
||||
return ResourcesManager.getInstance().getResources(
|
||||
activityToken,
|
||||
mResDir,
|
||||
getSplitPaths(splitName),
|
||||
mOverlayDirs,
|
||||
mApplicationInfo.sharedLibraryFiles,
|
||||
displayId,
|
||||
null,
|
||||
getCompatibilityInfo(),
|
||||
getSplitClassLoader(splitName));
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the top level resources for the given package. Will return an existing
|
||||
* Resources if one has already been created.
|
||||
*/
|
||||
public Resources getOrCreateTopLevelResources(@NonNull ApplicationInfo appInfo) {
|
||||
// Request for this app, short circuit
|
||||
if (appInfo.uid == Process.myUid()) {
|
||||
return getResources();
|
||||
}
|
||||
|
||||
// Get resources for a different package
|
||||
return ResourcesManager.getInstance().getResources(
|
||||
null,
|
||||
appInfo.publicSourceDir,
|
||||
appInfo.splitPublicSourceDirs,
|
||||
appInfo.resourceDirs,
|
||||
appInfo.sharedLibraryFiles,
|
||||
Display.DEFAULT_DISPLAY,
|
||||
null,
|
||||
getCompatibilityInfo(),
|
||||
getClassLoader());
|
||||
}
|
||||
|
||||
public Resources createResources(IBinder activityToken, String splitName,
|
||||
int displayId, Configuration overrideConfig, CompatibilityInfo compatInfo) {
|
||||
final String[] splitResDirs;
|
||||
final ClassLoader classLoader;
|
||||
try {
|
||||
splitResDirs = getSplitPaths(splitName);
|
||||
classLoader = getSplitClassLoader(splitName);
|
||||
} catch (NameNotFoundException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return ResourcesManager.getInstance().getResources(activityToken,
|
||||
mResDir,
|
||||
splitResDirs,
|
||||
mOverlayDirs,
|
||||
mApplicationInfo.sharedLibraryFiles,
|
||||
displayId,
|
||||
overrideConfig,
|
||||
compatInfo,
|
||||
classLoader);
|
||||
}
|
||||
|
||||
public Application makeApplication(boolean forceDefaultAppClass,
|
||||
Instrumentation instrumentation) {
|
||||
if (mApplication != null) {
|
||||
|
||||
Reference in New Issue
Block a user