Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e8ec89c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge \"Cleanup whole preloads directory\" into nyc-mr1-dev am:... 

Merge "Merge \"Cleanup whole preloads directory\" into nyc-mr1-dev am: 243d7b3c" into nyc-mr1-dev-plus-aosp
parents be79aaa5 db39be2b

services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java

+4 −4
Original line number Diff line number Diff line
@@ -231,8 +231,8 @@ public class RetailDemoModeService extends SystemService { 
                BackgroundThread.getHandler().post(new Runnable() {

                    @Override

                    public void run() {

                        if (!deleteDemoFolderContents()) {

                            Slog.w(TAG, "Failed to delete demo folder contents");

                        if (!deletePreloadsFolderContents()) {

                            Slog.w(TAG, "Failed to delete preloads folder contents");

                        }

                    }

                });
@@ -388,8 +388,8 @@ public class RetailDemoModeService extends SystemService { 
                getContext().getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0) != 0;

    }



    private boolean deleteDemoFolderContents() {

        final File dir = Environment.getDataPreloadsDemoDirectory();

    private boolean deletePreloadsFolderContents() {

        final File dir = Environment.getDataPreloadsDirectory();

        Slog.i(TAG, "Deleting contents of " + dir);

        return FileUtils.deleteContents(dir);

    }