Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52097a22 authored Aug 20, 2014 by Adam Lesinski Committed by Android (Google) Code Review Aug 16, 2014

Merge "Fix crash when launching Activities in 'android' package" into lmp-dev

parents 16367649 54130de7

core/java/android/app/ResourcesManager.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -178,9 +178,14 @@ public class ResourcesManager {
		//}

		AssetManager assets = new AssetManager();
		// resDir can be null if the 'android' package is creating a new Resources object.
		// This is fine, since each AssetManager automatically loads the 'android' package
		// already.
		if (resDir != null) {
		if (assets.addAssetPath(resDir) == 0) {
		return null;
		}
		}

		if (splitResDirs != null) {
		for (String splitResDir : splitResDirs) {

core/java/android/content/res/ResourcesKey.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -62,8 +62,12 @@ public final class ResourcesKey {
		return false;
		}
		ResourcesKey peer = (ResourcesKey) obj;
		if (!mResDir.equals(peer.mResDir)) {
		if (mResDir != peer.mResDir) {
		if (mResDir == null \|\| peer.mResDir == null) {
		return false;
		} else if (!mResDir.equals(peer.mResDir)) {
		return false;
		}
		}
		if (mDisplayId != peer.mDisplayId) {
		return false;