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

Run the SELinux wallpaper restorecon operations on all users

Browse Source 
And only run them once per device boot lifetime.

Bug 30229410

Change-Id: Ia6f7f7eea7f8985c83b531dfa16e96d08235b901
This commit is contained in:
Christopher Tate
2016-07-20 15:10:18 -07:00
parent 50805412c8
commit 38a5dc33a9
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -487,6 +487,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
final SparseArray<WallpaperData> mWallpaperMap = new SparseArray<WallpaperData>();
final SparseArray<WallpaperData> mLockWallpaperMap = new SparseArray<WallpaperData>();
final SparseArray<Boolean> mUserRestorecon = new SparseArray<Boolean>();
int mCurrentUserId;
static class WallpaperData {
@@ -944,26 +945,32 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
void onUnlockUser(final int userId) {
synchronized (mLock) {
if (mCurrentUserId == userId && mWaitingForUnlock) {
switchUser(userId, null);
if (mCurrentUserId == userId) {
if (mWaitingForUnlock) {
// If we're switching users, now is when we transition the wallpaper
switchUser(userId, null);
}
// Make sure that the SELinux labeling of all the relevant files is correct.
// This corrects for mislabeling bugs that might have arisen from move-to
// operations involving the wallpaper files. This isn't timing-critical,
// so we do it in the background to avoid holding up the user unlock operation.
Runnable relabeler = new Runnable() {
@Override
public void run() {
final File wallpaperDir = getWallpaperDir(userId);
for (String filename : sPerUserFiles) {
File f = new File(wallpaperDir, filename);
if (f.exists()) {
SELinux.restorecon(f);
if (mUserRestorecon.get(userId) != Boolean.TRUE) {
mUserRestorecon.put(userId, Boolean.TRUE);
Runnable relabeler = new Runnable() {
@Override
public void run() {
final File wallpaperDir = getWallpaperDir(userId);
for (String filename : sPerUserFiles) {
File f = new File(wallpaperDir, filename);
if (f.exists()) {
SELinux.restorecon(f);
}
}
}
}
};
BackgroundThread.getHandler().post(relabeler);
};
BackgroundThread.getHandler().post(relabeler);
}
}
}
}