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

Merge "Hide several System APIs" am: 0d8a3bb0f6

Browse Source 
Change-Id: Ibcae02d3d37832fb204aa5a4c372c89cf50c1409
This commit is contained in:
Shuo Qian
2020-03-25 23:16:38 +00:00
committed by Automerger Merge Worker
parent 09860f7ace 0d8a3bb0f6
commit 5fb0be0ac3
8 changed files with 51 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
api/system-current.txt
View File

@@ -324,7 +324,6 @@ package android.app {
method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public static void setPersistentVrThread(int);
method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean switchUser(@NonNull android.os.UserHandle);
method public void unregisterHomeVisibilityObserver(@NonNull android.app.HomeVisibilityObserver);
method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String);
}
public static interface ActivityManager.OnUidImportanceListener {
@@ -8013,27 +8012,6 @@ package android.telephony {
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CallAttributes> CREATOR;
}
public final class CallForwardingInfo implements android.os.Parcelable {
ctor public CallForwardingInfo(int, int, @Nullable String, int);
method public int describeContents();
method @Nullable public String getNumber();
method public int getReason();
method public int getStatus();
method public int getTimeoutSeconds();
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CallForwardingInfo> CREATOR;
field public static final int REASON_ALL = 4; // 0x4
field public static final int REASON_ALL_CONDITIONAL = 5; // 0x5
field public static final int REASON_BUSY = 1; // 0x1
field public static final int REASON_NOT_REACHABLE = 3; // 0x3
field public static final int REASON_NO_REPLY = 2; // 0x2
field public static final int REASON_UNCONDITIONAL = 0; // 0x0
field public static final int STATUS_ACTIVE = 1; // 0x1
field public static final int STATUS_FDN_CHECK_FAILURE = 2; // 0x2
field public static final int STATUS_INACTIVE = 0; // 0x0
field public static final int STATUS_NOT_SUPPORTED = 4; // 0x4
field public static final int STATUS_UNKNOWN_ERROR = 3; // 0x3
}
public final class CallQuality implements android.os.Parcelable {
ctor public CallQuality(int, int, int, int, int, int, int, int, int, int, int);
ctor public CallQuality(int, int, int, int, int, int, int, int, int, int, int, boolean, boolean, boolean);
@@ -8743,7 +8721,6 @@ package android.telephony {
method public void onRadioPowerStateChanged(int);
method public void onSrvccStateChanged(int);
method public void onVoiceActivationStateChanged(int);
field @RequiresPermission(android.Manifest.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH) public static final int LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH = 512; // 0x200
field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_CALL_ATTRIBUTES_CHANGED = 67108864; // 0x4000000
field @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_CALL = 268435456; // 0x10000000
field @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_SMS = 536870912; // 0x20000000
@@ -8774,7 +8751,6 @@ package android.telephony {
}
public final class PreciseDataConnectionState implements android.os.Parcelable {
ctor public PreciseDataConnectionState(int, int, int, @NonNull String, @Nullable android.net.LinkProperties, int, @Nullable android.telephony.data.ApnSetting);
method @Deprecated @NonNull public String getDataConnectionApn();
method @Deprecated public int getDataConnectionApnTypeBitMask();
method @Deprecated public int getDataConnectionFailCause();
@@ -9119,8 +9095,6 @@ package android.telephony {
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getAidForAppType(int);
method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers(int);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypes();
method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CallForwardingInfo getCallForwarding(int);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCallWaitingStatus();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int);
method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);
method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);
@@ -9203,8 +9177,6 @@ package android.telephony {
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAlwaysAllowMmsData(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCallForwarding(@NonNull android.telephony.CallForwardingInfo);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCallWaitingStatus(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);
@@ -9245,10 +9217,6 @@ package android.telephony {
field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";
field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";
field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";
field public static final int CALL_WAITING_STATUS_ACTIVE = 1; // 0x1
field public static final int CALL_WAITING_STATUS_INACTIVE = 2; // 0x2
field public static final int CALL_WAITING_STATUS_NOT_SUPPORTED = 4; // 0x4
field public static final int CALL_WAITING_STATUS_UNKNOWN_ERROR = 3; // 0x3
field public static final int CARD_POWER_DOWN = 0; // 0x0
field public static final int CARD_POWER_UP = 1; // 0x1
field public static final int CARD_POWER_UP_PASS_THROUGH = 2; // 0x2

1
api/test-current.txt
View File

@@ -62,7 +62,6 @@ package android.app {
method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);
method public static void resumeAppSwitches() throws android.os.RemoteException;
method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List<java.lang.String>, int);
method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String);
}
public static interface ActivityManager.OnUidImportanceListener {

2
core/java/android/app/ActivityManager.java
View File

@@ -3880,8 +3880,6 @@ public class ActivityManager {
* {@code false} otherwise.
* @hide
*/
@SystemApi
@TestApi
@RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION)
public boolean updateMccMncConfiguration(@NonNull String mcc, @NonNull String mnc) {
if (mcc == null || mnc == null) {

1
core/java/android/telephony/PhoneStateListener.java
View File

@@ -176,7 +176,6 @@ public class PhoneStateListener {
* @hide
*/
@RequiresPermission(android.Manifest.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH)
@SystemApi
public static final int LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH = 0x00000200;
/**

42
telephony/java/android/telephony/Annotation.java
View File

@@ -610,48 +610,6 @@ public class Annotation {
public @interface ImsAudioCodec {
}
/**
* Call forwarding function status
*/
@IntDef(prefix = { "STATUS_" }, value = {
CallForwardingInfo.STATUS_ACTIVE,
CallForwardingInfo.STATUS_INACTIVE,
CallForwardingInfo.STATUS_UNKNOWN_ERROR,
CallForwardingInfo.STATUS_NOT_SUPPORTED,
CallForwardingInfo.STATUS_FDN_CHECK_FAILURE
})
@Retention(RetentionPolicy.SOURCE)
public @interface CallForwardingStatus {
}
/**
* Call forwarding reason types
*/
@IntDef(flag = true, prefix = { "REASON_" }, value = {
CallForwardingInfo.REASON_UNCONDITIONAL,
CallForwardingInfo.REASON_BUSY,
CallForwardingInfo.REASON_NO_REPLY,
CallForwardingInfo.REASON_NOT_REACHABLE,
CallForwardingInfo.REASON_ALL,
CallForwardingInfo.REASON_ALL_CONDITIONAL
})
@Retention(RetentionPolicy.SOURCE)
public @interface CallForwardingReason {
}
/**
* Call waiting function status
*/
@IntDef(prefix = { "CALL_WAITING_STATUS_" }, value = {
TelephonyManager.CALL_WAITING_STATUS_ACTIVE,
TelephonyManager.CALL_WAITING_STATUS_INACTIVE,
TelephonyManager.CALL_WAITING_STATUS_NOT_SUPPORTED,
TelephonyManager.CALL_WAITING_STATUS_UNKNOWN_ERROR
})
@Retention(RetentionPolicy.SOURCE)
public @interface CallWaitingStatus {
}
/**
* UICC SIM Application Types
*/

57
telephony/java/android/telephony/CallForwardingInfo.java
View File

@@ -15,24 +15,24 @@
*/
package android.telephony;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
import android.telephony.Annotation.CallForwardingReason;
import android.telephony.Annotation.CallForwardingStatus;
import com.android.telephony.Rlog;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Objects;
/**
* Defines the call forwarding information.
* @hide
*/
@SystemApi
public final class CallForwardingInfo implements Parcelable {
private static final String TAG = "CallForwardingInfo";
@@ -41,7 +41,6 @@ public final class CallForwardingInfo implements Parcelable {
*
* @hide
*/
@SystemApi
public static final int STATUS_INACTIVE = 0;
/**
@@ -49,7 +48,6 @@ public final class CallForwardingInfo implements Parcelable {
*
* @hide
*/
@SystemApi
public static final int STATUS_ACTIVE = 1;
/**
@@ -58,7 +56,6 @@ public final class CallForwardingInfo implements Parcelable {
*
* @hide
*/
@SystemApi
public static final int STATUS_FDN_CHECK_FAILURE = 2;
/**
@@ -66,7 +63,6 @@ public final class CallForwardingInfo implements Parcelable {
*
* @hide
*/
@SystemApi
public static final int STATUS_UNKNOWN_ERROR = 3;
/**
@@ -74,7 +70,6 @@ public final class CallForwardingInfo implements Parcelable {
*
* @hide
*/
@SystemApi
public static final int STATUS_NOT_SUPPORTED = 4;
/**
@@ -83,7 +78,6 @@ public final class CallForwardingInfo implements Parcelable {
* and conditions +CCFC
* @hide
*/
@SystemApi
public static final int REASON_UNCONDITIONAL = 0;
/**
@@ -92,7 +86,6 @@ public final class CallForwardingInfo implements Parcelable {
* and conditions +CCFC
* @hide
*/
@SystemApi
public static final int REASON_BUSY = 1;
/**
@@ -101,7 +94,6 @@ public final class CallForwardingInfo implements Parcelable {
* and conditions +CCFC
* @hide
*/
@SystemApi
public static final int REASON_NO_REPLY = 2;
/**
@@ -110,7 +102,6 @@ public final class CallForwardingInfo implements Parcelable {
* and conditions +CCFC
* @hide
*/
@SystemApi
public static final int REASON_NOT_REACHABLE = 3;
/**
@@ -120,7 +111,6 @@ public final class CallForwardingInfo implements Parcelable {
* and conditions +CCFC
* @hide
*/
@SystemApi
public static final int REASON_ALL = 4;
/**
@@ -130,20 +120,48 @@ public final class CallForwardingInfo implements Parcelable {
* and conditions +CCFC
* @hide
*/
@SystemApi
public static final int REASON_ALL_CONDITIONAL = 5;
/**
* Call forwarding function status
*/
@IntDef(prefix = { "STATUS_" }, value = {
STATUS_ACTIVE,
STATUS_INACTIVE,
STATUS_UNKNOWN_ERROR,
STATUS_NOT_SUPPORTED,
STATUS_FDN_CHECK_FAILURE
})
@Retention(RetentionPolicy.SOURCE)
public @interface CallForwardingStatus {
}
/**
* Call forwarding reason types
*/
@IntDef(flag = true, prefix = { "REASON_" }, value = {
REASON_UNCONDITIONAL,
REASON_BUSY,
REASON_NO_REPLY,
REASON_NOT_REACHABLE,
REASON_ALL,
REASON_ALL_CONDITIONAL
})
@Retention(RetentionPolicy.SOURCE)
public @interface CallForwardingReason {
}
/**
* The call forwarding status.
*/
private @CallForwardingStatus int mStatus;
private int mStatus;
/**
* The call forwarding reason indicates the condition under which calls will be forwarded.
* Reference: 3GPP TS 27.007 version 10.3.0 Release 10 - 7.11 Call forwarding number
* and conditions +CCFC
*/
private @CallForwardingReason int mReason;
private int mReason;
/**
* The phone number to which calls will be forwarded.
@@ -166,7 +184,6 @@ public final class CallForwardingInfo implements Parcelable {
* @param timeSeconds the timeout (in seconds) before the forwarding is attempted
* @hide
*/
@SystemApi
public CallForwardingInfo(@CallForwardingStatus int status, @CallForwardingReason int reason,
@Nullable String number, int timeSeconds) {
mStatus = status;
@@ -182,7 +199,6 @@ public final class CallForwardingInfo implements Parcelable {
*
* @hide
*/
@SystemApi
public @CallForwardingStatus int getStatus() {
return mStatus;
}
@@ -196,7 +212,6 @@ public final class CallForwardingInfo implements Parcelable {
*
* @hide
*/
@SystemApi
public @CallForwardingReason int getReason() {
return mReason;
}
@@ -209,7 +224,6 @@ public final class CallForwardingInfo implements Parcelable {
*
* @hide
*/
@SystemApi
@Nullable
public String getNumber() {
return mNumber;
@@ -227,7 +241,6 @@ public final class CallForwardingInfo implements Parcelable {
*
* @hide
*/
@SystemApi
@SuppressLint("MethodNameUnits")
public int getTimeoutSeconds() {
return mTimeSeconds;

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

@@ -95,7 +95,6 @@ public final class PreciseDataConnectionState implements Parcelable {
* if there is no valid APN setting for the specific type, then this will be null
* @hide
*/
@SystemApi
public PreciseDataConnectionState(@DataState int state,
@NetworkType int networkType,
@ApnType int apnTypes, @NonNull String apn,

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

@@ -70,14 +70,13 @@ import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telephony.Annotation.ApnType;
import android.telephony.Annotation.CallForwardingReason;
import android.telephony.Annotation.CallState;
import android.telephony.Annotation.CallWaitingStatus;
import android.telephony.Annotation.CarrierPrivilegeStatus;
import android.telephony.Annotation.NetworkType;
import android.telephony.Annotation.RadioPowerState;
import android.telephony.Annotation.SimActivationState;
import android.telephony.Annotation.UiccAppType;
import android.telephony.CallForwardingInfo.CallForwardingReason;
import android.telephony.VisualVoicemailService.VisualVoicemailTask;
import android.telephony.data.ApnSetting;
import android.telephony.data.ApnSetting.MvnoType;
@@ -12605,7 +12604,6 @@ public class TelephonyManager {
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@NonNull
public CallForwardingInfo getCallForwarding(@CallForwardingReason int callForwardingReason) {
@@ -12652,7 +12650,6 @@ public class TelephonyManager {
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public boolean setCallForwarding(@NonNull CallForwardingInfo callForwardingInfo) {
if (callForwardingInfo == null) {
@@ -12693,7 +12690,6 @@ public class TelephonyManager {
*
* @hide
*/
@SystemApi
public static final int CALL_WAITING_STATUS_ACTIVE = 1;
/**
@@ -12701,7 +12697,6 @@ public class TelephonyManager {
*
* @hide
*/
@SystemApi
public static final int CALL_WAITING_STATUS_INACTIVE = 2;
/**
@@ -12709,7 +12704,6 @@ public class TelephonyManager {
*
* @hide
*/
@SystemApi
public static final int CALL_WAITING_STATUS_UNKNOWN_ERROR = 3;
/**
@@ -12717,9 +12711,23 @@ public class TelephonyManager {
*
* @hide
*/
@SystemApi
public static final int CALL_WAITING_STATUS_NOT_SUPPORTED = 4;
/**
* Call waiting function status
*
* @hide
*/
@IntDef(prefix = { "CALL_WAITING_STATUS_" }, value = {
CALL_WAITING_STATUS_ACTIVE,
CALL_WAITING_STATUS_INACTIVE,
CALL_WAITING_STATUS_NOT_SUPPORTED,
CALL_WAITING_STATUS_UNKNOWN_ERROR
})
@Retention(RetentionPolicy.SOURCE)
public @interface CallWaitingStatus {
}
/**
* Gets the status of voice call waiting function. Call waiting function enables the waiting
* for the incoming call when it reaches the user who is busy to make another call and allows
@@ -12728,7 +12736,6 @@ public class TelephonyManager {
* @return the status of call waiting function.
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @CallWaitingStatus int getCallWaitingStatus() {
try {
@@ -12754,7 +12761,6 @@ public class TelephonyManager {
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public boolean setCallWaitingStatus(boolean isEnable) {
try {