Snap for 5339364 from 16052222a03eb96871e7a1eae6e48fa9f266535e to qt-release (28275dd5) · Commits · e / os / android_frameworks_base

Android.bp

+2 −8

Original line number	Diff line number	Diff line
		@@ -1266,10 +1266,7 @@ stubs_defaults {
		"test-base/src/*/.java",
		":opt-telephony-srcs",
		":opt-net-voip-srcs",
		":openjdk_javadoc_files",
		":non_openjdk_javadoc_files",
		":android_icu4j_src_files_for_docs",
		":conscrypt_public_api_files",
		":core_public_api_files",
		":updatable-media-srcs-without-aidls",
		"test-mock/src/*/.java",
		"test-runner/src/*/.java",
		@@ -1328,10 +1325,7 @@ stubs_defaults {
		srcs: [
		":opt-telephony-srcs",
		":opt-net-voip-srcs",
		":openjdk_javadoc_files",
		":non_openjdk_javadoc_files",
		":android_icu4j_src_files_for_docs",
		":conscrypt_public_api_files",
		":core_public_api_files",
		":updatable-media-srcs-without-aidls",
		],
		srcs_lib: "framework",

api/current.txt

+6 −2

Original line number	Diff line number	Diff line
		@@ -7435,7 +7435,10 @@ package android.app.role {
		method @NonNull public android.content.Intent createRequestRoleIntent(@NonNull String);
		method public boolean isRoleAvailable(@NonNull String);
		method public boolean isRoleHeld(@NonNull String);
		field public static final String ROLE_ASSISTANT = "android.app.role.ASSISTANT";
		field public static final String ROLE_BROWSER = "android.app.role.BROWSER";
		field public static final String ROLE_CALL_REDIRECTION = "android.app.role.CALL_REDIRECTION";
		field public static final String ROLE_CALL_SCREENING = "android.app.role.CALL_SCREENING";
		field public static final String ROLE_DIALER = "android.app.role.DIALER";
		field public static final String ROLE_EMERGENCY = "android.app.role.EMERGENCY";
		field public static final String ROLE_GALLERY = "android.app.role.GALLERY";
		@@ -11238,7 +11241,7 @@ package android.content.pm {
		public class LauncherApps {
		method public java.util.List<android.content.pm.LauncherActivityInfo> getActivityList(String, android.os.UserHandle);
		method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getAllPackageInstallerSessions();
		method @Nullable public android.content.pm.LauncherApps.AppUsageLimit getAppUsageLimit(String, android.os.UserHandle);
		method @Nullable public android.content.pm.LauncherApps.AppUsageLimit getAppUsageLimit(@NonNull String, @NonNull android.os.UserHandle);
		method public android.content.pm.ApplicationInfo getApplicationInfo(@NonNull String, int, @NonNull android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException;
		method public android.content.pm.LauncherApps.PinItemRequest getPinItemRequest(android.content.Intent);
		method public java.util.List<android.os.UserHandle> getProfiles();
		@@ -38896,6 +38899,7 @@ package android.provider {
		field public static final String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
		field public static final String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
		field public static final String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
		field public static final String APPLY_RAMPING_RINGER = "apply_ramping_ringer";
		field public static final String AUTO_TIME = "auto_time";
		field public static final String AUTO_TIME_ZONE = "auto_time_zone";
		field public static final String BLUETOOTH_ON = "bluetooth_on";
		@@ -45346,13 +45350,13 @@ package android.telephony {
		}

		public final class UiccCardInfo implements android.os.Parcelable {
		ctor public UiccCardInfo(boolean, int, String, String, int);
		method public int describeContents();
		method public int getCardId();
		method public String getEid();
		method public String getIccId();
		method public int getSlotIndex();
		method public boolean isEuicc();
		method public boolean isRemovable();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telephony.UiccCardInfo> CREATOR;
		}

api/system-current.txt

+12 −9

Original line number	Diff line number	Diff line
		@@ -1111,7 +1111,6 @@ package android.app.role {
		method @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public boolean removeRoleHolderFromController(@NonNull String, @NonNull String);
		method @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public void setRoleNamesFromController(@NonNull java.util.List<java.lang.String>);
		field public static final int MANAGE_HOLDERS_FLAG_DONT_KILL_APP = 1; // 0x1
		field public static final String ROLE_ASSISTANT = "android.app.role.ASSISTANT";
		}

		public interface RoleManagerCallback {
		@@ -1173,7 +1172,7 @@ package android.app.usage {
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getAppStandbyBucket(String);
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.Map<java.lang.String,java.lang.Integer> getAppStandbyBuckets();
		method public int getUsageSource();
		method @RequiresPermission(allOf={android.Manifest.permission.SUSPEND_APPS, android.Manifest.permission.OBSERVE_APP_USAGE}) public void registerAppUsageLimitObserver(int, @NonNull String[], long, @NonNull java.util.concurrent.TimeUnit, android.app.PendingIntent);
		method @RequiresPermission(allOf={android.Manifest.permission.SUSPEND_APPS, android.Manifest.permission.OBSERVE_APP_USAGE}) public void registerAppUsageLimitObserver(int, @NonNull String[], long, @NonNull java.util.concurrent.TimeUnit, @Nullable android.app.PendingIntent);
		method @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerAppUsageObserver(int, @NonNull String[], long, @NonNull java.util.concurrent.TimeUnit, @NonNull android.app.PendingIntent);
		method @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerUsageSessionObserver(int, @NonNull String[], long, @NonNull java.util.concurrent.TimeUnit, long, @NonNull java.util.concurrent.TimeUnit, @NonNull android.app.PendingIntent, @Nullable android.app.PendingIntent);
		method public void reportUsageStart(@NonNull android.app.Activity, @NonNull String);
		@@ -3599,10 +3598,10 @@ package android.media.audiopolicy {
		method public int detachMixes(@NonNull java.util.List<android.media.audiopolicy.AudioMix>);
		method public int getFocusDuckingBehavior();
		method public int getStatus();
		method public int removeUidDeviceAffinity(int);
		method public boolean removeUidDeviceAffinity(int);
		method public int setFocusDuckingBehavior(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
		method public void setRegistration(String);
		method public int setUidDeviceAffinity(int, @NonNull java.util.List<android.media.AudioDeviceInfo>);
		method public boolean setUidDeviceAffinity(int, @NonNull java.util.List<android.media.AudioDeviceInfo>);
		method public String toLogFriendlyString();
		field public static final int FOCUS_POLICY_DUCKING_DEFAULT = 0; // 0x0
		field public static final int FOCUS_POLICY_DUCKING_IN_APP = 0; // 0x0
		@@ -3626,6 +3625,7 @@ package android.media.audiopolicy {
		}

		public abstract static class AudioPolicy.AudioPolicyVolumeCallback {
		ctor public AudioPolicy.AudioPolicyVolumeCallback();
		method public void onVolumeAdjustment(int);
		}

		@@ -8027,7 +8027,7 @@ package android.telephony {
		}

		public class UiccSlotInfo implements android.os.Parcelable {
		ctor public UiccSlotInfo(boolean, boolean, String, int, int, boolean);
		ctor @Deprecated public UiccSlotInfo(boolean, boolean, String, int, int, boolean);
		method public int describeContents();
		method public String getCardId();
		method public int getCardStateInfo();
		@@ -8035,6 +8035,7 @@ package android.telephony {
		method public boolean getIsEuicc();
		method public boolean getIsExtendedApduSupported();
		method public int getLogicalSlotIdx();
		method public boolean isRemovable();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int CARD_STATE_INFO_ABSENT = 1; // 0x1
		field public static final int CARD_STATE_INFO_ERROR = 3; // 0x3
		@@ -8830,12 +8831,12 @@ package android.telephony.ims {
		method public int describeContents();
		method public int getAudioDirection();
		method public int getAudioQuality();
		method public boolean getRttAudioSpeech();
		method public int getRttMode();
		method public int getVideoDirection();
		method public int getVideoQuality();
		method public boolean isReceivingRttAudio();
		method public boolean isRttCall();
		method public void setRttAudioSpeech(boolean);
		method public void setReceivingRttAudio(boolean);
		method public void setRttMode(int);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int AUDIO_QUALITY_AMR = 1; // 0x1
		@@ -9411,11 +9412,13 @@ package android.view.contentcapture {
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.view.contentcapture.ContentCaptureEvent> CREATOR;
		field public static final int TYPE_CONTEXT_UPDATED = 6; // 0x6
		field public static final int TYPE_INITIAL_VIEW_TREE_APPEARED = 5; // 0x5
		field public static final int TYPE_INITIAL_VIEW_TREE_APPEARING = 4; // 0x4
		field public static final int TYPE_SESSION_PAUSED = 8; // 0x8
		field public static final int TYPE_SESSION_RESUMED = 7; // 0x7
		field public static final int TYPE_VIEW_APPEARED = 1; // 0x1
		field public static final int TYPE_VIEW_DISAPPEARED = 2; // 0x2
		field public static final int TYPE_VIEW_TEXT_CHANGED = 3; // 0x3
		field public static final int TYPE_VIEW_TREE_APPEARED = 5; // 0x5
		field public static final int TYPE_VIEW_TREE_APPEARING = 4; // 0x4
		}

		public final class ContentCaptureManager {

api/test-current.txt

+4 −3

Original line number	Diff line number	Diff line
		@@ -476,7 +476,6 @@ package android.app.role {
		method @NonNull @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public java.util.List<java.lang.String> getRoleHolders(@NonNull String);
		method @NonNull @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public java.util.List<java.lang.String> getRoleHoldersAsUser(@NonNull String, @NonNull android.os.UserHandle);
		method @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public void removeRoleHolderAsUser(@NonNull String, @NonNull String, int, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull android.app.role.RoleManagerCallback);
		field public static final String ROLE_ASSISTANT = "android.app.role.ASSISTANT";
		}

		public interface RoleManagerCallback {
		@@ -2864,11 +2863,13 @@ package android.view.contentcapture {
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.view.contentcapture.ContentCaptureEvent> CREATOR;
		field public static final int TYPE_CONTEXT_UPDATED = 6; // 0x6
		field public static final int TYPE_INITIAL_VIEW_TREE_APPEARED = 5; // 0x5
		field public static final int TYPE_INITIAL_VIEW_TREE_APPEARING = 4; // 0x4
		field public static final int TYPE_SESSION_PAUSED = 8; // 0x8
		field public static final int TYPE_SESSION_RESUMED = 7; // 0x7
		field public static final int TYPE_VIEW_APPEARED = 1; // 0x1
		field public static final int TYPE_VIEW_DISAPPEARED = 2; // 0x2
		field public static final int TYPE_VIEW_TEXT_CHANGED = 3; // 0x3
		field public static final int TYPE_VIEW_TREE_APPEARED = 5; // 0x5
		field public static final int TYPE_VIEW_TREE_APPEARING = 4; // 0x4
		}

		public final class ContentCaptureManager {

cmds/statsd/Android.bp

+6 −0

Original line number	Diff line number	Diff line
		@@ -346,3 +346,9 @@ java_library {
		javacflags: ["-XepDisableAllChecks"],
		},
		}

		// Filegroup for statsd config proto definition.
		filegroup {
		name: "statsd-config-proto-def",
		srcs: ["src/statsd_config.proto"],
		}