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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-11 18:36:31 +00:00
committed by Android (Google) Code Review
parent 9054656c20 a7025bae0a
commit 10fb6582eb
10 changed files with 0 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
api/system-current.txt
View File

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

3
telephony/java/android/telephony/AccessNetworkConstants.java
View File

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

2
telephony/java/android/telephony/NetworkRegistrationState.java
View File

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

2
telephony/java/android/telephony/NetworkService.java
View File

@@ -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();

2
telephony/java/android/telephony/NetworkServiceCallback.java
View File

@@ -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();

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

@@ -17,7 +17,6 @@
package android.telephony;
import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.os.Bundle;
import android.os.Parcel;
@@ -1534,7 +1533,6 @@ public class ServiceState implements Parcelable {
* @return List of registration states
* @hide
*/
@SystemApi
public List<NetworkRegistrationState> getNetworkRegistrationStates() {
synchronized (mNetworkRegistrationStates) {
return new ArrayList<>(mNetworkRegistrationStates);
@@ -1548,7 +1546,6 @@ public class ServiceState implements Parcelable {
* @return List of registration states.
* @hide
*/
@SystemApi
public List<NetworkRegistrationState> getNetworkRegistrationStates(int transportType) {
List<NetworkRegistrationState> list = new ArrayList<>();
@@ -1571,7 +1568,6 @@ public class ServiceState implements Parcelable {
* @return The matching NetworkRegistrationState.
* @hide
*/
@SystemApi
public NetworkRegistrationState getNetworkRegistrationStates(int transportType, int domain) {
synchronized (mNetworkRegistrationStates) {
for (NetworkRegistrationState networkRegistrationState : mNetworkRegistrationStates) {

2
telephony/java/android/telephony/data/DataCallResponse.java
View File

@@ -19,7 +19,6 @@ package android.telephony.data;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.net.LinkAddress;
import android.os.Parcel;
import android.os.Parcelable;
@@ -34,7 +33,6 @@ import java.util.Objects;
*
* @hide
*/
@SystemApi
public final class DataCallResponse implements Parcelable {
private final int mStatus;
private final int mSuggestedRetryTime;

2
telephony/java/android/telephony/data/DataProfile.java
View File

@@ -16,7 +16,6 @@
package android.telephony.data;
import android.annotation.SystemApi;
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
@@ -30,7 +29,6 @@ import com.android.internal.telephony.RILConstants;
*
* @hide
*/
@SystemApi
public final class DataProfile implements Parcelable {
// The types indicating the data profile is used on GSM (3GPP) or CDMA (3GPP2) network.

2
telephony/java/android/telephony/data/DataService.java
View File

@@ -20,7 +20,6 @@ import android.annotation.CallSuper;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.app.Service;
import android.content.Intent;
import android.net.LinkProperties;
@@ -55,7 +54,6 @@ import java.util.List;
* </service>
* @hide
*/
@SystemApi
public abstract class DataService extends Service {
private static final String TAG = DataService.class.getSimpleName();

3
telephony/java/android/telephony/data/DataServiceCallback.java
View File

@@ -17,7 +17,6 @@
package android.telephony.data;
import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.net.LinkProperties;
import android.os.RemoteException;
import android.telephony.Rlog;
@@ -35,7 +34,6 @@ import java.util.List;
*
* @hide
*/
@SystemApi
public class DataServiceCallback {
private static final String TAG = DataServiceCallback.class.getSimpleName();
@@ -125,7 +123,6 @@ public class DataServiceCallback {
*
* @param result The result code. Must be one of the {@link ResultCode}.
*/
@SystemApi
public void onSetDataProfileComplete(@ResultCode int result) {
IDataServiceCallback callback = mCallback.get();
if (callback != null) {