diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-08-31 12:12:28 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-08-31 15:33:21 -0700 |
| commit | 61f57379ca2c5b6290c8da7548fa17128f7ab24f (patch) | |
| tree | 1aadc5b172ecf5689455e03e5ab635b709d5021f /core/java/android/app/backup | |
| parent | 00453e7a0182b50cf01e65c97650b526284fe084 (diff) | |
| download | frameworks_base-61f57379ca2c5b6290c8da7548fa17128f7ab24f.zip frameworks_base-61f57379ca2c5b6290c8da7548fa17128f7ab24f.tar.gz frameworks_base-61f57379ca2c5b6290c8da7548fa17128f7ab24f.tar.bz2 | |
Centralize the creation of the user system directory
Environment.getUserSystemDirectory(int userId)
Use it all relevant places that was hardcoding it.
Also, wipe out the user's system directory when user is removed, otherwise old state
might be transferred to a new user.
Change-Id: I788ce9c4cf9624229e65efa7047bc0c019ccef0a
Diffstat (limited to 'core/java/android/app/backup')
| -rw-r--r-- | core/java/android/app/backup/WallpaperBackupHelper.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/core/java/android/app/backup/WallpaperBackupHelper.java b/core/java/android/app/backup/WallpaperBackupHelper.java index a74a268..9e8ab2c 100644 --- a/core/java/android/app/backup/WallpaperBackupHelper.java +++ b/core/java/android/app/backup/WallpaperBackupHelper.java @@ -20,7 +20,9 @@ import android.app.WallpaperManager; import android.content.Context; import android.graphics.BitmapFactory; import android.graphics.Point; +import android.os.Environment; import android.os.ParcelFileDescriptor; +import android.os.UserHandle; import android.util.Slog; import android.view.Display; import android.view.WindowManager; @@ -39,8 +41,12 @@ public class WallpaperBackupHelper extends FileBackupHelperBase implements Backu // This path must match what the WallpaperManagerService uses // TODO: Will need to change if backing up non-primary user's wallpaper - public static final String WALLPAPER_IMAGE = "/data/system/users/0/wallpaper"; - public static final String WALLPAPER_INFO = "/data/system/users/0/wallpaper_info.xml"; + public static final String WALLPAPER_IMAGE = + new File(Environment.getUserSystemDirectory(UserHandle.USER_OWNER), + "wallpaper").getAbsolutePath(); + public static final String WALLPAPER_INFO = + new File(Environment.getUserSystemDirectory(UserHandle.USER_OWNER), + "wallpaper_info.xml").getAbsolutePath(); // Use old keys to keep legacy data compatibility and avoid writing two wallpapers public static final String WALLPAPER_IMAGE_KEY = "/data/data/com.android.settings/files/wallpaper"; @@ -50,7 +56,9 @@ public class WallpaperBackupHelper extends FileBackupHelperBase implements Backu // will be saved to this file from the restore stream, then renamed to the proper // location if it's deemed suitable. // TODO: Will need to change if backing up non-primary user's wallpaper - private static final String STAGE_FILE = "/data/system/users/0/wallpaper-tmp"; + private static final String STAGE_FILE = + new File(Environment.getUserSystemDirectory(UserHandle.USER_OWNER), + "wallpaper-tmp").getAbsolutePath(); Context mContext; String[] mFiles; |