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

Commit 51148a6b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "AppOps: Add BOOT_COMPLETED operation."

parents 87515305 c06c13e0

core/java/android/app/AppOpsManager.java

+10 −1
Original line number Diff line number Diff line
@@ -207,7 +207,9 @@ public class AppOpsManager { 
    /** @hide */

    public static final int OP_WRITE_MMS = 48;

    /** @hide */

    public static final int _NUM_OP = 49;

    public static final int OP_BOOT_COMPLETED = 49;

    /** @hide */

    public static final int _NUM_OP = 50;



    /** Access to coarse location information. */

    public static final String OPSTR_COARSE_LOCATION =
@@ -280,6 +282,7 @@ public class AppOpsManager { 
            OP_SEND_MMS,

            OP_READ_MMS,

            OP_WRITE_MMS,

            OP_BOOT_COMPLETED,

    };



    /**
@@ -336,6 +339,7 @@ public class AppOpsManager { 
            null,

            null,

            null,

            null,

    };



    /**
@@ -392,6 +396,7 @@ public class AppOpsManager { 
            "SEND_MMS",

            "READ_MMS",

            "WRITE_MMS",

            "BOOT_COMPLETED",

    };



    /**
@@ -448,6 +453,7 @@ public class AppOpsManager { 
            android.Manifest.permission.SEND_SMS,

            android.Manifest.permission.READ_SMS,

            android.Manifest.permission.WRITE_SMS,

            android.Manifest.permission.RECEIVE_BOOT_COMPLETED,

    };



    /**
@@ -503,6 +509,7 @@ public class AppOpsManager { 
            AppOpsManager.MODE_ALLOWED, // OP_SEND_MMS

            AppOpsManager.MODE_ALLOWED, // OP_READ_MMS

            AppOpsManager.MODE_ALLOWED, // OP_WRITE_MMS

            AppOpsManager.MODE_ALLOWED, // OP_BOOT_COMPLETED

    };



    /**
@@ -558,6 +565,7 @@ public class AppOpsManager { 
            AppOpsManager.MODE_ASK,     // OP_SEND_MMS

            AppOpsManager.MODE_ASK,     // OP_READ_MMS

            AppOpsManager.MODE_ASK,     // OP_WRITE_MMS

            AppOpsManager.MODE_ALLOWED, // OP_BOOT_COMPLETED

    };
@@ -618,6 +626,7 @@ public class AppOpsManager { 
            false,

            false,

            false,

            false,

    };



    private static HashMap<String, Integer> sOpStrToOp = new HashMap<String, Integer>();

core/res/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -1389,6 +1389,7 @@ 
        <item>Trying to send MMS</item>

        <item>Trying to read MMS</item>

        <item>Trying to write MMS</item>

        <item>Trying to start at bootup</item>

    </string-array>



    <!-- Configuration to restart radio upon PDP_DEACTIVATE with

services/java/com/android/server/am/ActivityManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -5212,7 +5212,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                                },

                                0, null, null,

                                android.Manifest.permission.RECEIVE_BOOT_COMPLETED,

                                AppOpsManager.OP_NONE, true, false, MY_PID, Process.SYSTEM_UID,

                                AppOpsManager.OP_BOOT_COMPLETED, true, false, MY_PID, Process.SYSTEM_UID,

                                userId);

                    }

                }
@@ -16346,7 +16346,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                intent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT);

                broadcastIntentLocked(null, null, intent,

                        null, null, 0, null, null,

                        android.Manifest.permission.RECEIVE_BOOT_COMPLETED, AppOpsManager.OP_NONE,

                        android.Manifest.permission.RECEIVE_BOOT_COMPLETED, AppOpsManager.OP_BOOT_COMPLETED,

                        true, false, MY_PID, Process.SYSTEM_UID, userId);

            }

            int num = mUserLru.size();