summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tyler Gunn <tgunn@google.com> 2019-04-01 07:45:41 -0700
committer android-build-merger <android-build-merger@google.com> 2019-04-01 07:45:41 -0700
commitef0b0ae2daf64743478b5ec86629b94a7a40934e (patch)
tree7d980218774ae16c96793ebc6c1920cc577f1547
parent8e6c80f2389e713f8050bd285fb33382fbbd5f7b (diff)
parent41ab607d3ddad9c23217eb3ea3d548112200039a (diff)
Merge "Mark PROCESS_OUTGOING_CALLS permission as deprecated." am: 70e943ba80
am: 41ab607d3d Change-Id: I0111b33db6fb43b387b977007180f362ba36e2db
-rwxr-xr-xapi/current.txt2
-rw-r--r--core/res/AndroidManifest.xml3
2 files changed, 4 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index e829ac092abc..af279607eab1 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -100,7 +100,7 @@ package android {
field public static final String NFC_TRANSACTION_EVENT = "android.permission.NFC_TRANSACTION_EVENT";
field public static final String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS";
field @Deprecated public static final String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";
- field public static final String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";
+ field @Deprecated public static final String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";
field public static final String READ_CALENDAR = "android.permission.READ_CALENDAR";
field public static final String READ_CALL_LOG = "android.permission.READ_CALL_LOG";
field public static final String READ_CONTACTS = "android.permission.READ_CONTACTS";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 9aedb7618142..f562dca57e15 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -915,6 +915,9 @@
call with the option to redirect the call to a different number or
abort the call altogether.
<p>Protection level: dangerous
+
+ @deprecated Applications should use {@link android.telecom.CallRedirectionService} instead
+ of the {@link android.content.Intent#ACTION_NEW_OUTGOING_CALL} broadcast.
-->
<permission android:name="android.permission.PROCESS_OUTGOING_CALLS"
android:permissionGroup="android.permission-group.CALL_LOG"