diff options
| author | 2016-11-04 21:46:11 +0000 | |
|---|---|---|
| committer | 2016-11-04 21:46:16 +0000 | |
| commit | cbc59b8aa620ce6eea50bd787d2daa0d5232fe68 (patch) | |
| tree | e6f4f2d2d8043d47cc6071a6d85aaa0f2afdefc9 | |
| parent | 0995958fa5c09099639fe384c77f002e5f6f0386 (diff) | |
| parent | 45abcf44c5a1735905ec5a481dd396ef3fad6c54 (diff) | |
Merge "Move ephemeral apps into the ephemeral SELinux domain"
| -rw-r--r-- | core/java/android/content/pm/ApplicationInfo.java | 15 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/SELinuxMMAC.java | 8 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/Settings.java | 1 |
3 files changed, 4 insertions, 20 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index ecfc00fc99c8..74ec8e4c32de 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -489,14 +489,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { public static final int PRIVATE_FLAG_DIRECT_BOOT_AWARE = 1 << 6; /** - * Value for {@link #privateFlags}: set to {@code true} if the application - * is AutoPlay. - * - * {@hide} - */ - public static final int PRIVATE_FLAG_AUTOPLAY = 1 << 7; - - /** * When set, at least one component inside this application is direct boot * aware. * @@ -1197,13 +1189,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { /** * @hide */ - public boolean isAutoPlayApp() { - return (privateFlags & ApplicationInfo.PRIVATE_FLAG_AUTOPLAY) != 0; - } - - /** - * @hide - */ public boolean isEphemeralApp() { return (privateFlags & ApplicationInfo.PRIVATE_FLAG_EPHEMERAL) != 0; } diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java index 2176eb164b51..442a4f406e81 100644 --- a/services/core/java/com/android/server/pm/SELinuxMMAC.java +++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java @@ -65,8 +65,8 @@ public final class SELinuxMMAC { // Append privapp to existing seinfo label private static final String PRIVILEGED_APP_STR = ":privapp"; - // Append autoplay to existing seinfo label - private static final String AUTOPLAY_APP_STR = ":autoplayapp"; + // Append ephemeral to existing seinfo label + private static final String EPHEMERAL_APP_STR = ":ephemeralapp"; /** * Load the mac_permissions.xml file containing all seinfo assignments used to @@ -281,8 +281,8 @@ public final class SELinuxMMAC { } } - if (pkg.applicationInfo.isAutoPlayApp()) - pkg.applicationInfo.seinfo += AUTOPLAY_APP_STR; + if (pkg.applicationInfo.isEphemeralApp()) + pkg.applicationInfo.seinfo += EPHEMERAL_APP_STR; if (pkg.applicationInfo.isPrivilegedApp()) pkg.applicationInfo.seinfo += PRIVILEGED_APP_STR; diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 6d514e402fa7..42cc3a83c3d7 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -4263,7 +4263,6 @@ final class Settings { ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS, "HAS_DOMAIN_URLS", ApplicationInfo.PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE, "DEFAULT_TO_DEVICE_PROTECTED_STORAGE", ApplicationInfo.PRIVATE_FLAG_DIRECT_BOOT_AWARE, "DIRECT_BOOT_AWARE", - ApplicationInfo.PRIVATE_FLAG_AUTOPLAY, "AUTOPLAY", ApplicationInfo.PRIVATE_FLAG_PARTIALLY_DIRECT_BOOT_AWARE, "PARTIALLY_DIRECT_BOOT_AWARE", ApplicationInfo.PRIVATE_FLAG_EPHEMERAL, "EPHEMERAL", ApplicationInfo.PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER, "REQUIRED_FOR_SYSTEM_USER", |