Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81938296 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes I7099048c,If6965979 am: fd46f628 am: e9224237 

Change-Id: Ifc9d0c5bda88dc0107427c09183f6c0e259c6b83
parents 0d7c07c7 e9224237

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9804,6 +9804,7 @@ package android.telephony { 
    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_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_CDMA = 8L; // 0x8L

    field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L

telephony/java/android/telephony/TelephonyManager.java

+4 −4
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import android.net.ConnectivityManager; 
import android.net.NetworkStats;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.BatteryStats;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;
@@ -163,8 +162,8 @@ public class TelephonyManager { 
     * into the ResultReceiver Bundle.

     * @hide

     */

    public static final String MODEM_ACTIVITY_RESULT_KEY =

            BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY;

    @SystemApi

    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
@@ -10058,7 +10057,8 @@ public class TelephonyManager { 
     * Requests the modem activity info. The recipient will place the result

     * in `result`.

     * @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

     */

    @SystemApi