Merge "Minor LoadedApk refactoring." (e6fee297) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+84 −84

Original line number	Diff line number	Diff line
		@@ -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(

core/java/android/app/Application.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

core/java/android/app/ApplicationPackageManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

core/java/android/app/ContextImpl.java

+91 −119

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/LoadedApk.java

+69 −6

File changed.

Preview size limit exceeded, changes collapsed.