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

Merge "Add comments according to the API review process." am: e9a215b238

Browse Source 
am: b3b458b9ad

Change-Id: Ie9c3ce9bc67c08d99ea1c1ebfce5fbc78575baea
This commit is contained in:
Cassie
2018-02-23 06:56:56 +00:00
committed by android-build-merger
parent d389a22391 b3b458b9ad
commit b1b06cbaf5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
telephony/java/android/telephony/ServiceState.java
View File

@@ -178,7 +178,6 @@ public class ServiceState implements Parcelable {
/**
* Number of radio technologies for GSM, UMTS and CDMA.
* @hide
*/
private static final int NEXT_RIL_RADIO_TECHNOLOGY = 20;

4
telephony/java/android/telephony/Telephony.java
View File

@@ -2732,6 +2732,7 @@ public final class Telephony {
* This should be spread to other technologies,
* but is currently only used for LTE (14) and eHRPD (13).
* <P>Type: INTEGER</P>
* @deprecated this column is no longer supported, use {@link #NETWORK_TYPE_BITMASK} instead
*/
@Deprecated
public static final String BEARER = "bearer";
@@ -2744,13 +2745,14 @@ public final class Telephony {
* Bitmask for a radio tech R is (1 << (R - 1))
* <P>Type: INTEGER</P>
* @hide
* @deprecated this column is no longer supported, use {@link #NETWORK_TYPE_BITMASK} instead
*/
@Deprecated
public static final String BEARER_BITMASK = "bearer_bitmask";
/**
* Radio technology (network type) bitmask.
* To check what values can be contained, refer to
* To check what values can be contained, refer to the NETWORK_TYPE_ constants in
* {@link android.telephony.TelephonyManager}.
* Bitmask for a radio tech R is (1 << (R - 1))
* <P>Type: INTEGER</P>