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

Commit 4e2029c0 authored by Svet Ganov's avatar Svet Ganov Committed by Android Git Automerger
Browse files

am 2514a265: am 4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev 

* commit '2514a265':
  Permission UI - legacy apps support
parents b67e298c 2514a265

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ package android { 
    field public static final java.lang.String INTERNET = "android.permission.INTERNET";

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

    field public static final java.lang.String KILL_BACKGROUND_PROCESSES = "android.permission.KILL_BACKGROUND_PROCESSES";

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

    field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";

    field public static final java.lang.String LOOP_RADIO = "android.permission.LOOP_RADIO";

    field public static final java.lang.String MANAGE_ACCOUNTS = "android.permission.MANAGE_ACCOUNTS";
@@ -3670,6 +3671,7 @@ package android.app { 
    method public static boolean isRunningInTestHarness();

    method public static boolean isUserAMonkey();

    method public void killBackgroundProcesses(java.lang.String);

    method public void killUid(int, java.lang.String);

    method public void moveTaskToFront(int, int);

    method public void moveTaskToFront(int, int, android.os.Bundle);

    method public deprecated void restartPackage(java.lang.String);

core/java/android/app/ActivityManager.java

+21 −1
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ 


package android.app;



import android.Manifest;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.graphics.Canvas;

import android.graphics.Matrix;
@@ -26,6 +28,7 @@ import android.os.BatteryStats; 
import android.os.IBinder;

import android.os.ParcelFileDescriptor;



import android.util.Log;

import com.android.internal.app.ProcessStats;

import com.android.internal.os.TransferPipe;

import com.android.internal.util.FastPrintWriter;
@@ -2397,6 +2400,23 @@ public class ActivityManager { 
        }

    }



    /**

     * Kills the specified UID.

     * @param uid The UID to kill.

     * @param reason The reason for the kill.

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.KILL_UID)

    public void killUid(int uid, String reason) {

        try {

            ActivityManagerNative.getDefault().killUid(uid, reason);

        } catch (RemoteException e) {

            Log.e(TAG, "Couldn't kill uid:" + uid, e);

        }

    }



    /**

     * Have the system perform a force stop of everything associated with

     * the given application package.  All processes that share its uid

core/java/android/app/AppOpsManager.java

+2 −1
Original line number Diff line number Diff line
@@ -941,7 +941,8 @@ public class AppOpsManager { 
     * @hide

     */

    public static int permissionToOpCode(String permission) {

        return sPermToOp.get(permission);

        Integer boxedOpCode = sPermToOp.get(permission);

        return boxedOpCode != null ? boxedOpCode : OP_NONE;

    }



    /**

core/java/android/content/pm/IPackageManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -96,9 +96,9 @@ interface IPackageManager { 


    void removePermission(String name);



    boolean grantPermission(String packageName, String permissionName, int userId);

    void grantPermission(String packageName, String permissionName, int userId);



    boolean revokePermission(String packageName, String permissionName, int userId);

    void revokePermission(String packageName, String permissionName, int userId);



    boolean isProtectedBroadcast(String actionName);

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -2433,6 +2433,12 @@ 
    <permission android:name="android.permission.QUERY_DO_NOT_ASK_CREDENTIALS_ON_BOOT"

                android:protectionLevel="signature" />



    <!-- @SystemApi Allows applications to kill UIDs.

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

         @hide -->

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

                android:protectionLevel="signature" />



    <!-- The system process is explicitly the only one allowed to launch the

         confirmation UI for full backup/restore -->

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