commit | 9075818aacedbc6f5878006e83e08bbeb77a2e84 | [log] [tgz] |
---|---|---|
author | Nathan Harold <nharold@google.com> | Fri Nov 16 12:52:43 2018 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Fri Nov 16 12:52:43 2018 -0800 |
tree | c67d34ac9c9c9bb21ffd4c32d1676ed5e69cba82 | |
parent | 6a759eb64621bd21093fc3a0e8c17d59c86eb714 [diff] | |
parent | 89470414f23cb4633bb77dd67a410347050b9244 [diff] |
Merge "Remove CDMA doc in setPreferredNetworkType()" am: 8aeeea135a am: 89470414f2 Change-Id: I085a2a02eecf2b28ccb63d393f9e909713bd4e65
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index d7b3cfa..d81b1a8 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -6130,7 +6130,6 @@ /** * Set the preferred network type. - * Used for device configuration by some CDMA operators. * * <p>Requires Permission: * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling