diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-08-05 17:00:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-05 17:00:53 +0000 |
| commit | a29e05012db02c4ed87eb8c31c2138e966f742b5 (patch) | |
| tree | 94b365c97039b309a4665322ee9b42f30ea3925e /telephony | |
| parent | a02bd53edefa6868829602675c068926ef270c63 (diff) | |
| parent | 86ee3a57e428b14023bc0bdbd6cb8f8bc206be74 (diff) | |
| download | frameworks_base-a29e05012db02c4ed87eb8c31c2138e966f742b5.zip frameworks_base-a29e05012db02c4ed87eb8c31c2138e966f742b5.tar.gz frameworks_base-a29e05012db02c4ed87eb8c31c2138e966f742b5.tar.bz2 | |
am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
* commit '86ee3a57e428b14023bc0bdbd6cb8f8bc206be74':
READ_SMS allows getLine1Number() [1/3]
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index a8066d8..88612e9 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2060,6 +2060,8 @@ public class TelephonyManager { * <p> * Requires Permission: * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} + * OR + * {@link android.Manifest.permission#READ_SMS} * <p> * The default SMS app can also use this. */ @@ -2073,6 +2075,8 @@ public class TelephonyManager { * <p> * Requires Permission: * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} + * OR + * {@link android.Manifest.permission#READ_SMS} * <p> * The default SMS app can also use this. * |