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

Commit 7a8d3528 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Move CALL_PRIVILEGED/EMERGENCY to @SystemApi 

CALL_PRIVILEGED and CALL_EMERGENCY APIs are used
by vendors and Android Wear and should be moved
to @SystemApi to pass CTS tests.

Bug: 36566521
Test: CTS tests
Change-Id: I73a0b2c4e551b4738c4c322d9822a85ee19d269b
parent 9220ff1f

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -46013,7 +46013,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();
@@ -46025,6 +46024,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();
@@ -46033,6 +46033,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();
@@ -46040,7 +46041,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 −2
Original line number Diff line number Diff line
@@ -9786,6 +9786,8 @@ package android.content { 
    field public static final java.lang.String ACTION_BUG_REPORT = "android.intent.action.BUG_REPORT";

    field public static final java.lang.String ACTION_CALL = "android.intent.action.CALL";

    field public static final java.lang.String ACTION_CALL_BUTTON = "android.intent.action.CALL_BUTTON";

    field public static final java.lang.String ACTION_CALL_EMERGENCY = "android.intent.action.CALL_EMERGENCY";

    field public static final java.lang.String ACTION_CALL_PRIVILEGED = "android.intent.action.CALL_PRIVILEGED";

    field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON";

    field public static final java.lang.String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP";

    field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER";
@@ -49470,7 +49472,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();
@@ -49482,6 +49483,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();
@@ -49490,6 +49492,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();
@@ -49497,7 +49500,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

+2 −2
Original line number Diff line number Diff line
@@ -46390,7 +46390,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();
@@ -46406,6 +46405,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();
@@ -46414,6 +46414,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();
@@ -46421,7 +46422,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/content/Intent.java

+4 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,8 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>Output: nothing.

     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_CALL_EMERGENCY = "android.intent.action.CALL_EMERGENCY";

    /**

     * Activity action: Perform a call to any number (emergency or not)
@@ -1102,6 +1104,8 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>Output: nothing.

     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_CALL_PRIVILEGED = "android.intent.action.CALL_PRIVILEGED";



    /**