Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev am: 2c5cbd4012

am: 0ebf3cc47c

* commit '0ebf3cc47c9d20613f02ca263a2394d80455a09a':
  Clean up demo dir when leaving demo mode

Change-Id: Ib3338a18e75f04e15a1d77a82e5ac1aba246a5bb

core/java/android/os/Environment.java

@@ -323,6 +323,33 @@ public class Environment {
         return new File(getDataUserDeDirectory(volumeUuid, userId), packageName);
     }
 
+    /**
+     * Return preloads directory.
+     * <p>This directory may contain pre-loaded content such as
+     * {@link #getDataPreloadsDemoDirectory() demo videos} and
+     * {@link #getDataPreloadsAppsDirectory() APK files} .
+     * {@hide}
+     */
+    public static File getDataPreloadsDirectory() {
+        return new File(getDataDirectory(), "preloads");
+    }
+
+    /**
+     * @see #getDataPreloadsDirectory()
+     * {@hide}
+     */
+    public static File getDataPreloadsDemoDirectory() {
+        return new File(getDataPreloadsDirectory(), "demo");
+    }
+
+    /**
+     * @see #getDataPreloadsDirectory()
+     * {@hide}
+     */
+    public static File getDataPreloadsAppsDirectory() {
+        return new File(getDataPreloadsDirectory(), "apps");
+    }
+
     /**
      * Return the primary shared/external storage directory. This directory may
      * not currently be accessible if it has been mounted by the user on their