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

Make sure SELinux labels are correct after move-to operations

Browse Source 
am: fa7d97fa15

Change-Id: Ib4f969a5a2ed7ffbcf6dd0f3cfbb0e5f576585a2
This commit is contained in:
Christopher Tate
2016-07-01 00:29:22 +00:00
committed by android-build-merger
parent 34f01b83d8 fa7d97fa15
commit 4b96358fcb
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -229,10 +229,12 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
if (moved && lockWallpaperChanged) {
// We just migrated sys -> lock to preserve imagery for an impending
// new system-only wallpaper. Tell keyguard about it but that's it.
// new system-only wallpaper. Tell keyguard about it and make sure it
// has the right SELinux label.
if (DEBUG) {
Slog.i(TAG, "Sys -> lock MOVED_TO");
}
SELinux.restorecon(changedFile);
notifyLockWallpaperChanged();
return;
}
@@ -254,9 +256,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
if (moved) {
// This is a restore, so generate the crop using any just-restored new
// crop guidelines, making sure to preserve our local dimension hints.
// We also make sure to reapply the correct SELinux label.
if (DEBUG) {
Slog.v(TAG, "moved-to, therefore restore; reloading metadata");
}
SELinux.restorecon(changedFile);
loadSettingsLocked(wallpaper.userId, true);
}
generateCrop(wallpaper);