summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-04-15 17:54:34 -0700
committerDeepanshu Gupta <deepanshu@google.com>2015-04-16 12:00:30 -0700
commiteca0b3d9ec1cff4ee1d1a0dc41ef4c0f482033f8 (patch)
tree83c1acdfe55c71e37a83ec4582c93eac7e835c34 /tools/layoutlib
parentcd6e00c6d973af350f4bb0de5d85fed7e299d9e8 (diff)
downloadframeworks_base-eca0b3d9ec1cff4ee1d1a0dc41ef4c0f482033f8.zip
frameworks_base-eca0b3d9ec1cff4ee1d1a0dc41ef4c0f482033f8.tar.gz
frameworks_base-eca0b3d9ec1cff4ee1d1a0dc41ef4c0f482033f8.tar.bz2
Nullity annotations to some tests.
Change-Id: I2939d7fab30f3b8fe32f2fdf720c630d677373ff
Diffstat (limited to 'tools/layoutlib')
-rw-r--r--tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
index ac23564..1ddc83e 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
@@ -261,7 +261,7 @@ public class Main {
new ResourceRepository(new FolderWrapper(TEST_RES_DIR + APP_TEST_RES), false) {
@NonNull
@Override
- protected ResourceItem createResourceItem(String name) {
+ protected ResourceItem createResourceItem(@NonNull String name) {
return new ResourceItem(name);
}
};
@@ -381,17 +381,17 @@ public class Main {
}
@Override
- public void warning(String msgFormat, Object... args) {
+ public void warning(@NonNull String msgFormat, Object... args) {
failWithMsg(msgFormat, args);
}
@Override
- public void info(String msgFormat, Object... args) {
+ public void info(@NonNull String msgFormat, Object... args) {
// pass.
}
@Override
- public void verbose(String msgFormat, Object... args) {
+ public void verbose(@NonNull String msgFormat, Object... args) {
// pass.
}
};
@@ -399,7 +399,7 @@ public class Main {
return mLogger;
}
- private static void failWithMsg(String msgFormat, Object... args) {
- fail(msgFormat == null || args == null ? "" : String.format(msgFormat, args));
+ private static void failWithMsg(@NonNull String msgFormat, Object... args) {
+ fail(args == null ? "" : String.format(msgFormat, args));
}
}