drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev

Browse Source 
* commit '4624107185135db9db6bfbfb3d0c3a0951c19ee1':
  Nullity annotations to some tests.
This commit is contained in:
Deepanshu Gupta
2015-05-07 00:08:22 +00:00
committed by Android Git Automerger
parent b19325be07 4624107185
commit cae76a70bf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
View File

@ -261,7 +261,7 @@ public class Main {
new ResourceRepository(new FolderWrapper(TEST_RES_DIR + APP_TEST_RES), false) { new ResourceRepository(new FolderWrapper(TEST_RES_DIR + APP_TEST_RES), false) {
@NonNull @NonNull
@Override @Override
protected ResourceItem createResourceItem(String name) { protected ResourceItem createResourceItem(@NonNull String name) {
return new ResourceItem(name); return new ResourceItem(name);
} }
}; };
@ -381,17 +381,17 @@ public class Main {
} }
@Override @Override
public void warning(String msgFormat, Object... args) { public void warning(@NonNull String msgFormat, Object... args) {
failWithMsg(msgFormat, args); failWithMsg(msgFormat, args);
} }
@Override @Override
public void info(String msgFormat, Object... args) { public void info(@NonNull String msgFormat, Object... args) {
// pass. // pass.
} }
@Override @Override
public void verbose(String msgFormat, Object... args) { public void verbose(@NonNull String msgFormat, Object... args) {
// pass. // pass.
} }
}; };
@ -399,7 +399,7 @@ public class Main {
return mLogger; return mLogger;
} }
private static void failWithMsg(String msgFormat, Object... args) { private static void failWithMsg(@NonNull String msgFormat, Object... args) {
fail(msgFormat == null || args == null ? "" : String.format(msgFormat, args)); fail(args == null ? "" : String.format(msgFormat, args));
} }
} }