Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add javadoc @see to methods affected by resetAllCarrierActions" am: aa7d4c540d am: ecc022802a

Browse Source 
Change-Id: I4a7d46ff9f1baaf90ce23bb8d3a8035823ac70b2
This commit is contained in:
Automerger Merge Worker
2020-01-15 21:40:28 +00:00
parent c5bfdd62c9 ecc022802a
commit 3e2801d77d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -10272,6 +10272,7 @@ public class TelephonyManager {
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}.
*
* @param enabled control enable or disable carrier data.
* @see #resetAllCarrierActions()
* @hide
*/
@SystemApi
@@ -10298,6 +10299,7 @@ public class TelephonyManager {
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}.
*
* @param enabled control enable or disable radio.
* @see #resetAllCarrierActions()
* @hide
*/
@SystemApi
@@ -10324,6 +10326,7 @@ public class TelephonyManager {
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}.
*
* @param report control start/stop reporting network status.
* @see #resetAllCarrierActions()
* @hide
*/
@SystemApi