Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup whole preloads directory

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

Bug: 29908713
Change-Id: Id94e6df619f5ca6585b2a0edb0f1028364431f95
This commit is contained in:
Fyodor Kupolov
2016-07-11 14:40:29 -07:00
parent 60f3c35818
commit 33dc61f50e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
View File

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