aboutsummaryrefslogtreecommitdiffstats
path: root/manifmerger/src
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2012-06-01 12:30:27 -0700
committerTor Norbye <tnorbye@google.com>2012-06-01 12:30:40 -0700
commit764d9297c9631f239c8ebafc64edc77db80ce3c2 (patch)
tree1dbb7699938ee055ca7de96dfbba41e45c0571eb /manifmerger/src
parent87ab6d594ec7e4ba4010ec8b090c43ba29317694 (diff)
downloadsdk-764d9297c9631f239c8ebafc64edc77db80ce3c2.zip
sdk-764d9297c9631f239c8ebafc64edc77db80ce3c2.tar.gz
sdk-764d9297c9631f239c8ebafc64edc77db80ce3c2.tar.bz2
Fix warnings
First, update our various project-specific Eclipse compiler settings configuration files to include the new Eclipse 4 flags. Second, turn off the "Unchecked conversion from non-annotated type to @NonNull" warnings; there are hundreds or thousands of these, and there isn't much we can do about them when they're coming from platform and library APIs. Third, make the lint projects warning-clean again by addressing various warnings Eclipse found (such as some unclosed resources and some null handling issues; yesterday's null annotation fixes only addressed errors, not warnings.) Change-Id: If75f7401a1cbeef1bf58b47ccaa9ad17bede7f91
Diffstat (limited to 'manifmerger/src')
-rwxr-xr-xmanifmerger/src/com/android/manifmerger/XmlUtils.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/manifmerger/src/com/android/manifmerger/XmlUtils.java b/manifmerger/src/com/android/manifmerger/XmlUtils.java
index ed5b8a8..93df59c 100755
--- a/manifmerger/src/com/android/manifmerger/XmlUtils.java
+++ b/manifmerger/src/com/android/manifmerger/XmlUtils.java
@@ -195,7 +195,6 @@ class XmlUtils {
* @param xmlNode Any node from a document returned by {@link #parseDocument(File, ISdkLog)}.
* @return The line number if found or 0.
*/
- @Nullable
static int extractLineNumber(@Nullable Node xmlNode) {
if (xmlNode != null) {
Object data = xmlNode.getUserData(DATA_LINE_NUMBER);