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

Commit b988056b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7534696, 7534697, 7534649, 7533589, 7533590, 7533591,... 

Merge cherrypicks of [7534696, 7534697, 7534649, 7533589, 7533590, 7533591, 7533592, 7534653, 7534654, 7534758, 7534628, 7534655, 7534629, 7534630, 7533594, 7534779, 7534771, 7535018, 7534136, 7533725, 7533726, 7535065, 7535066, 7533727, 7534940, 7533192, 7535067, 7535023, 7535024, 7533728, 7533729, 7533730, 7533731, 7535026, 7533732, 7534941, 7534942, 7534943, 7535068, 7535069, 7534944, 7535028, 7535070, 7535071, 7535073, 7535534, 7535029, 7535030, 75350778, 7535600, 7535602, 7535037, 7535718, 7535719, 7534948, 7535609, 7535610, 7535725, 7534949, 7535611, 7535612, 7535780, 7535613, 7535614, 7534951, 7535726, 7534952, 7535838, 7535727] into qt-release

Change-Id: I884969f4d237d5573e74328cdeeb44031ac62f84
parents 43ec8359 4e4c6dd3

api/current.txt

+17 −27
Original line number Diff line number Diff line
@@ -220,12 +220,6 @@ package android { 














  public static final class R.attr {















    ctor public R.attr();













    field public static final int __removed1 = 16844185; // 0x1010599













    field public static final int __removed2 = 16844186; // 0x101059a













    field public static final int __removed3 = 16844187; // 0x101059b













    field public static final int __removed4 = 16844188; // 0x101059c













    field public static final int __removed5 = 16844189; // 0x101059d













    field public static final int __removed6 = 16844182; // 0x1010596















    field public static final int absListViewStyle = 16842858; // 0x101006a















    field public static final int accessibilityEventTypes = 16843648; // 0x1010380















    field public static final int accessibilityFeedbackType = 16843650; // 0x1010382










@@ -284,7 +278,7 @@ package android {













    field public static final int alertDialogTheme = 16843529; // 0x1010309















    field public static final int alignmentMode = 16843642; // 0x101037a















    field public static final int allContactsName = 16843468; // 0x10102cc













    field public static final int allowAudioPlaybackCapture = 16844199; // 0x10105a7













    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 allowEmbedded = 16843765; // 0x10103f5










@@ -572,8 +566,8 @@ package android {













    field public static final int endX = 16844050; // 0x1010512















    field public static final int endY = 16844051; // 0x1010513















    field @Deprecated public static final int endYear = 16843133; // 0x101017d













    field public static final int enforceNavigationBarContrast = 16844203; // 0x10105ab













    field public static final int enforceStatusBarContrast = 16844202; // 0x10105aa













    field public static final int enforceNavigationBarContrast = 16844293; // 0x1010605













    field public static final int enforceStatusBarContrast = 16844292; // 0x1010604















    field public static final int enterFadeDuration = 16843532; // 0x101030c















    field public static final int entries = 16842930; // 0x10100b2















    field public static final int entryValues = 16843256; // 0x10101f8










@@ -646,10 +640,10 @@ package android {













    field public static final int footerDividersEnabled = 16843311; // 0x101022f















    field public static final int forceDarkAllowed = 16844172; // 0x101058c















    field public static final int forceHasOverlappingRendering = 16844065; // 0x1010521













    field public static final int forceUriPermissions = 16844197; // 0x10105a5













    field public static final int forceUriPermissions = 16844191; // 0x101059f















    field public static final int foreground = 16843017; // 0x1010109















    field public static final int foregroundGravity = 16843264; // 0x1010200













    field public static final int foregroundServiceType = 16844191; // 0x101059f













    field public static final int foregroundServiceType = 16844185; // 0x1010599















    field public static final int foregroundTint = 16843885; // 0x101046d















    field public static final int foregroundTintMode = 16843886; // 0x101046e















    field public static final int format = 16843013; // 0x1010105










@@ -707,7 +701,7 @@ package android {













    field public static final int hapticFeedbackEnabled = 16843358; // 0x101025e















    field public static final int hardwareAccelerated = 16843475; // 0x10102d3















    field public static final int hasCode = 16842764; // 0x101000c













    field public static final int hasFragileUserData = 16844192; // 0x10105a0













    field public static final int hasFragileUserData = 16844186; // 0x101059a















    field @Deprecated public static final int headerAmPmTextAppearance = 16843936; // 0x10104a0















    field public static final int headerBackground = 16843055; // 0x101012f















    field @Deprecated public static final int headerDayOfMonthTextAppearance = 16843927; // 0x1010497










@@ -735,7 +729,7 @@ package android {













    field public static final int iconTintMode = 16844127; // 0x101055f















    field public static final int iconifiedByDefault = 16843514; // 0x10102fa















    field public static final int id = 16842960; // 0x10100d0













    field public static final int identifier = 16844204; // 0x10105ac













    field public static final int identifier = 16844294; // 0x1010606















    field public static final int ignoreGravity = 16843263; // 0x10101ff















    field public static final int imageButtonStyle = 16842866; // 0x1010072















    field public static final int imageWellStyle = 16842867; // 0x1010073










@@ -767,7 +761,7 @@ package android {













    field public static final int indicatorRight = 16843022; // 0x101010e















    field public static final int indicatorStart = 16843729; // 0x10103d1















    field public static final int inflatedId = 16842995; // 0x10100f3













    field public static final int inheritShowWhenLocked = 16844194; // 0x10105a2













    field public static final int inheritShowWhenLocked = 16844188; // 0x101059c















    field public static final int initOrder = 16842778; // 0x101001a















    field public static final int initialKeyguardLayout = 16843714; // 0x10103c2















    field public static final int initialLayout = 16843345; // 0x1010251










@@ -944,7 +938,7 @@ package android {













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















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















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













    field public static final int minAspectRatio = 16844193; // 0x10105a1













    field public static final int minAspectRatio = 16844187; // 0x101059b















    field public static final int minDate = 16843583; // 0x101033f















    field public static final int minEms = 16843098; // 0x101015a















    field public static final int minHeight = 16843072; // 0x1010140










@@ -1125,7 +1119,7 @@ package android {













    field public static final int reqKeyboardType = 16843304; // 0x1010228















    field public static final int reqNavigation = 16843306; // 0x101022a















    field public static final int reqTouchScreen = 16843303; // 0x1010227













    field public static final int requestLegacyExternalStorage = 16844201; // 0x10105a9













    field public static final int requestLegacyExternalStorage = 16844291; // 0x1010603















    field public static final int requireDeviceUnlock = 16843756; // 0x10103ec















    field public static final int required = 16843406; // 0x101028e















    field public static final int requiredAccountType = 16843734; // 0x10103d6










@@ -1204,7 +1198,7 @@ package android {













    field public static final int secondaryProgress = 16843064; // 0x1010138















    field public static final int secondaryProgressTint = 16843879; // 0x1010467















    field public static final int secondaryProgressTintMode = 16843880; // 0x1010468













    field public static final int secureElementName = 16844200; // 0x10105a8













    field public static final int secureElementName = 16844290; // 0x1010602















    field public static final int seekBarStyle = 16842875; // 0x101007b















    field public static final int segmentedButtonStyle = 16843568; // 0x1010330















    field public static final int selectAllOnFocus = 16843102; // 0x101015e









@@ -1213,7 +1207,7 @@ package android {













    field public static final int selectableItemBackgroundBorderless = 16843868; // 0x101045c















    field @Deprecated public static final int selectedDateVerticalBar = 16843591; // 0x1010347















    field @Deprecated public static final int selectedWeekBackgroundColor = 16843586; // 0x1010342













    field public static final int selectionDividerHeight = 16844190; // 0x101059e













    field public static final int selectionDividerHeight = 16844184; // 0x1010598















    field public static final int sessionService = 16843837; // 0x101043d















    field public static final int settingsActivity = 16843301; // 0x1010225















    field public static final int settingsSliceUri = 16844179; // 0x1010593










@@ -1332,7 +1326,7 @@ package android {













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















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















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













    field public static final int supportsMultipleDisplays = 16844183; // 0x1010597













    field public static final int supportsMultipleDisplays = 16844182; // 0x1010596















    field public static final int supportsPictureInPicture = 16844023; // 0x10104f7















    field public static final int supportsRtl = 16843695; // 0x10103af















    field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb










@@ -1513,9 +1507,9 @@ package android {













    field public static final int unselectedAlpha = 16843278; // 0x101020e















    field public static final int updatePeriodMillis = 16843344; // 0x1010250















    field public static final int use32bitAbi = 16844053; // 0x1010515













    field public static final int useAppZygote = 16844184; // 0x1010598













    field public static final int useAppZygote = 16844183; // 0x1010597















    field public static final int useDefaultMargins = 16843641; // 0x1010379













    field public static final int useEmbeddedDex = 16844196; // 0x10105a4













    field public static final int useEmbeddedDex = 16844190; // 0x101059e















    field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310















    field public static final int useLevel = 16843167; // 0x101019f















    field public static final int userVisible = 16843409; // 0x1010291










@@ -1627,7 +1621,7 @@ package android {













    field @Deprecated public static final int yearListSelectorColor = 16843930; // 0x101049a















    field public static final int yesNoPreferenceStyle = 16842896; // 0x1010090















    field public static final int zAdjustment = 16843201; // 0x10101c1













    field public static final int zygotePreloadName = 16844195; // 0x10105a3













    field public static final int zygotePreloadName = 16844189; // 0x101059d















  }





























  public static final class R.bool {










@@ -34166,7 +34160,7 @@ package android.os {













    field public static final int O = 26; // 0x1a















    field public static final int O_MR1 = 27; // 0x1b















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













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













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















  }





























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










@@ -56251,12 +56245,10 @@ package android.widget {













    method public int getWindowLayoutType();















    method public boolean isAboveAnchor();















    method public boolean isAttachedInDecor();













    method @Deprecated public boolean isClipToScreenEnabled();















    method public boolean isClippedToScreen();















    method public boolean isClippingEnabled();















    method public boolean isFocusable();















    method public boolean isLaidOutInScreen();













    method @Deprecated public boolean isLayoutInScreenEnabled();















    method public boolean isOutsideTouchable();















    method public boolean isShowing();















    method public boolean isSplitTouchEnabled();









@@ -56265,7 +56257,6 @@ package android.widget {













    method public void setAnimationStyle(int);















    method public void setAttachedInDecor(boolean);















    method public void setBackgroundDrawable(android.graphics.drawable.Drawable);













    method @Deprecated public void setClipToScreenEnabled(boolean);















    method public void setClippingEnabled(boolean);















    method public void setContentView(android.view.View);















    method public void setElevation(float);









@@ -56278,7 +56269,6 @@ package android.widget {













    method public void setInputMethodMode(int);















    method public void setIsClippedToScreen(boolean);















    method public void setIsLaidOutInScreen(boolean);













    method @Deprecated public void setLayoutInScreenEnabled(boolean);















    method public void setOnDismissListener(android.widget.PopupWindow.OnDismissListener);















    method public void setOutsideTouchable(boolean);















    method public void setOverlapAnchor(boolean);

























api/removed.txt



+7
−0




























Original line number
Diff line number
Diff line








@@ -691,6 +691,13 @@ package android.widget {













    method protected <T extends android.view.View> T findViewWithTagTraversal(Object);















  }





























  public class PopupWindow {













    method @Deprecated public boolean isClipToScreenEnabled();













    method @Deprecated public boolean isLayoutInScreenEnabled();













    method @Deprecated public void setClipToScreenEnabled(boolean);













    method @Deprecated public void setLayoutInScreenEnabled(boolean);













  }





























  @android.widget.RemoteViews.RemoteView public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener {















    method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int);















    method public static android.content.res.ColorStateList getTextColors(android.content.Context, android.content.res.TypedArray);

































api/system-current.txt



+1
−11




























Original line number
Diff line number
Diff line








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













  }





























  public static final class R.attr {













    field public static final int allowClearUserDataOnFailedRestore = 16844198; // 0x10105a6













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















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















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















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










@@ -317,7 +317,6 @@ package android.app {













  public class AppOpsManager {















    method @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public void getHistoricalOps(@NonNull android.app.AppOpsManager.HistoricalOpsRequest, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.AppOpsManager.HistoricalOps>);















    method public static String[] getOpStrs();













    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getOpsForPackage(int, @NonNull String, @Nullable int[]);















    method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getOpsForPackage(int, @NonNull String, @Nullable java.lang.String...);















    method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getPackagesForOps(@Nullable String[]);















    method public static int opToDefaultMode(@NonNull String);










@@ -936,8 +935,6 @@ package android.app.backup {













    method public int restorePackage(String, android.app.backup.RestoreObserver);















    method public int restorePackages(long, @Nullable android.app.backup.RestoreObserver, @NonNull java.util.Set<java.lang.String>, @Nullable android.app.backup.BackupManagerMonitor);















    method public int restorePackages(long, @Nullable android.app.backup.RestoreObserver, @NonNull java.util.Set<java.lang.String>);













    method @Deprecated public int restoreSome(long, android.app.backup.RestoreObserver, android.app.backup.BackupManagerMonitor, String[]);













    method @Deprecated public int restoreSome(long, android.app.backup.RestoreObserver, String[]);















  }





























  public class RestoreSet implements android.os.Parcelable {










@@ -1092,14 +1089,11 @@ package android.app.prediction {













  }





























  public static final class AppTarget.Builder {













    ctor @Deprecated public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId);















    ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull String, @NonNull android.os.UserHandle);















    ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull android.content.pm.ShortcutInfo);















    method @NonNull public android.app.prediction.AppTarget build();















    method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String);















    method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int);













    method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);













    method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);















  }





























  public final class AppTargetEvent implements android.os.Parcelable {










@@ -1602,9 +1596,6 @@ package android.content.pm {













    method public static void forceSafeLabels();















    method @Deprecated @NonNull public CharSequence loadSafeLabel(@NonNull android.content.pm.PackageManager);















    method @NonNull public CharSequence loadSafeLabel(@NonNull android.content.pm.PackageManager, @FloatRange(from=0) float, int);













    field @Deprecated public static final int SAFE_LABEL_FLAG_FIRST_LINE = 4; // 0x4













    field @Deprecated public static final int SAFE_LABEL_FLAG_SINGLE_LINE = 2; // 0x2













    field @Deprecated public static final int SAFE_LABEL_FLAG_TRIM = 1; // 0x1















  }





























  public abstract class PackageManager {










@@ -7102,7 +7093,6 @@ package android.telecom {













    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(String);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall();















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













    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.WRITE_SECURE_SETTINGS}) public boolean setDefaultDialer(@Nullable String);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle);















    field public static final String EXTRA_CALL_BACK_INTENT = "android.telecom.extra.CALL_BACK_INTENT";















    field public static final String EXTRA_CLEAR_MISSED_CALLS_INTENT = "android.telecom.extra.CLEAR_MISSED_CALLS_INTENT";

































api/system-removed.txt



+41
−0




























Original line number
Diff line number
Diff line








@@ -9,6 +9,10 @@ package android {





























package android.app {





























  public class AppOpsManager {













    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getOpsForPackage(int, @NonNull String, @Nullable int[]);













  }





























  public class Notification implements android.os.Parcelable {















    method public static Class<? extends android.app.Notification.Style> getNotificationStyleClass(String);















  }









@@ -28,6 +32,25 @@ package android.app.admin {





























}





























package android.app.backup {



























  public class RestoreSession {













    method @Deprecated public int restoreSome(long, android.app.backup.RestoreObserver, android.app.backup.BackupManagerMonitor, String[]);













    method @Deprecated public int restoreSome(long, android.app.backup.RestoreObserver, String[]);













  }



























}



























package android.app.prediction {



























  public static final class AppTarget.Builder {













    ctor @Deprecated public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId);













    method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);













    method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);













  }



























}





























package android.content {































  public class Intent implements java.lang.Cloneable android.os.Parcelable {










@@ -60,6 +83,16 @@ package android.content {





























}





























package android.content.pm {



























  public class PackageItemInfo {













    field @Deprecated public static final int SAFE_LABEL_FLAG_FIRST_LINE = 4; // 0x4













    field @Deprecated public static final int SAFE_LABEL_FLAG_SINGLE_LINE = 2; // 0x2













    field @Deprecated public static final int SAFE_LABEL_FLAG_TRIM = 1; // 0x1













  }



























}





























package android.hardware.hdmi {































  public final class HdmiControlManager {










@@ -158,6 +191,14 @@ package android.service.notification {





























}





























package android.telecom {



























  public class TelecomManager {













    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.WRITE_SECURE_SETTINGS}) public boolean setDefaultDialer(@Nullable String);













  }



























}





























package android.telephony {































  public class TelephonyManager {

































api/test-current.txt



+0
−2




























Original line number
Diff line number
Diff line








@@ -520,8 +520,6 @@ package android.app.prediction {













    method @NonNull public android.app.prediction.AppTarget build();















    method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String);















    method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int);













    method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);













    method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);















  }































  public final class AppTargetEvent implements android.os.Parcelable {