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

Commit ea8a2145 authored by Svet Ganov's avatar Svet Ganov
Browse files

Revert an API breaking changes 

bug:150281259

Test: N/A

Change-Id: Ie30286456af15dd7b81bceb0547ffe8bfac422d2
parent ed460aa1

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -10768,7 +10768,6 @@ package android.content { 
    field public static final String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";

    field public static final String EXTRA_DURATION_MILLIS = "android.intent.extra.DURATION_MILLIS";

    field public static final String EXTRA_EMAIL = "android.intent.extra.EMAIL";

    field public static final String EXTRA_EPOCH_TIME = "android.intent.extra.EPOCH_TIME";

    field public static final String EXTRA_EXCLUDE_COMPONENTS = "android.intent.extra.EXCLUDE_COMPONENTS";

    field public static final String EXTRA_FROM_STORAGE = "android.intent.extra.FROM_STORAGE";

    field public static final String EXTRA_HTML_TEXT = "android.intent.extra.HTML_TEXT";
@@ -10810,6 +10809,7 @@ package android.content { 
    field public static final String EXTRA_SUSPENDED_PACKAGE_EXTRAS = "android.intent.extra.SUSPENDED_PACKAGE_EXTRAS";

    field public static final String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";

    field public static final String EXTRA_TEXT = "android.intent.extra.TEXT";

    field public static final String EXTRA_TIME = "android.intent.extra.TIME";

    field public static final String EXTRA_TIMEZONE = "time-zone";

    field public static final String EXTRA_TITLE = "android.intent.extra.TITLE";

    field public static final String EXTRA_UID = "android.intent.extra.UID";
@@ -23550,8 +23550,8 @@ package android.location { 
  public static final class GnssAntennaInfo.SphericalCorrections implements android.os.Parcelable {

    ctor public GnssAntennaInfo.SphericalCorrections(@NonNull double[][], @NonNull double[][]);

    method public int describeContents();

    method @NonNull public double[][] getCorrectionUncertaintiesMatrix();

    method @NonNull public double[][] getCorrectionsMatrix();

    method @NonNull public double[][] getCorrectionUncertaintiesArray();

    method @NonNull public double[][] getCorrectionsArray();

    method @FloatRange(from=0.0f, to=180.0f) public double getDeltaPhi();

    method @FloatRange(from=0.0f, to=360.0f) public double getDeltaTheta();

    method public void writeToParcel(@NonNull android.os.Parcel, int);
@@ -48240,7 +48240,7 @@ package android.telephony { 
    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getImei();

    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getImei(int);

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_PHONE_NUMBERS}) public String getLine1Number();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public String getManualNetworkSelectionPlmn();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public String getManualNetworkSelectionPlmn();

    method @Nullable public String getManufacturerCode();

    method @Nullable public String getManufacturerCode(int);

    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getMeid();

api/system-current.txt

+3 −1
Original line number Diff line number Diff line
@@ -9776,7 +9776,7 @@ package android.service.euicc { 
  public abstract class EuiccService extends android.app.Service {

    ctor public EuiccService();

    method public void dump(@NonNull java.io.PrintWriter);

    method public int encodeSmdxSubjectAndReasonCode(@NonNull String, @NonNull String);

    method public int encodeSmdxSubjectAndReasonCode(@Nullable String, @Nullable String);

    method @CallSuper public android.os.IBinder onBind(android.content.Intent);

    method public abstract int onDeleteSubscription(int, String);

    method public android.service.euicc.DownloadSubscriptionResult onDownloadSubscription(int, @NonNull android.telephony.euicc.DownloadableSubscription, boolean, boolean, @Nullable android.os.Bundle);
@@ -11069,6 +11069,7 @@ package android.telephony { 
  }















  public class SmsMessage {













    method @Nullable public static android.telephony.SmsMessage createFromNativeSmsSubmitPdu(@NonNull byte[], boolean);















    method @Nullable public static android.telephony.SmsMessage.SubmitPdu getSmsPdu(int, int, @Nullable String, @NonNull String, @NonNull String, long);















    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static byte[] getSubmitPduEncodedMessage(boolean, @NonNull String, @NonNull String, int, @IntRange(from=0) int, @IntRange(from=0) int, @IntRange(from=0, to=255) int, @IntRange(from=1, to=255) int, @IntRange(from=1, to=255) int);















  }










@@ -11176,6 +11177,7 @@ package android.telephony {













    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();















    method public int getMaxNumberOfSimultaneouslyActiveSims();















    method public static long getMaxNumberVerificationTimeoutMillis();













    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String[] getMergedImsisFromGroup();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmask();















    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public int getRadioPowerState();















    method public int getSimApplicationState();

























core/java/android/content/Intent.java



+3
−3






























Original line number
Diff line number
Diff line








@@ -758,14 +758,14 @@ public class Intent implements Parcelable, Cloneable {













     * Activity Action: Creates a reminder.















     * <p>Input: {@link #EXTRA_TITLE} The title of the reminder that will be shown to the user.















     * {@link #EXTRA_TEXT} The reminder text that will be shown to the user. The intent should at













     * least specify a title or a text. {@link #EXTRA_EPOCH_TIME} The time when the reminder will













     * least specify a title or a text. {@link #EXTRA_TIME} The time when the reminder will















     * be shown to the user. The time is specified in milliseconds since the Epoch (optional).















     * </p>















     * <p>Output: Nothing.</p>















     *















     * @see #EXTRA_TITLE















     * @see #EXTRA_TEXT













     * @see #EXTRA_EPOCH_TIME













     * @see #EXTRA_TIME















     */















    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)















    public static final String ACTION_CREATE_REMINDER = "android.intent.action.CREATE_REMINDER";










@@ -5784,7 +5784,7 @@ public class Intent implements Parcelable, Cloneable {













     * Type: long















     * </p>















     */













    public static final String EXTRA_EPOCH_TIME = "android.intent.extra.EPOCH_TIME";













    public static final String EXTRA_TIME = "android.intent.extra.TIME";































    /**















     * Extra sent with {@link #ACTION_TIMEZONE_CHANGED} specifying the new time zone of the device.

































location/java/android/location/GnssAntennaInfo.java



+8
−33






























Original line number
Diff line number
Diff line








@@ -95,55 +95,31 @@ public final class GnssAntennaInfo implements Parcelable {













                    }















                };





























        /**













         * Returns the x-axis offset of the phase center from the origin of the Android sensor













         * coordinate system, in millimeters.













         */















        @FloatRange()















        public double getXOffsetMm() {















            return mOffsetXMm;















        }





























        /**













         * Returns the 1-sigma uncertainty of the x-axis offset of the phase center from the origin













         * of the Android sensor coordinate system, in millimeters.













         */















        @FloatRange()















        public double getXOffsetUncertaintyMm() {















            return mOffsetXUncertaintyMm;















        }





























        /**













         * Returns the y-axis offset of the phase center from the origin of the Android sensor













         * coordinate system, in millimeters.













         */















        @FloatRange()















        public double getYOffsetMm() {















            return mOffsetYMm;















        }





























        /**













         * Returns the 1-sigma uncertainty of the y-axis offset of the phase center from the origin













         * of the Android sensor coordinate system, in millimeters.













         */















        @FloatRange()















        public double getYOffsetUncertaintyMm() {















            return mOffsetYUncertaintyMm;















        }





























        /**













         * Returns the z-axis offset of the phase center from the origin of the Android sensor













         * coordinate system, in millimeters.













         */















        @FloatRange()















        public double getZOffsetMm() {















            return mOffsetZMm;















        }





























        /**













         * Returns the 1-sigma uncertainty of the z-axis offset of the phase center from the origin













         * of the Android sensor coordinate system, in millimeters.













         */















        @FloatRange()















        public double getZOffsetUncertaintyMm() {















            return mOffsetZUncertaintyMm;










@@ -178,8 +154,7 @@ public final class GnssAntennaInfo implements Parcelable {













     * Represents corrections on a spherical mapping. Corrections are added to measurements to















     * obtain the corrected values.















     *













     * The corrections and associated (1-sigma) uncertainties are represented by respective 2D













     * matrices.













     * The corrections and associated (1-sigma) uncertainties are represented by respect 2D arrays.















     *















     * Each row (major indices) represents a fixed theta. The first row corresponds to a















     * theta angle of 0 degrees. The last row corresponds to a theta angle of (360 - deltaTheta)









@@ -202,18 +177,18 @@ public final class GnssAntennaInfo implements Parcelable {













                @NonNull double[][] correctionUncertainties) {















            if (corrections.length != correctionUncertainties.length















                    || corrections[0].length != correctionUncertainties[0].length) {













                throw new IllegalArgumentException("Correction and correction uncertainty matrices "













                throw new IllegalArgumentException("Correction and correction uncertainty arrays "















                        + "must have the same dimensions.");















            }































            mNumRows = corrections.length;















            if (mNumRows < 1) {













                throw new IllegalArgumentException("Matrix must have at least one row.");













                throw new IllegalArgumentException("Arrays must have at least one row.");















            }































            mNumColumns = corrections[0].length;















            if (mNumColumns < 2) {













                throw new IllegalArgumentException("Matrix must have at least two columns.");













                throw new IllegalArgumentException("Arrays must have at least two columns.");















            }































            mCorrections = corrections;










@@ -248,7 +223,7 @@ public final class GnssAntennaInfo implements Parcelable {













        }































        /**













         * Matrix representing corrections on a spherical mapping. Corrections are added to













         * Array representing corrections on a spherical mapping. Corrections are added to















         * measurements to obtain the corrected values.















         *















         * Each row (major indices) represents a fixed theta. The first row corresponds to a









@@ -261,12 +236,12 @@ public final class GnssAntennaInfo implements Parcelable {













         * angles, i.e., deltaPhi = 180 / (number of columns - 1).















         */















        @NonNull













        public double[][] getCorrectionsMatrix() {













        public double[][] getCorrectionsArray() {















            return mCorrections;















        }































        /**













         * Matrix representing uncertainty on corrections on a spherical mapping.













         * Array representing uncertainty on corrections on a spherical mapping.















         *















         * Each row (major indices) represents a fixed theta. The first row corresponds to a















         * theta angle of 0 degrees. The last row corresponds to a theta angle of (360 - deltaTheta)









@@ -278,7 +253,7 @@ public final class GnssAntennaInfo implements Parcelable {













         * angles, i.e., deltaPhi = 180 / (number of columns - 1).















         */















        @NonNull













        public double[][] getCorrectionUncertaintiesMatrix() {













        public double[][] getCorrectionUncertaintiesArray() {















            return mCorrectionUncertainties;















        }

















































telephony/api/system-current.txt



+2
−0






























Original line number
Diff line number
Diff line








@@ -562,6 +562,7 @@ package android.telephony {













  }































  public class SmsMessage {













    method @Nullable public static android.telephony.SmsMessage createFromNativeSmsSubmitPdu(@NonNull byte[], boolean);















    method @Nullable public static android.telephony.SmsMessage.SubmitPdu getSmsPdu(int, int, @Nullable String, @NonNull String, @NonNull String, long);















    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static byte[] getSubmitPduEncodedMessage(boolean, @NonNull String, @NonNull String, int, @IntRange(from=0) int, @IntRange(from=0) int, @IntRange(from=0, to=255) int, @IntRange(from=1, to=255) int, @IntRange(from=1, to=255) int);















  }










@@ -663,6 +664,7 @@ package android.telephony {













    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();















    method public int getMaxNumberOfSimultaneouslyActiveSims();















    method public static long getMaxNumberVerificationTimeoutMillis();













    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String[] getMergedImsisFromGroup();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmask();















    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public int getRadioPowerState();















    method public int getSimApplicationState();