Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45abcf44 authored by Chad Brubaker's avatar Chad Brubaker
Browse files

Move ephemeral apps into the ephemeral SELinux domain 

This also removes AutoplayApp which was the previous (ununsed) N domain
and flag for ephemeral apps.
Test: Ephemeral apps now run in ephemeral_app
Change-Id: Ie339885c3996acbdcfe12452daa1d5edb3b93cda
parent 56f823be

core/java/android/content/pm/ApplicationInfo.java

+0 −15
Original line number Diff line number Diff line
@@ -488,14 +488,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.
@@ -1180,13 +1172,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        return (privateFlags & ApplicationInfo.PRIVATE_FLAG_PARTIALLY_DIRECT_BOOT_AWARE) != 0;

    }



    /**

     * @hide

     */

    public boolean isAutoPlayApp() {

        return (privateFlags & ApplicationInfo.PRIVATE_FLAG_AUTOPLAY) != 0;

    }



    /**

     * @hide

     */

services/core/java/com/android/server/pm/SELinuxMMAC.java

+4 −4
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/pm/Settings.java

+0 −1
Original line number Diff line number Diff line
@@ -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",