Merge "Fix issue #9925269: Naver app crashes on launch" (c0dfee29) · Commits · e / os / android_frameworks_base

core/java/android/app/ContextImpl.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.app;

		import android.os.Build;
		import com.android.internal.policy.PolicyManager;
		import com.android.internal.util.Preconditions;

		@@ -706,6 +707,16 @@ class ContextImpl extends Context {
		sSharedPrefs.put(packageName, packagePrefs);
		}

		// 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 <
		Build.VERSION_CODES.KEY_LIME_PIE) {
		if (name == null) {
		name = "null";
		}
		}

		sp = packagePrefs.get(name);
		if (sp == null) {
		File prefsFile = getSharedPrefsFile(name);