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

Commit 4eb831e6 authored by Nathan Harold's avatar Nathan Harold Committed by Android (Google) Code Review
Browse files

Merge "Update Privileges for BARRING_INFO and REG_FAILURE"

parents 0bfb6641 0d9a92bd

api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -47322,7 +47322,7 @@ package android.telephony { 
    method public void onSignalStrengthsChanged(android.telephony.SignalStrength);

    method public void onSignalStrengthsChanged(android.telephony.SignalStrength);

    method public void onUserMobileDataStateChanged(boolean);

    method public void onUserMobileDataStateChanged(boolean);

    field public static final int LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE = 4194304; // 0x400000

    field public static final int LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE = 4194304; // 0x400000

    field @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final int LISTEN_BARRING_INFO = -2147483648; // 0x80000000

    field @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_BARRING_INFO = -2147483648; // 0x80000000

    field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_CALL_DISCONNECT_CAUSES = 33554432; // 0x2000000

    field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_CALL_DISCONNECT_CAUSES = 33554432; // 0x2000000

    field public static final int LISTEN_CALL_FORWARDING_INDICATOR = 8; // 0x8

    field public static final int LISTEN_CALL_FORWARDING_INDICATOR = 8; // 0x8

    field public static final int LISTEN_CALL_STATE = 32; // 0x20

    field public static final int LISTEN_CALL_STATE = 32; // 0x20
@@ -47335,7 +47335,7 @@ package android.telephony { 
    field public static final int LISTEN_MESSAGE_WAITING_INDICATOR = 4; // 0x4

    field public static final int LISTEN_MESSAGE_WAITING_INDICATOR = 4; // 0x4

    field public static final int LISTEN_NONE = 0; // 0x0

    field public static final int LISTEN_NONE = 0; // 0x0

    field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_PRECISE_DATA_CONNECTION_STATE = 4096; // 0x1000

    field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_PRECISE_DATA_CONNECTION_STATE = 4096; // 0x1000

    field @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final int LISTEN_REGISTRATION_FAILURE = 1073741824; // 0x40000000

    field @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_REGISTRATION_FAILURE = 1073741824; // 0x40000000

    field public static final int LISTEN_SERVICE_STATE = 1; // 0x1

    field public static final int LISTEN_SERVICE_STATE = 1; // 0x1

    field @Deprecated public static final int LISTEN_SIGNAL_STRENGTH = 2; // 0x2

    field @Deprecated public static final int LISTEN_SIGNAL_STRENGTH = 2; // 0x2

    field public static final int LISTEN_SIGNAL_STRENGTHS = 256; // 0x100

    field public static final int LISTEN_SIGNAL_STRENGTHS = 256; // 0x100

core/java/android/telephony/PhoneStateListener.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -412,23 +412,23 @@ public class PhoneStateListener { 
     * domain. This indication does not necessarily indicate a change of service state, which should

     * domain. This indication does not necessarily indicate a change of service state, which should

     * be tracked via {@link #LISTEN_SERVICE_STATE}.

     * be tracked via {@link #LISTEN_SERVICE_STATE}.

     *

     *

     * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or the calling

     * <p>Requires permission {@link android.Manifest.permission#READ_PRECISE_PHONE_STATE} or

     * app has carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}).

     * the calling app has carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}).

     *

     *

     * @see #onRegistrationFailed()

     * @see #onRegistrationFailed()

     */

     */

    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)

    @RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)

    public static final int LISTEN_REGISTRATION_FAILURE = 0x40000000;

    public static final int LISTEN_REGISTRATION_FAILURE = 0x40000000;





    /**

    /**

     * Listen for Barring Information for the current registered / camped cell.

     * Listen for Barring Information for the current registered / camped cell.

     *

     *

     * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or the calling

     * <p>Requires permission {@link android.Manifest.permission#READ_PRECISE_PHONE_STATE} or

     * app has carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}).

     * the calling app has carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}).

     *

     *

     * @see #onBarringInfoChanged()

     * @see #onBarringInfoChanged()

     */

     */

    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)

    @RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)

    public static final int LISTEN_BARRING_INFO = 0x80000000;

    public static final int LISTEN_BARRING_INFO = 0x80000000;





    /*

    /*

services/core/java/com/android/server/TelephonyRegistry.java

+9 −9
Original line number Original line Diff line number Diff line
@@ -284,16 +284,16 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    static final int ENFORCE_PHONE_STATE_PERMISSION_MASK =

    static final int ENFORCE_PHONE_STATE_PERMISSION_MASK =

                PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR

                PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR

                        | PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR

                        | PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR

                        | PhoneStateListener.LISTEN_EMERGENCY_NUMBER_LIST

                        | PhoneStateListener.LISTEN_EMERGENCY_NUMBER_LIST;

                        | PhoneStateListener.LISTEN_REGISTRATION_FAILURE

                        | PhoneStateListener.LISTEN_BARRING_INFO;





    static final int PRECISE_PHONE_STATE_PERMISSION_MASK =

    static final int ENFORCE_PRECISE_PHONE_STATE_PERMISSION_MASK =

                PhoneStateListener.LISTEN_PRECISE_CALL_STATE

                PhoneStateListener.LISTEN_PRECISE_CALL_STATE

                        | PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE

                        | PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE

                        | PhoneStateListener.LISTEN_CALL_DISCONNECT_CAUSES

                        | PhoneStateListener.LISTEN_CALL_DISCONNECT_CAUSES

                        | PhoneStateListener.LISTEN_CALL_ATTRIBUTES_CHANGED

                        | PhoneStateListener.LISTEN_CALL_ATTRIBUTES_CHANGED

                | PhoneStateListener.LISTEN_IMS_CALL_DISCONNECT_CAUSES;

                        | PhoneStateListener.LISTEN_IMS_CALL_DISCONNECT_CAUSES

                        | PhoneStateListener.LISTEN_REGISTRATION_FAILURE

                        | PhoneStateListener.LISTEN_BARRING_INFO;





    static final int READ_ACTIVE_EMERGENCY_SESSION_PERMISSION_MASK =

    static final int READ_ACTIVE_EMERGENCY_SESSION_PERMISSION_MASK =

            PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_CALL

            PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_CALL
@@ -2535,7 +2535,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            }

            }

        }

        }





        if ((events & PRECISE_PHONE_STATE_PERMISSION_MASK) != 0) {

        if ((events & ENFORCE_PRECISE_PHONE_STATE_PERMISSION_MASK) != 0) {

            // check if calling app has either permission READ_PRECISE_PHONE_STATE

            // check if calling app has either permission READ_PRECISE_PHONE_STATE

            // or with carrier privileges

            // or with carrier privileges

            try {

            try {