Wrap StrictMode changes in try/finally. (6bff62c2) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+28 −28

Original line number	Original line	Diff line number	Diff line
	@@ -3986,12 +3986,11 @@ public final class ActivityThread {
	dalvik.system.VMRuntime.getRuntime().clearGrowthLimit();		dalvik.system.VMRuntime.getRuntime().clearGrowthLimit();
	}		}

	// allow disk access during application and provider setup. this could		// Allow disk access during application and provider setup. This could
	// block processing ordered broadcasts, but later processing would		// block processing ordered broadcasts, but later processing would
	// probably end up doing the same disk access. restore not guarded with		// probably end up doing the same disk access.
	// finally block, since exceptions here will take down the application.
	final StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskWrites();		final StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskWrites();
			try {
	// If the app is being launched for full backup or restore, bring it up in		// If the app is being launched for full backup or restore, bring it up in
	// a restricted environment with the base application class.		// a restricted environment with the base application class.
	Application app = data.info.makeApplication(data.restrictedBackupMode, null);		Application app = data.info.makeApplication(data.restrictedBackupMode, null);
	@@ -4018,9 +4017,10 @@ public final class ActivityThread {
	+ ": " + e.toString(), e);		+ ": " + e.toString(), e);
	}		}
	}		}
			} finally {
	StrictMode.setThreadPolicy(savedPolicy);		StrictMode.setThreadPolicy(savedPolicy);
	}		}
			}

	/package/ final void finishInstrumentation(int resultCode, Bundle results) {		/package/ final void finishInstrumentation(int resultCode, Bundle results) {
	IActivityManager am = ActivityManagerNative.getDefault();		IActivityManager am = ActivityManagerNative.getDefault();