Snap for 4665332 from 837f1364f612781cf6d34a6ef55617692631b790 to pi-release (9ec5083e) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −1

Original line number	Diff line number	Diff line
		@@ -13610,6 +13610,7 @@ package android.graphics {

		public final class ImageDecoder implements java.lang.AutoCloseable {
		method public void close();
		method public static android.graphics.ImageDecoder.Source createSource(android.content.res.Resources, int);
		method public static android.graphics.ImageDecoder.Source createSource(android.content.ContentResolver, android.net.Uri);
		method public static android.graphics.ImageDecoder.Source createSource(java.nio.ByteBuffer);
		method public static android.graphics.ImageDecoder.Source createSource(java.io.File);
		@@ -15776,7 +15777,7 @@ package android.hardware.camera2 {
		method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailablePhysicalCameraRequestKeys();
		method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailableSessionKeys();
		method public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getKeys();
		method public java.util.List<java.lang.String> getPhysicalCameraIds();
		method public java.util.Set<java.lang.String> getPhysicalCameraIds();
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AE_AVAILABLE_ANTIBANDING_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AE_AVAILABLE_MODES;
		@@ -33178,6 +33179,8 @@ package android.os {
		ctor public Handler(android.os.Handler.Callback);
		ctor public Handler(android.os.Looper);
		ctor public Handler(android.os.Looper, android.os.Handler.Callback);
		method public static android.os.Handler createAsync(android.os.Looper);
		method public static android.os.Handler createAsync(android.os.Looper, android.os.Handler.Callback);
		method public void dispatchMessage(android.os.Message);
		method public final void dump(android.util.Printer, java.lang.String);
		method public final android.os.Looper getLooper();

api/system-current.txt

+4 −7

Original line number	Diff line number	Diff line
		@@ -373,7 +373,6 @@ package android.app {
		}

		public final class StatsManager {
		method public boolean addConfiguration(long, byte[], java.lang.String, java.lang.String);
		method public boolean addConfiguration(long, byte[]);
		method public byte[] getData(long);
		method public byte[] getMetadata();
		@@ -3770,7 +3769,6 @@ package android.os {

		public class IncidentManager {
		method public void reportIncident(android.os.IncidentReportArgs);
		method public void reportIncident(java.lang.String, byte[]);
		}

		public final class IncidentReportArgs implements android.os.Parcelable {
		@@ -3781,7 +3779,6 @@ package android.os {
		method public boolean containsSection(int);
		method public int describeContents();
		method public boolean isAll();
		method public static android.os.IncidentReportArgs parseSetting(java.lang.String) throws java.lang.IllegalArgumentException;
		method public void readFromParcel(android.os.Parcel);
		method public int sectionCount();
		method public void setAll(boolean);
		@@ -5216,10 +5213,10 @@ package android.telephony {
		method public boolean handlePinMmi(java.lang.String);
		method public boolean handlePinMmiForSubscriber(int, java.lang.String);
		method public boolean isDataConnectivityPossible();
		method public boolean isIdle();
		method public boolean isOffhook();
		method public boolean isRadioOn();
		method public boolean isRinging();
		method public deprecated boolean isIdle();
		method public deprecated boolean isOffhook();
		method public deprecated boolean isRadioOn();
		method public deprecated boolean isRinging();
		method public boolean isVideoCallingEnabled();
		method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);
		method public boolean needsOtaServiceProvisioning();

api/test-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -473,7 +473,6 @@ package android.os {

		public class IncidentManager {
		method public void reportIncident(android.os.IncidentReportArgs);
		method public void reportIncident(java.lang.String, byte[]);
		}

		public final class IncidentReportArgs implements android.os.Parcelable {
		@@ -484,7 +483,6 @@ package android.os {
		method public boolean containsSection(int);
		method public int describeContents();
		method public boolean isAll();
		method public static android.os.IncidentReportArgs parseSetting(java.lang.String) throws java.lang.IllegalArgumentException;
		method public void readFromParcel(android.os.Parcel);
		method public int sectionCount();
		method public void setAll(boolean);

cmds/incidentd/src/Section.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -731,25 +731,25 @@ status_t LogSection::BlockingCall(int pipeWriteFd) const {
		android_logger_list_free);

		if (android_logger_open(loggers.get(), mLogID) == NULL) {
		ALOGW("LogSection %s: Can't get logger.", this->name.string());
		return NO_ERROR;
		ALOGE("LogSection %s: Can't get logger.", this->name.string());
		return -1;
		}

		log_msg msg;
		log_time lastTimestamp(0);

		status_t err = NO_ERROR;
		ProtoOutputStream proto;
		while (true) { // keeps reading until logd buffer is fully read.
		err = android_logger_list_read(loggers.get(), &msg);
		status_t err = android_logger_list_read(loggers.get(), &msg);
		// err = 0 - no content, unexpected connection drop or EOF.
		// err = +ive number - size of retrieved data from logger
		// err = -ive number, OS supplied error _except_ for -EAGAIN
		// err = -EAGAIN, graceful indication for ANDRODI_LOG_NONBLOCK that this is the end of data.
		if (err <= 0) {
		if (err != -EAGAIN) {
		ALOGE("LogSection %s: fails to read a log_msg.\n", this->name.string());
		ALOGW("LogSection %s: fails to read a log_msg.\n", this->name.string());
		}
		// dump previous logs and don't consider this error a failure.
		break;
		}
		if (mBinary) {
		@@ -818,7 +818,7 @@ status_t LogSection::BlockingCall(int pipeWriteFd) const {
		AndroidLogEntry entry;
		err = android_log_processLogBuffer(&msg.entry_v1, &entry);
		if (err != NO_ERROR) {
		ALOGE("LogSection %s: fails to process to an entry.\n", this->name.string());
		ALOGW("LogSection %s: fails to process to an entry.\n", this->name.string());
		break;
		}
		lastTimestamp.tv_sec = entry.tv_sec;
		@@ -840,7 +840,7 @@ status_t LogSection::BlockingCall(int pipeWriteFd) const {
		}
		gLastLogsRetrieved[mLogID] = lastTimestamp;
		proto.flush(pipeWriteFd);
		return err;
		return NO_ERROR;
		}

		// ================================================================================

cmds/statsd/src/atoms.proto

+52 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,8 @@ message Atom {
		HardwareFailed hardware_failed = 72;
		PhysicalDropDetected physical_drop_detected = 73;
		ChargeCyclesReported charge_cycles_reported = 74;
		MobileConnectionStateChanged mobile_connection_state_changed = 75;
		MobileRadioTechnologyChanged mobile_radio_technology_changed = 76;
		}

		// Pulled events will start at field 10000.
		@@ -911,6 +913,56 @@ message ResourceConfigurationChanged {
		optional int32 uiMode = 17;
		}


		/**
		* Logs changes in the connection state of the mobile radio.
		*
		* Logged from:
		* frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
		*/
		message MobileConnectionStateChanged {
		// States are from the state machine DataConnection.java.
		enum State {
		UNKNOWN = 0;
		// The connection is inactive, or disconnected.
		INACTIVE = 1;
		// The connection is being activated, or connecting.
		ACTIVATING = 2;
		// The connection is active, or connected.
		ACTIVE = 3;
		// The connection is disconnecting.
		DISCONNECTING = 4;
		// The connection is disconnecting after creating a connection.
		DISCONNECTION_ERROR_CREATING_CONNECTION = 5;
		}
		optional State state = 1;
		// For multi-sim phones, this distinguishes between the sim cards.
		optional int32 sim_slot_index = 2;
		// Used to identify the connection. Starts at 0 and increments by 1 for
		// every new network created. Resets whenever the device reboots.
		optional int32 data_connection_id = 3;
		// A bitmask for the capabilities of this connection.
		// Eg. DEFAULT (internet), MMS, SUPL, DUN, IMS.
		// Default value (if we have no information): 0
		optional int64 capabilities = 4;
		// If this connection has internet.
		// This just checks if the DEFAULT bit of capabilities is set.
		optional bool has_internet = 5;
		}

		/**
		* Logs changes in mobile radio technology. eg: LTE, EDGE, CDMA.
		*
		* Logged from:
		* frameworks/opt/telephony/src/java/com/android/internal/telephony/ServiceStateTracker.java
		*/
		message MobileRadioTechnologyChanged {
		optional android.telephony.NetworkTypeEnum state = 1;
		// For multi-sim phones, this distinguishes between the sim cards.
		optional int32 sim_slot_index = 2;
		}


		/**
		* Logs when Bluetooth is enabled and disabled.
		*