summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMårten Kongstad <marten.kongstad@sony.com>2017-04-28 13:10:11 +0200
committerMårten Kongstad <marten.kongstad@sony.com>2017-08-31 14:50:10 +0200
commit7a242216a9de2d33007375d0f88cda15b4b3173e (patch)
treec23f40fc815d91ea96c288c9ab42216a333f6ac5 /core/java
parentc903d2e7cdc74bd0573ecfb5f5dd35ee7c90249e (diff)
ResourcesManager: correct @NonNull -> @Nullable
To clear all overlay packages, the caller of ResourcesManager#applyNewResourceDirsLocked will pass in null as the second argument. Fix typo where the argument's annotation misspelled @Nullable as @NonNull. Change-Id: I7218f17ac8f121924e722d3e00d3ebdc4d6f3382
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/ResourcesManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
index 6f326de76150..80554fff75ac 100644
--- a/core/java/android/app/ResourcesManager.java
+++ b/core/java/android/app/ResourcesManager.java
@@ -961,7 +961,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");