diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-08-05 16:55:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-05 16:55:35 +0000 |
| commit | 86ee3a57e428b14023bc0bdbd6cb8f8bc206be74 (patch) | |
| tree | 78ec369e2bf4cd34d3c7243c638c8faf40a21300 /telephony | |
| parent | 6bdc4637d7ac1df86e9d745ac483987107a71282 (diff) | |
| parent | ad4c63b53d1e2b9b632833fb989a1aa444588de3 (diff) | |
| download | frameworks_base-86ee3a57e428b14023bc0bdbd6cb8f8bc206be74.zip frameworks_base-86ee3a57e428b14023bc0bdbd6cb8f8bc206be74.tar.gz frameworks_base-86ee3a57e428b14023bc0bdbd6cb8f8bc206be74.tar.bz2 | |
Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
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 0bb04f8..2415165 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. * |