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

Commit 71264fb2 authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am c27b3fca: Merge "Add SIP app op - framework." into mnc-dev 

* commit 'c27b3fca':
  Add SIP app op - framework.
parents 5eedef96 c27b3fca

core/java/android/app/AppOpsManager.java

+16 −6
Original line number Diff line number Diff line
@@ -217,8 +217,10 @@ public class AppOpsManager { 
    public static final int OP_READ_PHONE_STATE = 51;

    /** @hide Add voicemail messages to the voicemail content provider. */

    public static final int OP_ADD_VOICEMAIL = 52;

    /** @hide Access APIs for SIP calling over VOIP or WiFi. */

    public static final int OP_USE_SIP = 53;

    /** @hide */

    public static final int _NUM_OP = 53;

    public static final int _NUM_OP = 54;



    /** Access to coarse location information. */

    public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
@@ -351,7 +353,8 @@ public class AppOpsManager { 
            OP_ASSIST_STRUCTURE,

            OP_ASSIST_SCREENSHOT,

            OP_READ_PHONE_STATE,

            OP_ADD_VOICEMAIL

            OP_ADD_VOICEMAIL,

            OP_USE_SIP

    };



    /**
@@ -411,6 +414,7 @@ public class AppOpsManager { 
            null,

            null,

            null,

            null,

            null

    };
@@ -471,7 +475,8 @@ public class AppOpsManager { 
            "ASSIST_STRUCTURE",

            "ASSIST_SCREENSHOT",

            "OP_READ_PHONE_STATE",

            "ADD_VOICEMAIL"

            "ADD_VOICEMAIL",

            "USE_SIP"

    };



    /**
@@ -531,7 +536,8 @@ public class AppOpsManager { 
            null, // no permission for receiving assist structure

            null, // no permission for receiving assist screenshot

            Manifest.permission.READ_PHONE_STATE,

            Manifest.permission.ADD_VOICEMAIL

            Manifest.permission.ADD_VOICEMAIL,

            Manifest.permission.USE_SIP

    };



    /**
@@ -592,7 +598,8 @@ public class AppOpsManager { 
            null, // ASSIST_STRUCTURE

            null, // ASSIST_SCREENSHOT

            null, // READ_PHONE_STATE

            null // ADD_VOICEMAIL

            null, // ADD_VOICEMAIL

            null  // USE_SIP

    };



    /**
@@ -652,7 +659,8 @@ public class AppOpsManager { 
            false, //ASSIST_STRUCTURE

            false, //ASSIST_SCREENSHOT

            false, //READ_PHONE_STATE

            false  //ADD_VOICEMAIL

            false, //ADD_VOICEMAIL

            false  // USE_SIP

    };



    /**
@@ -711,6 +719,7 @@ public class AppOpsManager { 
            AppOpsManager.MODE_ALLOWED,

            AppOpsManager.MODE_ALLOWED,

            AppOpsManager.MODE_ALLOWED,

            AppOpsManager.MODE_ALLOWED,

            AppOpsManager.MODE_ALLOWED

    };
@@ -774,6 +783,7 @@ public class AppOpsManager { 
            false,

            false,

            false,

            false,

            false

    };