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

Commit dbfae6dd authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge changes from topic "may27-sdk" into sc-dev am: e6fb6087 am: b3a4448b am: 77499b32 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14749815

Change-Id: I759a5582a387d95bb13ad726817b0bcba86e841d
parents 7f0f8978 77499b32

core/api/current.txt

+117 −118

File changed.

Preview size limit exceeded, changes collapsed.

core/api/removed.txt

+0 −8
Original line number Diff line number Diff line 
// Signature format: 2.0

package android {



  public static final class R.dimen {

    field public static final int __removed_system_app_widget_internal_padding;

  }



}



package android.app {



  public class Notification implements android.os.Parcelable {

core/api/system-current.txt

+21 −21
Original line number Diff line number Diff line
@@ -317,10 +317,10 @@ package android { 














  public static final class R.attr {















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













    field public static final int hotwordDetectionService;













    field public static final int hotwordDetectionService = 16844326; // 0x1010626















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















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













    field public static final int playHomeTransitionSound;













    field public static final int playHomeTransitionSound = 16844358; // 0x1010646















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















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















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










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













  }





























  public static final class R.string {













    field public static final int config_customMediaKeyDispatcher;













    field public static final int config_customMediaSessionPolicyProvider;













    field public static final int config_customMediaKeyDispatcher = 17039404; // 0x104002c













    field public static final int config_customMediaSessionPolicyProvider = 17039405; // 0x104002d















    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 = 17039397; // 0x1040025









@@ -367,24 +367,24 @@ 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_systemActivityRecognizer;













    field public static final int config_systemAmbientAudioIntelligence;













    field public static final int config_systemAudioIntelligence;













    field public static final int config_systemAutomotiveCluster;













    field public static final int config_systemAutomotiveProjection;













    field public static final int config_systemCompanionDeviceProvider;













    field public static final int config_systemContacts;













    field public static final int config_systemActivityRecognizer = 17039416; // 0x1040038













    field public static final int config_systemAmbientAudioIntelligence = 17039411; // 0x1040033













    field public static final int config_systemAudioIntelligence = 17039412; // 0x1040034













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













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













    field public static final int config_systemCompanionDeviceProvider = 17039417; // 0x1040039













    field public static final int config_systemContacts = 17039403; // 0x104002b















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













    field public static final int config_systemNotificationIntelligence;













    field public static final int config_systemShell;













    field public static final int config_systemSpeechRecognizer;













    field public static final int config_systemTelevisionNotificationHandler;













    field public static final int config_systemTextIntelligence;













    field public static final int config_systemUi;













    field public static final int config_systemUiIntelligence;













    field public static final int config_systemVisualIntelligence;













    field public static final int config_systemWellbeing;













    field public static final int config_systemWifiCoexManager;













    field public static final int config_systemNotificationIntelligence = 17039413; // 0x1040035













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













    field public static final int config_systemSpeechRecognizer = 17039406; // 0x104002e













    field public static final int config_systemTelevisionNotificationHandler = 17039409; // 0x1040031













    field public static final int config_systemTextIntelligence = 17039414; // 0x1040036













    field public static final int config_systemUi = 17039418; // 0x104003a













    field public static final int config_systemUiIntelligence = 17039410; // 0x1040032













    field public static final int config_systemVisualIntelligence = 17039415; // 0x1040037













    field public static final int config_systemWellbeing = 17039408; // 0x1040030













    field public static final int config_systemWifiCoexManager = 17039407; // 0x104002f















  }





























  public static final class R.style {

























core/api/test-current.txt



+3
−3




























Original line number
Diff line number
Diff line








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













  }































  public static final class R.attr {













    field public static final int requestForegroundServiceExemption;













    field public static final int requestForegroundServiceExemption = 16844362; // 0x101064a















  }































  public static final class R.bool {









@@ -63,8 +63,8 @@ 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_systemAutomotiveCluster;













    field public static final int config_systemAutomotiveProjection;













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













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















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















  }

















































core/java/android/os/Build.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1086,7 +1086,7 @@ public class Build {













        /**















         * S.















         */













        public static final int S = CUR_DEVELOPMENT;













        public static final int S = 31;















    }































    /** The type of build, like "user" or "eng". */