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

Commit 9c8cc849 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Start implementing background restrictions for eph apps."

parents db50e0a9 e07641d4

core/java/android/app/ActivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public class ActivityManager { 
        }



        @Override

        public void onUidGone(int uid) {

        public void onUidGone(int uid, boolean disabled) {

            mListener.onUidImportance(uid, RunningAppProcessInfo.IMPORTANCE_GONE);

        }
@@ -111,7 +111,7 @@ public class ActivityManager { 
        }



        @Override

        public void onUidIdle(int uid) {

        public void onUidIdle(int uid, boolean disabled) {

        }

    }

core/java/android/app/IActivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ interface IActivityManager { 
    boolean supportsLocalVoiceInteraction() = 365;

    void notifyPinnedStackAnimationEnded() = 366;

    void removeStack(int stackId) = 367;

    void setLenientBackgroundCheck(boolean enabled) = 368;

    void makePackageIdle(String packageName, int userId) = 368;

    int getMemoryTrimLevel() = 369;

    /**

     * Resizes the pinned stack.

core/java/android/app/IUidObserver.aidl

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ oneway interface IUidObserver { 
    /**

     * Report that there are no longer any processes running for a uid.

     */

    void onUidGone(int uid);

    void onUidGone(int uid, boolean disabled);



    /**

     * Report that a uid is now active (no longer idle).
@@ -37,5 +37,5 @@ oneway interface IUidObserver { 
     * Report that a uid is idle -- it has either been running in the background for

     * a sufficient period of time, or all of its processes have gone away.

     */

    void onUidIdle(int uid);

    void onUidIdle(int uid, boolean disabled);

}

core/java/android/content/pm/PackageManagerInternal.java

+6 −0
Original line number Diff line number Diff line
@@ -161,6 +161,12 @@ public abstract class PackageManagerInternal { 
     */

    public abstract boolean isPackageDataProtected(int userId, String packageName);



    /**

     * Returns {@code true} if a given package is installed as ephemeral. Otherwise, returns

     * {@code false}.

     */

    public abstract boolean isPackageEphemeral(int userId, String packageName);



    /**

     * Gets whether the package was ever launched.

     * @param packageName The package name.

core/java/android/provider/Settings.java

+0 −7
Original line number Diff line number Diff line
@@ -8628,13 +8628,6 @@ public final class Settings { 
         */

        public static final String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";



        /**

         * @hide

         * If not 0, the activity manager will implement a looser version of background

         * check that is more compatible with existing apps.

         */

        public static final String LENIENT_BACKGROUND_CHECK = "lenient_background_check";



        /**

         * Use Dock audio output for media:

         *      0 = disabled