diff options
| author | Mårten Kongstad <marten.kongstad@sony.com> | 2017-08-31 21:53:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-31 21:53:08 +0000 |
| commit | 38f0f5687f2e375f478e9c1732e9542e532ccb3c (patch) | |
| tree | 969e2d38bc543f41df54c9e7fcc6ad269acb86ac /core/java/android | |
| parent | b361ec15e42025bf27b38fdd8dbd73a1585942f9 (diff) | |
| parent | 96e763fe71b4d4a0615fe4d68de1de48f4794d59 (diff) | |
Merge changes I7218f17a,I96b7340a am: 111c955d1d
am: 96e763fe71
Change-Id: I21e3d230c91a76b77287d13c93a87db2f197e7d7
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ResourcesManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java index 595ecd201e57..fb11272d7e62 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -964,7 +964,7 @@ public class ResourcesManager { // TODO(adamlesinski): Make this accept more than just overlay directories. final void applyNewResourceDirsLocked(@NonNull final String baseCodePath, - @NonNull final String[] newResourceDirs) { + @Nullable final String[] newResourceDirs) { try { Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, "ResourcesManager#applyNewResourceDirsLocked"); |