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

Commit 10fb6582 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Hide IWLAN system API" into pi-dev

parents 9054656c a7025bae

api/system-current.txt

+0 −153
Original line number Diff line number Diff line
@@ -5053,11 +5053,6 @@ package android.telecom { 


package android.telephony {



  public static final class AccessNetworkConstants.TransportType {

    field public static final int WLAN = 2; // 0x2

    field public static final int WWAN = 1; // 0x1

  }



  public class CarrierConfigManager {

    method public static android.os.PersistableBundle getDefaultConfig();

    method public void updateConfigForPhoneId(int, java.lang.String);
@@ -5072,66 +5067,6 @@ package android.telephony { 
    field public static final java.lang.String MBMS_STREAMING_SERVICE_ACTION = "android.telephony.action.EmbmsStreaming";

  }



  public class NetworkRegistrationState implements android.os.Parcelable {

    ctor public NetworkRegistrationState(int, int, int, int, int, boolean, int[], android.telephony.CellIdentity);

    ctor protected NetworkRegistrationState(android.os.Parcel);

    method public int describeContents();

    method public int getAccessNetworkTechnology();

    method public int[] getAvailableServices();

    method public android.telephony.CellIdentity getCellIdentity();

    method public int getDomain();

    method public int getReasonForDenial();

    method public int getRegState();

    method public int getTransportType();

    method public boolean isEmergencyEnabled();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.telephony.NetworkRegistrationState> CREATOR;

    field public static final int DOMAIN_CS = 1; // 0x1

    field public static final int DOMAIN_PS = 2; // 0x2

    field public static final int REG_STATE_DENIED = 3; // 0x3

    field public static final int REG_STATE_HOME = 1; // 0x1

    field public static final int REG_STATE_NOT_REG_NOT_SEARCHING = 0; // 0x0

    field public static final int REG_STATE_NOT_REG_SEARCHING = 2; // 0x2

    field public static final int REG_STATE_ROAMING = 5; // 0x5

    field public static final int REG_STATE_UNKNOWN = 4; // 0x4

    field public static final int SERVICE_TYPE_DATA = 2; // 0x2

    field public static final int SERVICE_TYPE_EMERGENCY = 5; // 0x5

    field public static final int SERVICE_TYPE_SMS = 3; // 0x3

    field public static final int SERVICE_TYPE_VIDEO = 4; // 0x4

    field public static final int SERVICE_TYPE_VOICE = 1; // 0x1

  }



  public abstract class NetworkService extends android.app.Service {

    ctor public NetworkService();

    method protected abstract android.telephony.NetworkService.NetworkServiceProvider createNetworkServiceProvider(int);

    field public static final java.lang.String NETWORK_SERVICE_EXTRA_SLOT_ID = "android.telephony.extra.SLOT_ID";

    field public static final java.lang.String NETWORK_SERVICE_INTERFACE = "android.telephony.NetworkService";

  }



  public class NetworkService.NetworkServiceProvider {

    ctor public NetworkService.NetworkServiceProvider(int);

    method public void getNetworkRegistrationState(int, android.telephony.NetworkServiceCallback);

    method public final int getSlotId();

    method public final void notifyNetworkRegistrationStateChanged();

    method protected void onDestroy();

  }



  public class NetworkServiceCallback {

    method public void onGetNetworkRegistrationStateComplete(int, android.telephony.NetworkRegistrationState);

    field public static final int RESULT_ERROR_BUSY = 3; // 0x3

    field public static final int RESULT_ERROR_FAILED = 5; // 0x5

    field public static final int RESULT_ERROR_ILLEGAL_STATE = 4; // 0x4

    field public static final int RESULT_ERROR_INVALID_ARG = 2; // 0x2

    field public static final int RESULT_ERROR_UNSUPPORTED = 1; // 0x1

    field public static final int RESULT_SUCCESS = 0; // 0x0

  }



  public class ServiceState implements android.os.Parcelable {

    method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates();

    method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates(int);

    method public android.telephony.NetworkRegistrationState getNetworkRegistrationStates(int, int);

  }



  public final class SmsManager {

    method public void sendMultipartTextMessageWithoutPersisting(java.lang.String, java.lang.String, java.util.List<java.lang.String>, java.util.List<android.app.PendingIntent>, java.util.List<android.app.PendingIntent>);

    method public void sendTextMessageWithoutPersisting(java.lang.String, java.lang.String, java.lang.String, android.app.PendingIntent, android.app.PendingIntent);
@@ -5334,94 +5269,6 @@ package android.telephony { 


}



package android.telephony.data {



  public final class DataCallResponse implements android.os.Parcelable {

    ctor public DataCallResponse(int, int, int, int, java.lang.String, java.lang.String, java.util.List<android.net.LinkAddress>, java.util.List<java.net.InetAddress>, java.util.List<java.net.InetAddress>, java.util.List<java.lang.String>, int);

    ctor public DataCallResponse(android.os.Parcel);

    method public int describeContents();

    method public int getActive();

    method public java.util.List<android.net.LinkAddress> getAddresses();

    method public int getCallId();

    method public java.util.List<java.net.InetAddress> getDnses();

    method public java.util.List<java.net.InetAddress> getGateways();

    method public java.lang.String getIfname();

    method public int getMtu();

    method public java.util.List<java.lang.String> getPcscfs();

    method public int getStatus();

    method public int getSuggestedRetryTime();

    method public java.lang.String getType();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.telephony.data.DataCallResponse> CREATOR;

  }



  public final class DataProfile implements android.os.Parcelable {

    ctor public DataProfile(int, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, int, int, int, int, boolean, int, java.lang.String, int, int, java.lang.String, java.lang.String, boolean);

    ctor public DataProfile(android.os.Parcel);

    method public int describeContents();

    method public java.lang.String getApn();

    method public int getAuthType();

    method public int getBearerBitmap();

    method public int getMaxConns();

    method public int getMaxConnsTime();

    method public int getMtu();

    method public java.lang.String getMvnoMatchData();

    method public java.lang.String getMvnoType();

    method public java.lang.String getPassword();

    method public int getProfileId();

    method public java.lang.String getProtocol();

    method public java.lang.String getRoamingProtocol();

    method public int getSupportedApnTypesBitmap();

    method public int getType();

    method public java.lang.String getUserName();

    method public int getWaitTime();

    method public boolean isEnabled();

    method public boolean isModemCognitive();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.telephony.data.DataProfile> CREATOR;

    field public static final int TYPE_3GPP = 1; // 0x1

    field public static final int TYPE_3GPP2 = 2; // 0x2

    field public static final int TYPE_COMMON = 0; // 0x0

  }



  public abstract class DataService extends android.app.Service {

    ctor public DataService();

    method public abstract android.telephony.data.DataService.DataServiceProvider createDataServiceProvider(int);

    field public static final java.lang.String DATA_SERVICE_EXTRA_SLOT_ID = "android.telephony.data.extra.SLOT_ID";

    field public static final java.lang.String DATA_SERVICE_INTERFACE = "android.telephony.data.DataService";

    field public static final int REQUEST_REASON_HANDOVER = 3; // 0x3

    field public static final int REQUEST_REASON_NORMAL = 1; // 0x1

    field public static final int REQUEST_REASON_SHUTDOWN = 2; // 0x2

  }



  public class DataService.DataServiceProvider {

    ctor public DataService.DataServiceProvider(int);

    method public void deactivateDataCall(int, int, android.telephony.data.DataServiceCallback);

    method public void getDataCallList(android.telephony.data.DataServiceCallback);

    method public final int getSlotId();

    method public final void notifyDataCallListChanged(java.util.List<android.telephony.data.DataCallResponse>);

    method protected void onDestroy();

    method public void setDataProfile(java.util.List<android.telephony.data.DataProfile>, boolean, android.telephony.data.DataServiceCallback);

    method public void setInitialAttachApn(android.telephony.data.DataProfile, boolean, android.telephony.data.DataServiceCallback);

    method public void setupDataCall(int, android.telephony.data.DataProfile, boolean, boolean, int, android.net.LinkProperties, android.telephony.data.DataServiceCallback);

  }



  public class DataServiceCallback {

    method public void onDataCallListChanged(java.util.List<android.telephony.data.DataCallResponse>);

    method public void onDeactivateDataCallComplete(int);

    method public void onGetDataCallListComplete(int, java.util.List<android.telephony.data.DataCallResponse>);

    method public void onSetDataProfileComplete(int);

    method public void onSetInitialAttachApnComplete(int);

    method public void onSetupDataCallComplete(int, android.telephony.data.DataCallResponse);

    field public static final int RESULT_ERROR_BUSY = 3; // 0x3

    field public static final int RESULT_ERROR_ILLEGAL_STATE = 4; // 0x4

    field public static final int RESULT_ERROR_INVALID_ARG = 2; // 0x2

    field public static final int RESULT_ERROR_UNSUPPORTED = 1; // 0x1

    field public static final int RESULT_SUCCESS = 0; // 0x0

  }



}



package android.telephony.euicc {



  public final class DownloadableSubscription implements android.os.Parcelable {

telephony/java/android/telephony/AccessNetworkConstants.java

+0 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.telephony;



import android.annotation.SystemApi;



/**

 * Contains access network related constants.

 */
@@ -39,7 +37,6 @@ public final class AccessNetworkConstants { 
     * Wireless transportation type

     * @hide

     */

    @SystemApi

    public static final class TransportType {

        /** Wireless Wide Area Networks (i.e. Cellular) */

        public static final int WWAN = 1;

telephony/java/android/telephony/NetworkRegistrationState.java

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.telephony; 


import android.annotation.IntDef;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -31,7 +30,6 @@ import java.util.Objects; 
 * Description of a mobile network registration state

 * @hide

 */

@SystemApi

public class NetworkRegistrationState implements Parcelable {

    /**

     * Network domain

telephony/java/android/telephony/NetworkService.java

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.telephony;



import android.annotation.CallSuper;

import android.annotation.SystemApi;

import android.app.Service;

import android.content.Intent;

import android.os.Handler;
@@ -47,7 +46,6 @@ import java.util.List; 
 * </service>

 * @hide

 */

@SystemApi

public abstract class NetworkService extends Service {



    private final String TAG = NetworkService.class.getSimpleName();

telephony/java/android/telephony/NetworkServiceCallback.java

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.telephony;



import android.annotation.IntDef;

import android.annotation.SystemApi;

import android.os.RemoteException;

import android.telephony.NetworkService.NetworkServiceProvider;
@@ -33,7 +32,6 @@ import java.lang.ref.WeakReference; 
 *

 * @hide

 */

@SystemApi

public class NetworkServiceCallback {



    private static final String mTag = NetworkServiceCallback.class.getSimpleName();