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

Commit 38cde617 authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "ActivityManager#killBackgroundProcesses can kill caller's own app only"

parents ff347a1b e8979d4c

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ package android { 
    field public static final String INTERACT_ACROSS_USERS_FULL = "android.permission.INTERACT_ACROSS_USERS_FULL";

    field public static final String INTERNAL_SYSTEM_WINDOW = "android.permission.INTERNAL_SYSTEM_WINDOW";

    field public static final String INVOKE_CARRIER_SETUP = "android.permission.INVOKE_CARRIER_SETUP";

    field public static final String KILL_ALL_BACKGROUND_PROCESSES = "android.permission.KILL_ALL_BACKGROUND_PROCESSES";

    field public static final String KILL_UID = "android.permission.KILL_UID";

    field public static final String LAUNCH_DEVICE_MANAGER_SETUP = "android.permission.LAUNCH_DEVICE_MANAGER_SETUP";

    field public static final String LOCAL_MAC_ADDRESS = "android.permission.LOCAL_MAC_ADDRESS";

core/java/android/app/ActivityManager.java

+4 −0
Original line number Diff line number Diff line
@@ -3953,6 +3953,10 @@ public class ActivityManager { 
     * processes to reclaim memory; the system will take care of restarting

     * these processes in the future as needed.

     *

     * <p>On devices with a {@link Build.VERSION#SECURITY_PATCH} of 2022-12-01 or greater,

     * third party applications can only use this API to kill their own processes.

     * </p>

     *

     * @param packageName The name of the package whose processes are to

     * be killed.

     */

core/res/AndroidManifest.xml

+17 −0
Original line number Diff line number Diff line
@@ -3170,6 +3170,13 @@ 


    <!-- Allows an application to call

        {@link android.app.ActivityManager#killBackgroundProcesses}.

        <p>As of Android version {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE},

        the {@link android.app.ActivityManager#killBackgroundProcesses} is no longer available to

        third party applications. For backwards compatibility, the background processes of the

        caller's own package will still be killed when calling this API. If the caller has

        the system permission {@code KILL_ALL_BACKGROUND_PROCESSES}, other processes will be

        killed too.



         <p>Protection level: normal

    -->

    <permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"
@@ -3177,6 +3184,16 @@ 
        android:description="@string/permdesc_killBackgroundProcesses"

        android:protectionLevel="normal" />



    <!-- @SystemApi @hide Allows an application to call

        {@link android.app.ActivityManager#killBackgroundProcesses}

        to kill background processes of other apps.

         <p>Not for use by third-party applications.

    -->

    <permission android:name="android.permission.KILL_ALL_BACKGROUND_PROCESSES"

        android:label="@string/permlab_killBackgroundProcesses"

        android:description="@string/permdesc_killBackgroundProcesses"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi @hide Allows an application to query process states and current

         OOM adjustment scores.

         <p>Not for use by third-party applications. -->

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ applications that come with the platform 
        <permission name="android.permission.INSTALL_LOCATION_PROVIDER"/>

        <permission name="android.permission.INSTALL_PACKAGES"/>

        <permission name="android.permission.INSTALL_PACKAGE_UPDATES"/>

        <permission name="android.permission.KILL_ALL_BACKGROUND_PROCESSES"/>

        <!-- Needed for test only -->

        <permission name="android.permission.ACCESS_MTP"/>

        <!-- Needed for test only -->

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ 
    <uses-permission android:name="android.permission.CONTROL_UI_TRACING" />

    <uses-permission android:name="android.permission.SIGNAL_PERSISTENT_PROCESSES" />

    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />

    <uses-permission android:name="android.permission.KILL_ALL_BACKGROUND_PROCESSES" />

    <!-- Internal permissions granted to the shell. -->

    <uses-permission android:name="android.permission.FORCE_BACK" />

    <uses-permission android:name="android.permission.BATTERY_STATS" />