From 7a8d3528716e22ca5291783700bd1bb305f8a686 Mon Sep 17 00:00:00 2001 From: Brad Ebinger Date: Fri, 31 Mar 2017 10:21:09 -0700 Subject: [PATCH] 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 --- api/current.txt | 4 ++-- api/system-current.txt | 6 ++++-- api/test-current.txt | 4 ++-- core/java/android/content/Intent.java | 4 ++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/api/current.txt b/api/current.txt index a15e07dedeb84..69741bb1ee4a5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); diff --git a/api/system-current.txt b/api/system-current.txt index 63a0ad678d850..59ca84f6b60ad 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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(); diff --git a/api/test-current.txt b/api/test-current.txt index efeb5a8932524..4b424ac456978 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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(); diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 116224b35d06b..81aea8d178d5b 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1093,6 +1093,8 @@ public class Intent implements Parcelable, Cloneable { *

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 { *

Output: nothing. * @hide */ + @SystemApi + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_CALL_PRIVILEGED = "android.intent.action.CALL_PRIVILEGED"; /**