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

Commit e35d5062 authored by Chad Brubaker's avatar Chad Brubaker Committed by Android (Google) Code Review
Browse files

Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev

parents 2c93764b 0c1651f2

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ package android { 
    field public static final java.lang.String READ_FRAME_BUFFER = "android.permission.READ_FRAME_BUFFER";

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

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

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

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

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

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

    field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS";
@@ -4180,7 +4180,7 @@ package android.app { 
    field public static final java.lang.String OPSTR_READ_CELL_BROADCASTS = "android:read_cell_broadcasts";

    field public static final java.lang.String OPSTR_READ_CONTACTS = "android:read_contacts";

    field public static final java.lang.String OPSTR_READ_EXTERNAL_STORAGE = "android:read_external_storage";

    field public static final java.lang.String OPSTR_READ_PHONE_NUMBER = "android:read_phone_number";

    field public static final java.lang.String OPSTR_READ_PHONE_NUMBERS = "android:read_phone_numbers";

    field public static final java.lang.String OPSTR_READ_PHONE_STATE = "android:read_phone_state";

    field public static final java.lang.String OPSTR_READ_SMS = "android:read_sms";

    field public static final java.lang.String OPSTR_RECEIVE_MMS = "android:receive_mms";
@@ -45992,7 +45992,6 @@ package android.view { 
    method public static deprecated int getEdgeSlop();

    method public static deprecated int getFadingEdgeLength();

    method public static deprecated long getGlobalActionKeyTimeout();

    method public float getScaledHorizontalScrollFactor();

    method public static int getJumpTapTimeout();

    method public static int getKeyRepeatDelay();

    method public static int getKeyRepeatTimeout();
@@ -46004,6 +46003,7 @@ package android.view { 
    method public int getScaledDoubleTapSlop();

    method public int getScaledEdgeSlop();

    method public int getScaledFadingEdgeLength();

    method public float getScaledHorizontalScrollFactor();

    method public int getScaledMaximumDrawingCacheSize();

    method public int getScaledMaximumFlingVelocity();

    method public int getScaledMinimumFlingVelocity();
@@ -46012,6 +46012,7 @@ package android.view { 
    method public int getScaledPagingTouchSlop();

    method public int getScaledScrollBarSize();

    method public int getScaledTouchSlop();

    method public float getScaledVerticalScrollFactor();

    method public int getScaledWindowTouchSlop();

    method public static int getScrollBarFadeDuration();

    method public static deprecated int getScrollBarSize();
@@ -46019,7 +46020,6 @@ package android.view { 
    method public static float getScrollFriction();

    method public static int getTapTimeout();

    method public static deprecated int getTouchSlop();

    method public float getScaledVerticalScrollFactor();

    method public static deprecated int getWindowTouchSlop();

    method public static long getZoomControlsTimeout();

    method public boolean hasPermanentMenuKey();

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ package android { 
    field public static final java.lang.String READ_LOGS = "android.permission.READ_LOGS";

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

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

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

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

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

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

    field public static final java.lang.String READ_SEARCH_INDEXABLES = "android.permission.READ_SEARCH_INDEXABLES";
@@ -4325,7 +4325,7 @@ package android.app { 
    field public static final java.lang.String OPSTR_READ_CELL_BROADCASTS = "android:read_cell_broadcasts";

    field public static final java.lang.String OPSTR_READ_CONTACTS = "android:read_contacts";

    field public static final java.lang.String OPSTR_READ_EXTERNAL_STORAGE = "android:read_external_storage";

    field public static final java.lang.String OPSTR_READ_PHONE_NUMBER = "android:read_phone_number";

    field public static final java.lang.String OPSTR_READ_PHONE_NUMBERS = "android:read_phone_numbers";

    field public static final java.lang.String OPSTR_READ_PHONE_STATE = "android:read_phone_state";

    field public static final java.lang.String OPSTR_READ_SMS = "android:read_sms";

    field public static final java.lang.String OPSTR_RECEIVE_MMS = "android:receive_mms";
@@ -49449,7 +49449,6 @@ package android.view { 
    method public static deprecated int getEdgeSlop();

    method public static deprecated int getFadingEdgeLength();

    method public static deprecated long getGlobalActionKeyTimeout();

    method public float getScaledHorizontalScrollFactor();

    method public static int getJumpTapTimeout();

    method public static int getKeyRepeatDelay();

    method public static int getKeyRepeatTimeout();
@@ -49461,6 +49460,7 @@ package android.view { 
    method public int getScaledDoubleTapSlop();

    method public int getScaledEdgeSlop();

    method public int getScaledFadingEdgeLength();

    method public float getScaledHorizontalScrollFactor();

    method public int getScaledMaximumDrawingCacheSize();

    method public int getScaledMaximumFlingVelocity();

    method public int getScaledMinimumFlingVelocity();
@@ -49469,6 +49469,7 @@ package android.view { 
    method public int getScaledPagingTouchSlop();

    method public int getScaledScrollBarSize();

    method public int getScaledTouchSlop();

    method public float getScaledVerticalScrollFactor();

    method public int getScaledWindowTouchSlop();

    method public static int getScrollBarFadeDuration();

    method public static deprecated int getScrollBarSize();
@@ -49476,7 +49477,6 @@ package android.view { 
    method public static float getScrollFriction();

    method public static int getTapTimeout();

    method public static deprecated int getTouchSlop();

    method public float getScaledVerticalScrollFactor();

    method public static deprecated int getWindowTouchSlop();

    method public static long getZoomControlsTimeout();

    method public boolean hasPermanentMenuKey();

api/test-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ package android { 
    field public static final java.lang.String READ_FRAME_BUFFER = "android.permission.READ_FRAME_BUFFER";

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

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

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

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

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

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

    field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS";
@@ -4192,7 +4192,7 @@ package android.app { 
    field public static final java.lang.String OPSTR_READ_CELL_BROADCASTS = "android:read_cell_broadcasts";

    field public static final java.lang.String OPSTR_READ_CONTACTS = "android:read_contacts";

    field public static final java.lang.String OPSTR_READ_EXTERNAL_STORAGE = "android:read_external_storage";

    field public static final java.lang.String OPSTR_READ_PHONE_NUMBER = "android:read_phone_number";

    field public static final java.lang.String OPSTR_READ_PHONE_NUMBERS = "android:read_phone_numbers";

    field public static final java.lang.String OPSTR_READ_PHONE_STATE = "android:read_phone_state";

    field public static final java.lang.String OPSTR_READ_SMS = "android:read_sms";

    field public static final java.lang.String OPSTR_RECEIVE_MMS = "android:receive_mms";
@@ -46369,7 +46369,6 @@ package android.view { 
    method public static deprecated int getEdgeSlop();

    method public static deprecated int getFadingEdgeLength();

    method public static deprecated long getGlobalActionKeyTimeout();

    method public float getScaledHorizontalScrollFactor();

    method public static int getHoverTooltipHideShortTimeout();

    method public static int getHoverTooltipHideTimeout();

    method public static int getHoverTooltipShowTimeout();
@@ -46385,6 +46384,7 @@ package android.view { 
    method public int getScaledDoubleTapSlop();

    method public int getScaledEdgeSlop();

    method public int getScaledFadingEdgeLength();

    method public float getScaledHorizontalScrollFactor();

    method public int getScaledMaximumDrawingCacheSize();

    method public int getScaledMaximumFlingVelocity();

    method public int getScaledMinimumFlingVelocity();
@@ -46393,6 +46393,7 @@ package android.view { 
    method public int getScaledPagingTouchSlop();

    method public int getScaledScrollBarSize();

    method public int getScaledTouchSlop();

    method public float getScaledVerticalScrollFactor();

    method public int getScaledWindowTouchSlop();

    method public static int getScrollBarFadeDuration();

    method public static deprecated int getScrollBarSize();
@@ -46400,7 +46401,6 @@ package android.view { 
    method public static float getScrollFriction();

    method public static int getTapTimeout();

    method public static deprecated int getTouchSlop();

    method public float getScaledVerticalScrollFactor();

    method public static deprecated int getWindowTouchSlop();

    method public static long getZoomControlsTimeout();

    method public boolean hasPermanentMenuKey();

core/java/android/app/AppOpsManager.java

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

    public static final int OP_AUDIO_ACCESSIBILITY_VOLUME = 64;

    /** @hide Read the phone number. */

    public static final int OP_READ_PHONE_NUMBER = 65;

    public static final int OP_READ_PHONE_NUMBERS = 65;

    /** @hide Request package installs through package installer */

    public static final int OP_REQUEST_INSTALL_PACKAGES = 66;

    /** @hide Enter picture-in-picture. */
@@ -353,8 +353,8 @@ public class AppOpsManager { 
    /** @hide Get device accounts. */

    public static final String OPSTR_GET_ACCOUNTS

            = "android:get_accounts";

    public static final String OPSTR_READ_PHONE_NUMBER

            = "android:read_phone_number";

    public static final String OPSTR_READ_PHONE_NUMBERS

            = "android:read_phone_numbers";

    /** Access to picture-in-picture. */

    public static final String OPSTR_PICTURE_IN_PICTURE

            = "android:picture_in_picture";
@@ -391,7 +391,7 @@ public class AppOpsManager { 
            OP_FINE_LOCATION,

            // Phone

            OP_READ_PHONE_STATE,

            OP_READ_PHONE_NUMBER,

            OP_READ_PHONE_NUMBERS,

            OP_CALL_PHONE,

            OP_READ_CALL_LOG,

            OP_WRITE_CALL_LOG,
@@ -487,7 +487,7 @@ public class AppOpsManager { 
            OP_GET_ACCOUNTS,

            OP_RUN_IN_BACKGROUND,

            OP_AUDIO_ACCESSIBILITY_VOLUME,

            OP_READ_PHONE_NUMBER,

            OP_READ_PHONE_NUMBERS,

            OP_REQUEST_INSTALL_PACKAGES,

            OP_PICTURE_IN_PICTURE,

            OP_INSTANT_APP_START_FOREGROUND,
@@ -564,7 +564,7 @@ public class AppOpsManager { 
            OPSTR_GET_ACCOUNTS,

            null,

            null, // OP_AUDIO_ACCESSIBILITY_VOLUME

            OPSTR_READ_PHONE_NUMBER,

            OPSTR_READ_PHONE_NUMBERS,

            null, // OP_REQUEST_INSTALL_PACKAGES

            OPSTR_PICTURE_IN_PICTURE,

            OPSTR_INSTANT_APP_START_FOREGROUND,
@@ -641,7 +641,7 @@ public class AppOpsManager { 
            "GET_ACCOUNTS",

            "RUN_IN_BACKGROUND",

            "AUDIO_ACCESSIBILITY_VOLUME",

            "READ_PHONE_NUMBER",

            "READ_PHONE_NUMBERS",

            "REQUEST_INSTALL_PACKAGES",

            "PICTURE_IN_PICTURE",

            "INSTANT_APP_START_FOREGROUND",
@@ -718,7 +718,7 @@ public class AppOpsManager { 
            Manifest.permission.GET_ACCOUNTS,

            null, // no permission for running in background

            null, // no permission for changing accessibility volume

            Manifest.permission.READ_PHONE_NUMBER,

            Manifest.permission.READ_PHONE_NUMBERS,

            Manifest.permission.REQUEST_INSTALL_PACKAGES,

            null, // no permission for entering picture-in-picture on hide

            Manifest.permission.INSTANT_APP_FOREGROUND_SERVICE,
@@ -796,7 +796,7 @@ public class AppOpsManager { 
            null, // GET_ACCOUNTS

            null, // RUN_IN_BACKGROUND

            UserManager.DISALLOW_ADJUST_VOLUME, //AUDIO_ACCESSIBILITY_VOLUME

            null, // READ_PHONE_NUMBER

            null, // READ_PHONE_NUMBERS

            null, // REQUEST_INSTALL_PACKAGES

            null, // ENTER_PICTURE_IN_PICTURE_ON_HIDE

            null, // INSTANT_APP_START_FOREGROUND
@@ -873,7 +873,7 @@ public class AppOpsManager { 
            false, // GET_ACCOUNTS

            false, // RUN_IN_BACKGROUND

            false, // AUDIO_ACCESSIBILITY_VOLUME

            false, // READ_PHONE_NUMBER

            false, // READ_PHONE_NUMBERS

            false, // REQUEST_INSTALL_PACKAGES

            false, // ENTER_PICTURE_IN_PICTURE_ON_HIDE

            false, // INSTANT_APP_START_FOREGROUND

core/res/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -798,13 +798,13 @@ 
        android:description="@string/permdesc_readPhoneState"

        android:protectionLevel="dangerous" />



    <!-- Allows read access to the device's phone number. This is a subset of the capabilities

    <!-- Allows read access to the device's phone number(s). This is a subset of the capabilities

         granted by {@link #READ_PHONE_STATE} but is exposed to ephemeral applications.

         <p>Protection level: dangerous-->

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

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

        android:permissionGroup="android.permission-group.PHONE"

        android:label="@string/permlab_readPhoneNumber"

        android:description="@string/permdesc_readPhoneNumber"

        android:description="@string/permdesc_readPhoneNumbers"

        android:protectionLevel="dangerous|ephemeral" />



    <!-- Allows an application to initiate a phone call without going through