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

Merge "Rollback SystemApis for Mainline" am: 127fd8d6e8

Browse Source 
Change-Id: I3f6beffb6459e095e766f483d13ff7831e60d75a
This commit is contained in:
Automerger Merge Worker
2020-03-13 21:50:31 +00:00
parent 139fb3e1c8 127fd8d6e8
commit 1285a78ec0
3 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/system-current.txt
View File

@@ -8949,19 +8949,6 @@ package android.telephony {
field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final int LISTEN_VOICE_ACTIVATION_STATE = 131072; // 0x20000 field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final int LISTEN_VOICE_ACTIVATION_STATE = 131072; // 0x20000
} }
public final class PinResult implements android.os.Parcelable {
ctor public PinResult(int, int);
method public int describeContents();
method public int getAttemptsRemaining();
method @NonNull public static android.telephony.PinResult getDefaultFailedResult();
method public int getType();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.PinResult> CREATOR;
field public static final int PIN_RESULT_TYPE_FAILURE = 2; // 0x2
field public static final int PIN_RESULT_TYPE_INCORRECT = 1; // 0x1
field public static final int PIN_RESULT_TYPE_SUCCESS = 0; // 0x0
}
public final class PreciseCallState implements android.os.Parcelable { public final class PreciseCallState implements android.os.Parcelable {
ctor public PreciseCallState(int, int, int, int, int); ctor public PreciseCallState(int, int, int, int, int);
method public int describeContents(); method public int describeContents();
@@ -9443,10 +9430,8 @@ package android.telephony {
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoiceActivationState(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoiceActivationState(int);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void shutdownAllRadios(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void shutdownAllRadios();
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean supplyPin(String); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean supplyPin(String);
method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult supplyPinReportPinResult(@NonNull String);
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPinReportResult(String); method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPinReportResult(String);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean supplyPuk(String, String); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean supplyPuk(String, String);
method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult supplyPukReportPinResult(@NonNull String, @NonNull String);
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPukReportResult(String, String); method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPukReportResult(String, String);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean switchSlots(int[]); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean switchSlots(int[]);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void toggleRadioOnOff(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void toggleRadioOnOff();

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

@@ -19,7 +19,6 @@ package android.telephony;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -32,7 +31,6 @@ import java.util.Objects;
* *
* @hide * @hide
*/ */
@SystemApi
public final class PinResult implements Parcelable { public final class PinResult implements Parcelable {
/** @hide */ /** @hide */
@IntDef({ @IntDef({

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

@@ -8698,7 +8698,6 @@ public class TelephonyManager {
* *
* @hide * @hide
*/ */
@SystemApi
@Nullable @Nullable
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public PinResult supplyPinReportPinResult(@NonNull String pin) { public PinResult supplyPinReportPinResult(@NonNull String pin) {
@@ -8723,7 +8722,6 @@ public class TelephonyManager {
* *
* @hide * @hide
*/ */
@SystemApi
@Nullable @Nullable
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public PinResult supplyPukReportPinResult(@NonNull String puk, @NonNull String pin) { public PinResult supplyPukReportPinResult(@NonNull String puk, @NonNull String pin) {