Snap for 5817401 from cc4b685d3efcb73eba2977900af2734c2bfc6daf to qt-c2f2-release

Change-Id: I885afa1bd4ea33f63e74aab4db20014302e60c6f
diff --git a/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java b/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java
index 534a1c8..b76d1b4 100644
--- a/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java
+++ b/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java
@@ -339,19 +339,14 @@
          // Get path for the file on external storage.  If external
          // storage is not currently mounted this will fail.
          File file = new File(getExternalFilesDir(null), "DemoFile.jpg");
-         if (file != null) {
-             file.delete();
-         }
+         file.delete();
      }
 
      boolean hasExternalStoragePrivateFile() {
          // Get path for the file on external storage.  If external
          // storage is not currently mounted this will fail.
          File file = new File(getExternalFilesDir(null), "DemoFile.jpg");
-         if (file != null) {
-             return file.exists();
-         }
-         return false;
+         return file.exists();
      }
  // END_INCLUDE(private_file)