Snap for 6489494 from 73817bc8997d03370d42be20dbb095cf3759d9d5 to mainline-release (9ac223bf) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import android.os.BatteryStats;
		import android.os.BatteryStatsInternal;
		import android.os.Binder;
		import android.os.Handler;
		import android.os.LimitExceededException;
		import android.os.Looper;
		import android.os.Message;
		import android.os.ParcelFileDescriptor;
		@@ -1002,7 +1003,7 @@ public class JobSchedulerService extends com.android.server.SystemService
		}
		if (isDebuggable) {
		// Only throw the exception for debuggable apps.
		throw new IllegalStateException(
		throw new LimitExceededException(
		"schedule()/enqueue() called more than "
		+ mQuotaTracker.getLimit(Category.SINGLE_CATEGORY)
		+ " times in the past "

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -58326,9 +58326,9 @@ package android.webkit {
		method public abstract void setAllowFileAccess(boolean);
		method @Deprecated public abstract void setAllowFileAccessFromFileURLs(boolean);
		method @Deprecated public abstract void setAllowUniversalAccessFromFileURLs(boolean);
		method public abstract void setAppCacheEnabled(boolean);
		method @Deprecated public abstract void setAppCacheEnabled(boolean);
		method @Deprecated public abstract void setAppCacheMaxSize(long);
		method public abstract void setAppCachePath(String);
		method @Deprecated public abstract void setAppCachePath(String);
		method public abstract void setBlockNetworkImage(boolean);
		method public abstract void setBlockNetworkLoads(boolean);
		method public abstract void setBuiltInZoomControls(boolean);

cmds/statsd/src/atoms.proto

+57 −0

Original line number	Diff line number	Diff line
		@@ -439,6 +439,7 @@ message Atom {
		app_permission_groups_fragment_auto_revoke_action =
		273 [(module) = "permissioncontroller"];
		EvsUsageStatsReported evs_usage_stats_reported = 274 [(module) = "evs"];
		AudioPowerUsageDataReported audio_power_usage_data_reported = 275;
		SdkExtensionStatus sdk_extension_status = 354;

		// StatsdStats tracks platform atoms with ids upto 500.
		@@ -9689,3 +9690,59 @@ message EvsUsageStatsReported {
		// The duration of the service
		optional int64 duration_millis = 10;
		}

		/**
		* Logs audio power usage stats.
		*
		* Pushed from:
		* frameworks/av/services/mediametrics/AudioPowerUsage.cpp
		*/
		message AudioPowerUsageDataReported {
		/**
		* Device used for input/output
		*
		* All audio devices please refer to below file:
		* system/media/audio/include/system/audio-base.h
		*
		* Define our own enum values because we don't report all audio devices.
		* Currently, we only report built-in audio devices such as handset, speaker,
		* built-in mics, common audio devices such as wired headset, usb headset
		* and bluetooth devices.
		*/
		enum AudioDevice {
		OUTPUT_EARPIECE = 0x1; // handset
		OUTPUT_SPEAKER = 0x2; // dual speaker
		OUTPUT_WIRED_HEADSET = 0x4; // 3.5mm headset
		OUTPUT_USB_HEADSET = 0x8; // usb headset
		OUTPUT_BLUETOOTH_SCO = 0x10; // bluetooth sco
		OUTPUT_BLUETOOTH_A2DP = 0x20; // a2dp
		OUTPUT_SPEAKER_SAFE = 0x40; // bottom speaker

		INPUT_DEVICE_BIT = 0x40000000; // non-negative positive int32.
		INPUT_BUILTIN_MIC = 0x40000001; // buildin mic
		INPUT_BUILTIN_BACK_MIC = 0x40000002; // buildin back mic
		INPUT_WIRED_HEADSET_MIC = 0x40000004; // 3.5mm headset mic
		INPUT_USB_HEADSET_MIC = 0x40000008; // usb headset mic
		INPUT_BLUETOOTH_SCO = 0x40000010; // bluetooth sco mic
		}
		optional AudioDevice audio_device = 1;

		// Duration of the audio in seconds
		optional int32 duration_secs = 2;

		// Average volume (0 ... 1.0)
		optional float average_volume = 3;

		enum AudioType {
		UNKNOWN_TYPE = 0;
		VOICE_CALL_TYPE = 1; // voice call
		VOIP_CALL_TYPE = 2; // voip call, including uplink and downlink
		MEDIA_TYPE = 3; // music and system sound
		RINGTONE_NOTIFICATION_TYPE = 4; // ringtone and notification
		ALARM_TYPE = 5; // alarm type
		// record type
		CAMCORDER_TYPE = 6; // camcorder
		RECORD_TYPE = 7; // other recording
		}
		optional AudioType type = 4;
		}

cmds/statsd/src/logd/LogEvent.cpp

+0 −9

Original line number	Diff line number	Diff line
		@@ -66,15 +66,6 @@ using std::vector;
		#define ATTRIBUTION_CHAIN_TYPE 0x09
		#define ERROR_TYPE 0x0F

		LogEvent::LogEvent(const LogEvent& event) {
		mTagId = event.mTagId;
		mLogUid = event.mLogUid;
		mLogPid = event.mLogPid;
		mElapsedTimestampNs = event.mElapsedTimestampNs;
		mLogdTimestampNs = event.mLogdTimestampNs;
		mValues = event.mValues;
		}

		LogEvent::LogEvent(int32_t uid, int32_t pid)
		: mLogdTimestampNs(time(nullptr)), mLogUid(uid), mLogPid(pid) {
		}

cmds/statsd/src/logd/LogEvent.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -216,7 +216,7 @@ private:
		/**
		* Only use this if copy is absolutely needed.
		*/
		LogEvent(const LogEvent&);
		LogEvent(const LogEvent&) = default;

		void parseInt32(int32_t* pos, int32_t depth, bool* last, uint8_t numAnnotations);
		void parseInt64(int32_t* pos, int32_t depth, bool* last, uint8_t numAnnotations);