Snap for 5761090 from 8df3caae911a4032c21a24f3cab9488299a88952 to qt-c2f2-release (6d11b975) · Commits · e / os / android_frameworks_base

cmds/statsd/src/atoms.proto

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5301,7 +5301,7 @@ message NetworkDnsEventReported {
	// Only valid for event_type = EVENT_RESNSEND.		// Only valid for event_type = EVENT_RESNSEND.
	optional int32 res_nsend_flags = 5;		optional int32 res_nsend_flags = 5;

	optional android.stats.dnsresolver.Transport network_type = 6;		optional android.stats.dnsresolver.NetworkType network_type = 6;

	// The DNS over TLS mode on a specific netId.		// The DNS over TLS mode on a specific netId.
	optional android.stats.dnsresolver.PrivateDnsModes private_dns_modes = 7;		optional android.stats.dnsresolver.PrivateDnsModes private_dns_modes = 7;
	@@ -5309,6 +5309,9 @@ message NetworkDnsEventReported {
	// Additional pass-through fields opaque to statsd.		// Additional pass-through fields opaque to statsd.
	// The DNS resolver Mainline module can add new fields here without requiring an OS update.		// The DNS resolver Mainline module can add new fields here without requiring an OS update.
	optional android.stats.dnsresolver.DnsQueryEvents dns_query_events = 8 [(log_mode) = MODE_BYTES];		optional android.stats.dnsresolver.DnsQueryEvents dns_query_events = 8 [(log_mode) = MODE_BYTES];

			// The sample rate of DNS stats (to statsd) is 1/sampling_rate_denom.
			optional int32 sampling_rate_denom = 9;
	}		}

	/**		/**

core/java/android/accessibilityservice/AccessibilityService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -309,7 +309,7 @@ public abstract class AccessibilityService extends Service {
	* Name under which an AccessibilityService component publishes information		* Name under which an AccessibilityService component publishes information
	* about itself. This meta-data must reference an XML resource containing an		* about itself. This meta-data must reference an XML resource containing an
	* <code><{@link android.R.styleable#AccessibilityService accessibility-service}></code>		* <code><{@link android.R.styleable#AccessibilityService accessibility-service}></code>
	* tag. This is a a sample XML file configuring an accessibility service:		* tag. This is a sample XML file configuring an accessibility service:
	* <pre> <accessibility-service		* <pre> <accessibility-service
	* android:accessibilityEventTypes="typeViewClicked\|typeViewFocused"		* android:accessibilityEventTypes="typeViewClicked\|typeViewFocused"
	* android:packageNames="foo.bar, foo.baz"		* android:packageNames="foo.bar, foo.baz"

core/java/android/hardware/biometrics/BiometricManager.java

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -128,6 +128,25 @@ public class BiometricManager {
	}		}
	}		}

			/**
			* @hide
			* @param userId
			* @return
			*/
			@RequiresPermission(USE_BIOMETRIC_INTERNAL)
			public boolean hasEnrolledBiometrics(int userId) {
			if (mService != null) {
			try {
			return mService.hasEnrolledBiometrics(userId);
			} catch (RemoteException e) {
			Slog.w(TAG, "Remote exception in hasEnrolledBiometrics(): " + e);
			return false;
			}
			} else {
			return false;
			}
			}

	/**		/**
	* Listens for changes to biometric eligibility on keyguard from user settings.		* Listens for changes to biometric eligibility on keyguard from user settings.
	* @param callback		* @param callback

core/java/android/hardware/biometrics/IBiometricService.aidl

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,9 @@ interface IBiometricService {
	// Checks if biometrics can be used.		// Checks if biometrics can be used.
	int canAuthenticate(String opPackageName, int userId);		int canAuthenticate(String opPackageName, int userId);

			// Checks if any biometrics are enrolled.
			boolean hasEnrolledBiometrics(int userId);

	// Register callback for when keyguard biometric eligibility changes.		// Register callback for when keyguard biometric eligibility changes.
	void registerEnabledOnKeyguardCallback(IBiometricEnabledOnKeyguardCallback callback);		void registerEnabledOnKeyguardCallback(IBiometricEnabledOnKeyguardCallback callback);

core/proto/android/stats/dnsresolver/dns_resolver.proto

+217 −214

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,8 @@ enum NsRcode {
	// NS_R_BADSIG = 16,		// NS_R_BADSIG = 16,
	NS_R_BADKEY = 17;		NS_R_BADKEY = 17;
	NS_R_BADTIME = 18;		NS_R_BADTIME = 18;
			NS_R_INTERNAL_ERROR = 254;
			NS_R_TIMEOUT = 255;
	}		}

	// Currently defined type values for resources and queries.		// Currently defined type values for resources and queries.
	@@ -143,11 +145,11 @@ enum IpVersion {
	IV_IPV6 = 2;		IV_IPV6 = 2;
	}		}

	enum TransportType {		enum Protocol {
	TT_UNKNOWN = 0;		PROTO_UNKNOWN = 0;
	TT_UDP = 1;		PROTO_UDP = 1;
	TT_TCP = 2;		PROTO_TCP = 2;
	TT_DOT = 3;		PROTO_DOT = 3;
	}		}

	enum PrivateDnsModes {		enum PrivateDnsModes {
	@@ -157,21 +159,22 @@ enum PrivateDnsModes {
	PDM_STRICT = 3;		PDM_STRICT = 3;
	}		}

	enum Transport {		enum NetworkType {
			NT_UNKNOWN = 0;
	// Indicates this network uses a Cellular transport.		// Indicates this network uses a Cellular transport.
	TRANSPORT_DEFAULT = 0; // TRANSPORT_CELLULAR		NT_CELLULAR = 1;
	// Indicates this network uses a Wi-Fi transport.		// Indicates this network uses a Wi-Fi transport.
	TRANSPORT_WIFI = 1;		NT_WIFI = 2;
	// Indicates this network uses a Bluetooth transport.		// Indicates this network uses a Bluetooth transport.
	TRANSPORT_BLUETOOTH = 2;		NT_BLUETOOTH = 3;
	// Indicates this network uses an Ethernet transport.		// Indicates this network uses an Ethernet transport.
	TRANSPORT_ETHERNET = 3;		NT_ETHERNET = 4;
	// Indicates this network uses a VPN transport.		// Indicates this network uses a VPN transport.
	TRANSPORT_VPN = 4;		NT_VPN = 5;
	// Indicates this network uses a Wi-Fi Aware transport.		// Indicates this network uses a Wi-Fi Aware transport.
	TRANSPORT_WIFI_AWARE = 5;		NT_WIFI_AWARE = 6;
	// Indicates this network uses a LoWPAN transport.		// Indicates this network uses a LoWPAN transport.
	TRANSPORT_LOWPAN = 6;		NT_LOWPAN = 7;
	}		}

	enum CacheStatus{		enum CacheStatus{
	@@ -195,13 +198,13 @@ message DnsQueryEvent {

	optional android.stats.dnsresolver.IpVersion ip_version = 4;		optional android.stats.dnsresolver.IpVersion ip_version = 4;

	optional android.stats.dnsresolver.TransportType transport = 5;		optional android.stats.dnsresolver.Protocol protocol = 5;

	// Number of DNS query retry times		// Number of DNS query retry times
	optional int32 retry_times = 6;		optional int32 retry_times = 6;

	// Ordinal number of name server.		// Ordinal number of name server.
	optional int32 dns_server_count = 7;		optional int32 dns_server_index = 7;

	// Used only by TCP and DOT. True for new connections.		// Used only by TCP and DOT. True for new connections.
	optional bool connected = 8;		optional bool connected = 8;