drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."

Browse Source 
* commit '3b2a9d22794cb9f1c2a28884b5c3ba92ecc6ff96':
  Change when the SELinux relabel of /data/data occurs.
This commit is contained in:
Nick Kralevich
2014-03-31 20:14:37 +00:00
committed by Android Git Automerger
parent b11952d6f6 3b2a9d2279
commit e531e2ec6b
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/pm/Installer.java
View File

@ -397,7 +397,14 @@ public final class Installer {
return execute(builder.toString()); return execute(builder.toString());
} }
public boolean restoreconData() { public boolean restoreconData(String pkgName, String seinfo, int uid) {
return (execute("restorecondata") == 0); StringBuilder builder = new StringBuilder("restorecondata");
builder.append(' ');
builder.append(pkgName);
builder.append(' ');
builder.append(seinfo != null ? seinfo : "!");
builder.append(' ');
builder.append(uid);
return (execute(builder.toString()) == 0);
} }
} }

19
services/java/com/android/server/pm/PackageManagerService.java
View File

@ -393,6 +393,9 @@ public class PackageManagerService extends IPackageManager.Stub {
// If mac_permissions.xml was found for seinfo labeling. // If mac_permissions.xml was found for seinfo labeling.
boolean mFoundPolicyFile; boolean mFoundPolicyFile;
// If a recursive restorecon of /data/data/<pkg> is needed.
private boolean mShouldRestoreconData = SELinuxMMAC.shouldRestorecon();
// All available activities, for your resolving pleasure. // All available activities, for your resolving pleasure.
final ActivityIntentResolver mActivities = final ActivityIntentResolver mActivities =
new ActivityIntentResolver(); new ActivityIntentResolver();
@ -1486,13 +1489,6 @@ public class PackageManagerService extends IPackageManager.Stub {
// can downgrade to reader // can downgrade to reader
mSettings.writeLPr(); mSettings.writeLPr();
if (SELinuxMMAC.shouldRestorecon()) {
Slog.i(TAG, "Relabeling of /data/data and /data/user issued.");
if (mInstaller.restoreconData()) {
SELinuxMMAC.setRestoreconDone();
}
}
EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_PMS_READY, EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_PMS_READY,
SystemClock.uptimeMillis()); SystemClock.uptimeMillis());
@ -4617,6 +4613,11 @@ public class PackageManagerService extends IPackageManager.Stub {
} }
} }
pkg.applicationInfo.dataDir = dataPath.getPath(); pkg.applicationInfo.dataDir = dataPath.getPath();
if (mShouldRestoreconData) {
Slog.i(TAG, "SELinux relabeling of " + pkg.packageName + " issued.");
mInstaller.restoreconData(pkg.packageName, pkg.applicationInfo.seinfo,
pkg.applicationInfo.uid);
}
} else { } else {
if (DEBUG_PACKAGE_SCANNING) { if (DEBUG_PACKAGE_SCANNING) {
if ((parseFlags & PackageParser.PARSE_CHATTY) != 0) if ((parseFlags & PackageParser.PARSE_CHATTY) != 0)
@ -11062,6 +11063,10 @@ public class PackageManagerService extends IPackageManager.Stub {
*/ */
public void scanAvailableAsecs() { public void scanAvailableAsecs() {
updateExternalMediaStatusInner(true, false, false); updateExternalMediaStatusInner(true, false, false);
if (mShouldRestoreconData) {
SELinuxMMAC.setRestoreconDone();
mShouldRestoreconData = false;
}
} }
/* /*