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

Commit 13308eb2 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge changes from topic "RVC-SDK-Finalization-master" 

* changes:
  Revert an API breaking changes
  Updating platform SDK version for R
parents d75be142 ea8a2145

api/current.txt

+16 −15
Original line number Diff line number Diff line
@@ -289,9 +289,9 @@ package android { 
    field public static final int allowAudioPlaybackCapture = 16844289; // 0x1010601

    field public static final int allowBackup = 16843392; // 0x1010280

    field public static final int allowClearUserData = 16842757; // 0x1010005

    field public static final int allowClickWhenDisabled = 16844325; // 0x1010625

    field public static final int allowClickWhenDisabled = 16844312; // 0x1010618

    field public static final int allowEmbedded = 16843765; // 0x10103f5

    field public static final int allowNativeHeapPointerTagging = 16844307; // 0x1010613

    field public static final int allowNativeHeapPointerTagging = 16844306; // 0x1010612

    field public static final int allowParallelSyncs = 16843570; // 0x1010332

    field public static final int allowSingleTap = 16843353; // 0x1010259

    field public static final int allowTaskReparenting = 16843268; // 0x1010204
@@ -327,7 +327,7 @@ package android { 
    field public static final int autoLink = 16842928; // 0x10100b0

    field public static final int autoMirrored = 16843754; // 0x10103ea

    field public static final int autoRemoveFromRecents = 16843847; // 0x1010447

    field public static final int autoRevokePermissions = 16844309; // 0x1010615

    field public static final int autoRevokePermissions = 16844307; // 0x1010613

    field public static final int autoSizeMaxTextSize = 16844102; // 0x1010546

    field public static final int autoSizeMinTextSize = 16844088; // 0x1010538

    field public static final int autoSizePresetSizes = 16844087; // 0x1010537
@@ -392,7 +392,7 @@ package android { 
    field public static final int canRequestFingerprintGestures = 16844109; // 0x101054d

    field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7

    field public static final int canRetrieveWindowContent = 16843653; // 0x1010385

    field public static final int canTakeScreenshot = 16844304; // 0x1010610

    field public static final int canTakeScreenshot = 16844303; // 0x101060f

    field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230

    field public static final int cantSaveState = 16844142; // 0x101056e

    field @Deprecated public static final int capitalize = 16843113; // 0x1010169
@@ -487,7 +487,7 @@ package android { 
    field public static final int countDown = 16844059; // 0x101051b

    field public static final int country = 16843962; // 0x10104ba

    field public static final int cropToPadding = 16843043; // 0x1010123

    field public static final int crossProfile = 16844303; // 0x101060f

    field public static final int crossProfile = 16844302; // 0x101060e

    field public static final int cursorVisible = 16843090; // 0x1010152

    field public static final int customNavigationLayout = 16843474; // 0x10102d2

    field public static final int customTokens = 16843579; // 0x101033b
@@ -709,7 +709,7 @@ package android { 
    field public static final int gravity = 16842927; // 0x10100af

    field public static final int gridViewStyle = 16842865; // 0x1010071

    field public static final int groupIndicator = 16843019; // 0x101010b

    field public static final int gwpAsanMode = 16844312; // 0x1010618

    field public static final int gwpAsanMode = 16844310; // 0x1010616

    field public static final int hand_hour = 16843011; // 0x1010103

    field public static final int hand_minute = 16843012; // 0x1010104

    field public static final int handle = 16843354; // 0x101025a
@@ -954,7 +954,7 @@ package android { 
    field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad

    field public static final int mediaRouteTypes = 16843694; // 0x10103ae

    field public static final int menuCategory = 16843230; // 0x10101de

    field public static final int mimeGroup = 16844311; // 0x1010617

    field public static final int mimeGroup = 16844309; // 0x1010615

    field public static final int mimeType = 16842790; // 0x1010026

    field public static final int min = 16844089; // 0x1010539

    field public static final int minAspectRatio = 16844187; // 0x101059b
@@ -1083,7 +1083,7 @@ package android { 
    field public static final int preferenceScreenStyle = 16842891; // 0x101008b

    field public static final int preferenceStyle = 16842894; // 0x101008e

    field public static final int presentationTheme = 16843712; // 0x10103c0

    field public static final int preserveLegacyExternalStorage = 16844310; // 0x1010616

    field public static final int preserveLegacyExternalStorage = 16844308; // 0x1010614

    field public static final int previewImage = 16843482; // 0x10102da

    field public static final int primaryContentAlpha = 16844114; // 0x1010552

    field public static final int priority = 16842780; // 0x101001c
@@ -1165,7 +1165,7 @@ package android { 
    field public static final int right = 16843183; // 0x10101af

    field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093

    field public static final int ringtoneType = 16843257; // 0x10101f9

    field public static final int rollbackDataPolicy = 16844314; // 0x101061a

    field public static final int rollbackDataPolicy = 16844311; // 0x1010617

    field public static final int rotation = 16843558; // 0x1010326

    field public static final int rotationAnimation = 16844090; // 0x101053a

    field public static final int rotationX = 16843559; // 0x1010327
@@ -1347,7 +1347,7 @@ package android { 
    field public static final int summaryOff = 16843248; // 0x10101f0

    field public static final int summaryOn = 16843247; // 0x10101ef

    field public static final int supportsAssist = 16844016; // 0x10104f0

    field public static final int supportsInlineSuggestions = 16844302; // 0x101060e

    field public static final int supportsInlineSuggestions = 16844301; // 0x101060d

    field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1

    field public static final int supportsLocalInteraction = 16844047; // 0x101050f

    field public static final int supportsMultipleDisplays = 16844182; // 0x1010596
@@ -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);
@@ -35894,7 +35894,8 @@ package android.os { 
    field public static final int O_MR1 = 27; // 0x1b

    field public static final int P = 28; // 0x1c

    field public static final int Q = 29; // 0x1d

    field public static final int R = 10000; // 0x2710

    field public static final int R = 30; // 0x1e

    field public static final int S = 10000; // 0x2710

  }















  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {










@@ -48239,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/removed.txt



+0
−8






























Original line number
Diff line number
Diff line















// Signature format: 2.0













package android {



























  public static final class R.attr {













    field public static final int featureId = 16844301; // 0x101060d













  }



























}





























package android.app {































  public class ActivityManager {

































api/system-current.txt



+8
−6






























Original line number
Diff line number
Diff line








@@ -256,10 +256,10 @@ package android {













  public static final class R.attr {















    field public static final int allowClearUserDataOnFailedRestore = 16844288; // 0x1010600















    field public static final int isVrOnly = 16844152; // 0x1010578













    field public static final int minExtensionVersion = 16844306; // 0x1010612













    field public static final int minExtensionVersion = 16844305; // 0x1010611















    field public static final int requiredSystemPropertyName = 16844133; // 0x1010565















    field public static final int requiredSystemPropertyValue = 16844134; // 0x1010566













    field public static final int sdkVersion = 16844305; // 0x1010611













    field public static final int sdkVersion = 16844304; // 0x1010610















    field public static final int supportsAmbientMode = 16844173; // 0x101058d















    field public static final int userRestriction = 16844164; // 0x1010584















  }










@@ -291,8 +291,8 @@ package android {













  public static final class R.string {















    field public static final int config_defaultAssistant = 17039393; // 0x1040021















    field public static final int config_defaultBrowser = 17039394; // 0x1040022













    field public static final int config_defaultCallRedirection = 17039400; // 0x1040028













    field public static final int config_defaultCallScreening = 17039401; // 0x1040029













    field public static final int config_defaultCallRedirection = 17039397; // 0x1040025













    field public static final int config_defaultCallScreening = 17039398; // 0x1040026















    field public static final int config_defaultDialer = 17039395; // 0x1040023















    field public static final int config_defaultSms = 17039396; // 0x1040024















    field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f









@@ -301,7 +301,7 @@ package android {













    field public static final int config_helpIntentNameKey = 17039390; // 0x104001e















    field public static final int config_helpPackageNameKey = 17039387; // 0x104001b















    field public static final int config_helpPackageNameValue = 17039388; // 0x104001c













    field public static final int config_systemGallery = 17039402; // 0x104002a













    field public static final int config_systemGallery = 17039399; // 0x1040027















  }





























  public static final class R.style {










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

























api/test-current.txt



+1
−1






























Original line number
Diff line number
Diff line








@@ -38,7 +38,7 @@ package android {













  public static final class R.string {















    field public static final int config_defaultAssistant = 17039393; // 0x1040021















    field public static final int config_defaultDialer = 17039395; // 0x1040023













    field public static final int config_systemGallery = 17039402; // 0x104002a













    field public static final int config_systemGallery = 17039399; // 0x1040027















  }































}

































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.