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

Commit 33dc61f5 authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

Cleanup whole preloads directory 

When leaving SUW, cleanup preloads directory, not just demo dir.

Bug: 29908713
Change-Id: Id94e6df619f5ca6585b2a0edb0f1028364431f95
parent 60f3c358

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);

    }