diff options
| author | Mårten Kongstad <marten.kongstad@sony.com> | 2017-08-31 22:03:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-31 22:03:11 +0000 |
| commit | 4f4a3414028e97810af191a3628ec03ce0c3a609 (patch) | |
| tree | 6194b0f277c2a3385dd31230a8eead9f112f2e40 /core/java | |
| parent | b32153e3d2be154b36354765966da4c275f1620e (diff) | |
| parent | 38f0f5687f2e375f478e9c1732e9542e532ccb3c (diff) | |
Merge changes I7218f17a,I96b7340a am: 111c955d1d am: 96e763fe71
am: 38f0f5687f
Change-Id: I8d3c46d10463f4c64f7ef96006c31c1343710f53
Diffstat (limited to 'core/java')
| -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"); |