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

Merge "Revert "Update docs for getServiceState"" into sc-dev

Browse Source
This commit is contained in:
Hall Liu
2021-02-23 00:42:46 +00:00
committed by Android (Google) Code Review
parent 9bb2b4cc60 44b92a62ea
commit 278c3912f4
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -42479,7 +42479,7 @@ package android.telephony {
method @Deprecated public int getPhoneCount();
method public int getPhoneType();
method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public int getPreferredOpportunisticDataSubscription();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.ServiceState getServiceState();
method @Nullable @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public android.telephony.ServiceState getServiceState();
method @Nullable public android.telephony.SignalStrength getSignalStrength();
method public int getSimCarrierId();
method @Nullable public CharSequence getSimCarrierIdName();

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

@@ -11293,21 +11293,16 @@ public class TelephonyManager {
*
* <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
* or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges})
* Additionally, depending on the level of location permissions the caller holds (i.e. no
* location permissions, {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}, or
* {@link android.Manifest.permission#ACCESS_FINE_LOCATION}), location-sensitive fields will
* be cleared from the return value.
*
* <p>Note also that if the caller holds any sort of location permission, a usage event for the
* {@link android.app.AppOpsManager#OPSTR_FINE_LOCATION} or
* {@link android.app.AppOpsManager#OPSTR_FINE_LOCATION}
* will be logged against the caller when calling this method.
* and {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}.
*
* May return {@code null} when the subscription is inactive or when there was an error
* communicating with the phone process.
*/
@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
@RequiresPermission(Manifest.permission.READ_PHONE_STATE)
@RequiresPermission(allOf = {
Manifest.permission.READ_PHONE_STATE,
Manifest.permission.ACCESS_COARSE_LOCATION
})
public @Nullable ServiceState getServiceState() {
return getServiceStateForSubscriber(getSubId());
}