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

Merge changes I7099048c,If6965979 am: fd46f62892

Browse Source 
Change-Id: Ida71dbbdc2d608d551e5e05483f5beea3a294f65
This commit is contained in:
Automerger Merge Worker
2020-02-11 21:09:50 +00:00
parent 6078c8641f fd46f62892
commit e92242378e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -9804,6 +9804,7 @@ package android.telephony {
field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff
field public static final int KEY_TYPE_EPDG = 1; // 0x1 field public static final int KEY_TYPE_EPDG = 1; // 0x1
field public static final int KEY_TYPE_WLAN = 2; // 0x2 field public static final int KEY_TYPE_WLAN = 2; // 0x2
field public static final String MODEM_ACTIVITY_RESULT_KEY = "controller_activity";
field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L
field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L
field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L

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

@@ -51,7 +51,6 @@ import android.net.ConnectivityManager;
import android.net.NetworkStats; import android.net.NetworkStats;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.BatteryStats;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -163,8 +162,8 @@ public class TelephonyManager {
* into the ResultReceiver Bundle. * into the ResultReceiver Bundle.
* @hide * @hide
*/ */
public static final String MODEM_ACTIVITY_RESULT_KEY = @SystemApi
BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY; public static final String MODEM_ACTIVITY_RESULT_KEY = "controller_activity";
/** /**
* The process name of the Phone app as well as many other apps that use this process name, such * The process name of the Phone app as well as many other apps that use this process name, such
@@ -10058,7 +10057,8 @@ public class TelephonyManager {
* Requests the modem activity info. The recipient will place the result * Requests the modem activity info. The recipient will place the result
* in `result`. * in `result`.
* @param result The object on which the recipient will send the resulting * @param result The object on which the recipient will send the resulting
* {@link android.telephony.ModemActivityInfo} object. * {@link android.telephony.ModemActivityInfo} object with key of
* {@link #MODEM_ACTIVITY_RESULT_KEY}.
* @hide * @hide
*/ */
@SystemApi @SystemApi