diff options
| author | Nick Kralevich <nnk@google.com> | 2014-02-12 14:05:30 -0800 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2014-02-12 14:08:06 -0800 |
| commit | 1cbea39fe1740d7d1c3e4aa0e4771a99a56c79ef (patch) | |
| tree | 609e7c7ad6a58d44191de97af33a11d9a5e1c78d /core/java/android/app/LoadedApk.java | |
| parent | 7594767e55e011101ed9341f01d40730fdbd4cc7 (diff) | |
| parent | dd3d95f182a634acdcc1b1e8e4954234d048eb54 (diff) | |
| download | frameworks_base-1cbea39fe1740d7d1c3e4aa0e4771a99a56c79ef.zip frameworks_base-1cbea39fe1740d7d1c3e4aa0e4771a99a56c79ef.tar.gz frameworks_base-1cbea39fe1740d7d1c3e4aa0e4771a99a56c79ef.tar.bz2 | |
resolved conflicts for merge of dd3d95f1 to klp-volantis-dev
Change-Id: I96c0f0da852a0b3cf8aef9158678d38aa30f456f
Diffstat (limited to 'core/java/android/app/LoadedApk.java')
| -rw-r--r-- | core/java/android/app/LoadedApk.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 4239a5d..0115d1b 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -76,6 +76,7 @@ public final class LoadedApk { final String mPackageName; private final String mAppDir; private final String mResDir; + private final String[] mOverlayDirs; private final String[] mSharedLibraries; private final String mDataDir; private final String mLibDir; @@ -120,6 +121,7 @@ public final class LoadedApk { final int myUid = Process.myUid(); mResDir = aInfo.uid == myUid ? aInfo.sourceDir : aInfo.publicSourceDir; + mOverlayDirs = aInfo.resourceDirs; if (!UserHandle.isSameUser(aInfo.uid, myUid) && !Process.isIsolated()) { aInfo.dataDir = PackageManager.getDataDirForUser(UserHandle.getUserId(myUid), mPackageName); @@ -159,6 +161,7 @@ public final class LoadedApk { mPackageName = name; mAppDir = null; mResDir = null; + mOverlayDirs = null; mSharedLibraries = null; mDataDir = null; mDataDirFile = null; @@ -471,6 +474,10 @@ public final class LoadedApk { return mResDir; } + public String[] getOverlayDirs() { + return mOverlayDirs; + } + public String getDataDir() { return mDataDir; } @@ -485,7 +492,7 @@ public final class LoadedApk { public Resources getResources(ActivityThread mainThread) { if (mResources == null) { - mResources = mainThread.getTopLevelResources(mResDir, + mResources = mainThread.getTopLevelResources(mResDir, mOverlayDirs, Display.DEFAULT_DISPLAY, null, this); } return mResources; |