Snap for 5476769 from 1ead26718cc24c99a91ec161e9632249122653dc to qt-release (47096d19) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -920,6 +920,7 @@ filegroup {
		"core/java/com/android/internal/util/RingBufferIndices.java",
		"core/java/com/android/internal/util/State.java",
		"core/java/com/android/internal/util/StateMachine.java",
		"core/java/com/android/internal/util/TrafficStatsConstants.java",
		"core/java/com/android/internal/util/WakeupMessage.java",
		"core/java/android/net/shared/*.java",
		]

api/current.txt

+4 −22

Original line number	Diff line number	Diff line
		@@ -25138,25 +25138,6 @@ package android.media {
		field public static final int TYPE_STRING = 4; // 0x4
		}

		public final class MediaItem2 implements android.os.Parcelable {
		method public int describeContents();
		method public long getEndPosition();
		method @Nullable public android.media.MediaMetadata getMetadata();
		method public long getStartPosition();
		method public void setMetadata(@Nullable android.media.MediaMetadata);
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.media.MediaItem2> CREATOR;
		field public static final long POSITION_UNKNOWN = 576460752303423487L; // 0x7ffffffffffffffL
		}

		public static final class MediaItem2.Builder {
		ctor public MediaItem2.Builder();
		method @NonNull public android.media.MediaItem2 build();
		method @NonNull public android.media.MediaItem2.Builder setEndPosition(long);
		method @NonNull public android.media.MediaItem2.Builder setMetadata(@Nullable android.media.MediaMetadata);
		method @NonNull public android.media.MediaItem2.Builder setStartPosition(long);
		}

		public final class MediaMetadata implements android.os.Parcelable {
		method public boolean containsKey(String);
		method public int describeContents();
		@@ -26177,8 +26158,8 @@ package android.media {
		ctor public Session2Command(@NonNull String, @Nullable android.os.Bundle);
		method public int describeContents();
		method public int getCommandCode();
		method @Nullable public String getCustomCommand();
		method @Nullable public android.os.Bundle getExtras();
		method @Nullable public String getCustomAction();
		method @Nullable public android.os.Bundle getCustomExtras();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int COMMAND_CODE_CUSTOM = 0; // 0x0
		field @NonNull public static final android.os.Parcelable.Creator<android.media.Session2Command> CREATOR;
		@@ -38625,6 +38606,7 @@ package android.provider {
		field public static final String ACTION_APPLICATION_DETAILS_SETTINGS = "android.settings.APPLICATION_DETAILS_SETTINGS";
		field public static final String ACTION_APPLICATION_DEVELOPMENT_SETTINGS = "android.settings.APPLICATION_DEVELOPMENT_SETTINGS";
		field public static final String ACTION_APPLICATION_SETTINGS = "android.settings.APPLICATION_SETTINGS";
		field public static final String ACTION_APP_BATTERY_SETTINGS = "android.settings.APP_BATTERY_SETTINGS";
		field public static final String ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS = "android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS";
		field public static final String ACTION_APP_NOTIFICATION_SETTINGS = "android.settings.APP_NOTIFICATION_SETTINGS";
		field public static final String ACTION_APP_SEARCH_SETTINGS = "android.settings.APP_SEARCH_SETTINGS";
		@@ -41776,7 +41758,7 @@ package android.service.voice {
		method public int getDisabledShowContext();
		method public static boolean isActiveService(android.content.Context, android.content.ComponentName);
		method public android.os.IBinder onBind(android.content.Intent);
		method @Nullable public java.util.Set<java.lang.String> onGetSupportedVoiceActions(@NonNull java.util.Set<java.lang.String>);
		method @NonNull public java.util.Set<java.lang.String> onGetSupportedVoiceActions(@NonNull java.util.Set<java.lang.String>);
		method public void onLaunchVoiceAssistFromKeyguard();
		method public void onReady();
		method public void onShutdown();

api/system-current.txt

+19 −17

Original line number	Diff line number	Diff line
		@@ -604,7 +604,7 @@ package android.app {
		public final class Vr2dDisplayProperties implements android.os.Parcelable {
		ctor public Vr2dDisplayProperties(int, int, int);
		method public int describeContents();
		method public void dump(java.io.PrintWriter, String);
		method public void dump(@NonNull java.io.PrintWriter, @NonNull String);
		method public int getAddedFlags();
		method public int getDpi();
		method public int getHeight();
		@@ -615,26 +615,26 @@ package android.app {
		field public static final int FLAG_VIRTUAL_DISPLAY_ENABLED = 1; // 0x1
		}

		public static class Vr2dDisplayProperties.Builder {
		public static final class Vr2dDisplayProperties.Builder {
		ctor public Vr2dDisplayProperties.Builder();
		method public android.app.Vr2dDisplayProperties.Builder addFlags(int);
		method public android.app.Vr2dDisplayProperties build();
		method public android.app.Vr2dDisplayProperties.Builder removeFlags(int);
		method public android.app.Vr2dDisplayProperties.Builder setDimensions(int, int, int);
		method public android.app.Vr2dDisplayProperties.Builder setEnabled(boolean);
		method @NonNull public android.app.Vr2dDisplayProperties.Builder addFlags(int);
		method @NonNull public android.app.Vr2dDisplayProperties build();
		method @NonNull public android.app.Vr2dDisplayProperties.Builder removeFlags(int);
		method @NonNull public android.app.Vr2dDisplayProperties.Builder setDimensions(int, int, int);
		method @NonNull public android.app.Vr2dDisplayProperties.Builder setEnabled(boolean);
		}

		public class VrManager {
		method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public int getVr2dDisplayId();
		method @RequiresPermission(anyOf={android.Manifest.permission.RESTRICTED_VR_ACCESS, "android.permission.ACCESS_VR_STATE"}) public boolean isPersistentVrModeEnabled();
		method @RequiresPermission(anyOf={android.Manifest.permission.RESTRICTED_VR_ACCESS, "android.permission.ACCESS_VR_STATE"}) public boolean isVrModeEnabled();
		method @RequiresPermission(anyOf={android.Manifest.permission.RESTRICTED_VR_ACCESS, "android.permission.ACCESS_VR_STATE"}) public void registerVrStateCallback(@NonNull java.util.concurrent.Executor, android.app.VrStateCallback);
		method @RequiresPermission(anyOf={android.Manifest.permission.RESTRICTED_VR_ACCESS, "android.permission.ACCESS_VR_STATE"}) public void registerVrStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.app.VrStateCallback);
		method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public void setAndBindVrCompositor(android.content.ComponentName);
		method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public void setPersistentVrModeEnabled(boolean);
		method @RequiresPermission("android.permission.ACCESS_VR_MANAGER") public void setStandbyEnabled(boolean);
		method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public void setVr2dDisplayProperties(android.app.Vr2dDisplayProperties);
		method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public void setVrInputMethod(android.content.ComponentName);
		method @RequiresPermission(anyOf={android.Manifest.permission.RESTRICTED_VR_ACCESS, "android.permission.ACCESS_VR_STATE"}) public void unregisterVrStateCallback(android.app.VrStateCallback);
		method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public void setVr2dDisplayProperties(@NonNull android.app.Vr2dDisplayProperties);
		method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public void setVrInputMethod(@Nullable android.content.ComponentName);
		method @RequiresPermission(anyOf={android.Manifest.permission.RESTRICTED_VR_ACCESS, "android.permission.ACCESS_VR_STATE"}) public void unregisterVrStateCallback(@NonNull android.app.VrStateCallback);
		}

		public abstract class VrStateCallback {
		@@ -1092,12 +1092,11 @@ package android.app.prediction {
		}

		public static final class AppTarget.Builder {
		ctor 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 @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);
		method @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);
		}

		public final class AppTargetEvent implements android.os.Parcelable {
		@@ -4226,9 +4225,12 @@ package android.net {
		method public static void setThreadStatsTagApp();
		method public static void setThreadStatsTagBackup();
		method public static void setThreadStatsTagRestore();
		field public static final int TAG_SYSTEM_DHCP = -192; // 0xffffff40
		field public static final int TAG_SYSTEM_DHCP_SERVER = -186; // 0xffffff46
		field public static final int TAG_SYSTEM_PROBE = -190; // 0xffffff42
		field public static final int TAG_NETWORK_STACK_IMPERSONATION_RANGE_END = -113; // 0xffffff8f
		field public static final int TAG_NETWORK_STACK_IMPERSONATION_RANGE_START = -128; // 0xffffff80
		field public static final int TAG_NETWORK_STACK_RANGE_END = -257; // 0xfffffeff
		field public static final int TAG_NETWORK_STACK_RANGE_START = -768; // 0xfffffd00
		field public static final int TAG_SYSTEM_IMPERSONATION_RANGE_END = -241; // 0xffffff0f
		field public static final int TAG_SYSTEM_IMPERSONATION_RANGE_START = -256; // 0xffffff00
		}

		public abstract class Uri implements java.lang.Comparable<android.net.Uri> android.os.Parcelable {

api/test-current.txt

+5 −6

Original line number	Diff line number	Diff line
		@@ -498,12 +498,11 @@ package android.app.prediction {
		}

		public static final class AppTarget.Builder {
		ctor 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 @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);
		method @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);
		}

		public final class AppTargetEvent implements android.os.Parcelable {
		@@ -1105,6 +1104,7 @@ package android.media {
		method @RequiresPermission("android.permission.MODIFY_AUDIO_ROUTING") public void setFocusRequestResult(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);
		method @RequiresPermission("android.permission.MODIFY_AUDIO_ROUTING") public void unregisterAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);
		method @RequiresPermission("android.permission.MODIFY_AUDIO_ROUTING") public void unregisterAudioPolicyAsync(@NonNull android.media.audiopolicy.AudioPolicy);
		field public static final int SUCCESS = 0; // 0x0
		}

		public static final class AudioRecord.MetricsConstants {
		@@ -1242,8 +1242,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 boolean removeUidDeviceAffinity(int);
		method public int setFocusDuckingBehavior(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
		method public void setRegistration(String);
		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
		@@ -1460,9 +1462,6 @@ package android.net {
		method public static long getLoopbackRxPackets();
		method public static long getLoopbackTxBytes();
		method public static long getLoopbackTxPackets();
		field public static final int TAG_SYSTEM_DHCP = -192; // 0xffffff40
		field public static final int TAG_SYSTEM_DHCP_SERVER = -186; // 0xffffff46
		field public static final int TAG_SYSTEM_PROBE = -190; // 0xffffff42
		}

		}

cmds/statsd/src/atoms.proto

+32 −5

Original line number	Diff line number	Diff line
		@@ -340,6 +340,7 @@ message Atom {
		SystemIonHeapSize system_ion_heap_size = 10056;
		AppsOnExternalStorageInfo apps_on_external_storage_info = 10057;
		FaceSettings face_settings = 10058;
		CoolingDevice cooling_device = 10059;
		}

		// DO NOT USE field numbers above 100,000 in AOSP.
		@@ -410,17 +411,25 @@ message KeyValuePairsAtom {
		* frameworks/base/services/core/java/com/android/server/stats/StatsCompanionService.java
		*/
		message ThermalThrottlingStateChanged {
		// The type of temperature being reported (CPU, GPU, SKIN, etc)
		optional android.os.TemperatureTypeEnum sensor_type = 1;

		// Throttling state, this field is DEPRECATED
		enum State {
		UNKNOWN = 0;
		START = 1;
		STOP = 2;
		START = 1; // START indicated that throttling was triggered.
		STOP = 2; // STOP indicates that throttling was cleared.
		}

		optional State state = 2;

		// Temperature in deci degrees celsius
		optional float temperature = 3;

		// Severity of throttling
		optional android.os.ThrottlingSeverityEnum severity = 4;

		// Thermistor name
		optional string sensor_name = 5;
		}

		/**
		@@ -3957,8 +3966,7 @@ message BatteryLevel {
		* Pulls the temperature of various parts of the device.
		* The units are tenths of a degree Celsius. Eg: 30.3C is reported as 303.
		*
		* Pulled from:
		* frameworks/base/cmds/statsd/src/external/ResourceThermalManagerPuller.cpp
		* Pulled from StatsCompanionService.java
		*/
		message Temperature {
		// The type of temperature being reported. Eg. CPU, GPU, SKIN, BATTERY, BCL_.
		@@ -3970,6 +3978,9 @@ message Temperature {
		// Temperature in tenths of a degree C.
		// For BCL, it is decimillivolt, decimilliamps, and percentage * 10.
		optional int32 temperature_deci_celsius = 3;

		// Relative severity of the throttling, see enum definition.
		optional android.os.ThrottlingSeverityEnum severity = 4;
		}

		/**
		@@ -5947,3 +5958,19 @@ message FaceSettings {
		// Whether or not a diverse set of poses are required during enrollment.
		optional bool unlock_diversity_required = 6;
		}

		/**
		* Logs cooling devices maintained by the kernel.
		*
		* Pulled from StatsCompanionService.java
		*/
		message CoolingDevice {
		// The type of cooling device being reported. Eg. CPU, GPU...
		optional android.os.CoolingTypeEnum device_location = 1;
		// The name of the cooling device source. Eg. CPU0
		optional string device_name = 2;
		// Current throttle state of the cooling device. The value can any unsigned
		// integer between 0 and max_state defined in its driver. 0 means device is
		// not in throttling, higher value means deeper throttling.
		optional int32 state = 3;
		}