Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev am: e002f44005 (995b2688) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+15 −10

Original line number	Diff line number	Diff line
		@@ -5732,6 +5732,7 @@ public final class ActivityThread {
		// probably end up doing the same disk access.
		Application app;
		final StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskWrites();
		final StrictMode.ThreadPolicy writesAllowedPolicy = StrictMode.getThreadPolicy();
		try {
		// If the app is being launched for full backup or restore, bring it up in
		// a restricted environment with the base application class.
		@@ -5759,10 +5760,6 @@ public final class ActivityThread {
		"Exception thrown in onCreate() of "
		+ data.instrumentationName + ": " + e.toString(), e);
		}
		} finally {
		StrictMode.setThreadPolicy(savedPolicy);
		}

		try {
		mInstrumentation.callApplicationOnCreate(app);
		} catch (Exception e) {
		@@ -5772,6 +5769,14 @@ public final class ActivityThread {
		+ ": " + e.toString(), e);
		}
		}
		} finally {
		// If the app targets < O-MR1, or doesn't change the thread policy
		// during startup, clobber the policy to maintain behavior of b/36951662
		if (data.appInfo.targetSdkVersion <= Build.VERSION_CODES.O
		\|\| StrictMode.getThreadPolicy().equals(writesAllowedPolicy)) {
		StrictMode.setThreadPolicy(savedPolicy);
		}
		}

		// Preload fonts resources
		FontsContract.setApplicationContextForResources(appContext);