Merge "Part 2: Adding clear-all to history"
diff --git a/Android.mk b/Android.mk
index c947b0e..5983b30 100644
--- a/Android.mk
+++ b/Android.mk
@@ -331,10 +331,10 @@
location/java/android/location/IFusedProvider.aidl \
location/java/android/location/IGeocodeProvider.aidl \
location/java/android/location/IGeofenceProvider.aidl \
+ location/java/android/location/IGnssStatusListener.aidl \
+ location/java/android/location/IGnssStatusProvider.aidl \
location/java/android/location/IGpsMeasurementsListener.aidl \
location/java/android/location/IGpsNavigationMessageListener.aidl \
- location/java/android/location/IGpsStatusListener.aidl \
- location/java/android/location/IGpsStatusProvider.aidl \
location/java/android/location/ILocationListener.aidl \
location/java/android/location/ILocationManager.aidl \
location/java/android/location/IFusedGeofenceHardware.aidl \
diff --git a/api/current.txt b/api/current.txt
index bfbb17e..0ca7560 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -13358,6 +13358,7 @@
method public float getResolution();
method public java.lang.String getStringType();
method public int getType();
+ method public java.util.UUID getUuid();
method public java.lang.String getVendor();
method public int getVersion();
method public boolean isWakeUpSensor();
@@ -13446,6 +13447,7 @@
method public static void getAngleChange(float[], float[], float[]);
method public android.hardware.Sensor getDefaultSensor(int);
method public android.hardware.Sensor getDefaultSensor(int, boolean);
+ method public java.util.List<android.hardware.Sensor> getDynamicSensorList(int);
method public static float getInclination(float[]);
method public static float[] getOrientation(float[], float[]);
method public static void getQuaternionFromVector(float[], float[]);
@@ -13453,6 +13455,8 @@
method public static void getRotationMatrixFromVector(float[], float[]);
method public java.util.List<android.hardware.Sensor> getSensorList(int);
method public deprecated int getSensors();
+ method public void registerDynamicSensorCallback(android.hardware.SensorManager.DynamicSensorConnectionCallback);
+ method public void registerDynamicSensorCallback(android.hardware.SensorManager.DynamicSensorConnectionCallback, android.os.Handler);
method public deprecated boolean registerListener(android.hardware.SensorListener, int);
method public deprecated boolean registerListener(android.hardware.SensorListener, int, int);
method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int);
@@ -13461,6 +13465,7 @@
method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, int, android.os.Handler);
method public static boolean remapCoordinateSystem(float[], int, int, float[]);
method public boolean requestTriggerSensor(android.hardware.TriggerEventListener, android.hardware.Sensor);
+ method public void unregisterDynamicSensorCallback(android.hardware.SensorManager.DynamicSensorConnectionCallback);
method public deprecated void unregisterListener(android.hardware.SensorListener);
method public deprecated void unregisterListener(android.hardware.SensorListener, int);
method public void unregisterListener(android.hardware.SensorEventListener, android.hardware.Sensor);
@@ -13525,6 +13530,12 @@
field public static final float STANDARD_GRAVITY = 9.80665f;
}
+ public static abstract class SensorManager.DynamicSensorConnectionCallback {
+ ctor public SensorManager.DynamicSensorConnectionCallback();
+ method public void onDynamicSensorConnected(android.hardware.Sensor);
+ method public void onDynamicSensorDisconnected(android.hardware.Sensor);
+ }
+
public final class TriggerEvent {
field public android.hardware.Sensor sensor;
field public long timestamp;
@@ -19025,6 +19036,288 @@
method public static boolean isPresent();
}
+ public abstract interface GnssNmeaListener {
+ method public abstract void onNmeaReceived(long, java.lang.String);
+ }
+
+ public final class GnssStatus {
+ method public float getAzimuth(int);
+ method public int getConstellationType(int);
+ method public float getElevation(int);
+ method public int getNumSatellites();
+ method public int getPrn(int);
+ method public float getSnr(int);
+ method public boolean hasAlmanac(int);
+ method public boolean hasEphemeris(int);
+ method public boolean usedInFix(int);
+ field public static final int CONSTELLATION_BEIDOU = 5; // 0x5
+ field public static final int CONSTELLATION_GALILEO = 6; // 0x6
+ field public static final int CONSTELLATION_GLONASS = 3; // 0x3
+ field public static final int CONSTELLATION_GPS = 1; // 0x1
+ field public static final int CONSTELLATION_QZSS = 4; // 0x4
+ field public static final int CONSTELLATION_SBAS = 2; // 0x2
+ field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0
+ }
+
+ public abstract class GnssStatusCallback {
+ ctor public GnssStatusCallback();
+ method public void onFirstFix(int);
+ method public void onSatelliteStatusChanged(android.location.GnssStatus);
+ method public void onStarted();
+ method public void onStopped();
+ }
+
+ public final class GpsClock implements android.os.Parcelable {
+ method public int describeContents();
+ method public double getBiasInNs();
+ method public double getBiasUncertaintyInNs();
+ method public double getDriftInNsPerSec();
+ method public double getDriftUncertaintyInNsPerSec();
+ method public long getFullBiasInNs();
+ method public short getLeapSecond();
+ method public long getTimeInNs();
+ method public long getTimeOfLastHwClockDiscontinuityInNs();
+ method public double getTimeUncertaintyInNs();
+ method public byte getType();
+ method public boolean hasBiasInNs();
+ method public boolean hasBiasUncertaintyInNs();
+ method public boolean hasDriftInNsPerSec();
+ method public boolean hasDriftUncertaintyInNsPerSec();
+ method public boolean hasFullBiasInNs();
+ method public boolean hasLeapSecond();
+ method public boolean hasTimeUncertaintyInNs();
+ method public void reset();
+ method public void resetBiasInNs();
+ method public void resetBiasUncertaintyInNs();
+ method public void resetDriftInNsPerSec();
+ method public void resetDriftUncertaintyInNsPerSec();
+ method public void resetFullBiasInNs();
+ method public void resetLeapSecond();
+ method public void resetTimeUncertaintyInNs();
+ method public void set(android.location.GpsClock);
+ method public void setBiasInNs(double);
+ method public void setBiasUncertaintyInNs(double);
+ method public void setDriftInNsPerSec(double);
+ method public void setDriftUncertaintyInNsPerSec(double);
+ method public void setFullBiasInNs(long);
+ method public void setLeapSecond(short);
+ method public void setTimeInNs(long);
+ method public void setTimeOfLastHwClockDiscontinuityInNs(long);
+ method public void setTimeUncertaintyInNs(double);
+ method public void setType(byte);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final byte CLOCK_TYPE_GPS_TIME = 2; // 0x2
+ field public static final byte CLOCK_TYPE_LOCAL_HW_TIME = 1; // 0x1
+ field public static final byte CLOCK_TYPE_UNKNOWN = 0; // 0x0
+ field public static final android.os.Parcelable.Creator<android.location.GpsClock> CREATOR;
+ }
+
+ public static abstract class GpsClock.GpsClockType implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsMeasurement implements android.os.Parcelable {
+ method public int describeContents();
+ method public double getAccumulatedDeltaRangeInMeters();
+ method public short getAccumulatedDeltaRangeState();
+ method public double getAccumulatedDeltaRangeUncertaintyInMeters();
+ method public double getAzimuthInDeg();
+ method public double getAzimuthUncertaintyInDeg();
+ method public int getBitNumber();
+ method public long getCarrierCycles();
+ method public float getCarrierFrequencyInHz();
+ method public double getCarrierPhase();
+ method public double getCarrierPhaseUncertainty();
+ method public double getCn0InDbHz();
+ method public double getCodePhaseInChips();
+ method public double getCodePhaseUncertaintyInChips();
+ method public double getDopplerShiftInHz();
+ method public double getDopplerShiftUncertaintyInHz();
+ method public double getElevationInDeg();
+ method public double getElevationUncertaintyInDeg();
+ method public byte getLossOfLock();
+ method public byte getMultipathIndicator();
+ method public byte getPrn();
+ method public double getPseudorangeInMeters();
+ method public double getPseudorangeRateCarrierInMetersPerSec();
+ method public double getPseudorangeRateCarrierUncertaintyInMetersPerSec();
+ method public double getPseudorangeRateInMetersPerSec();
+ method public double getPseudorangeRateUncertaintyInMetersPerSec();
+ method public double getPseudorangeUncertaintyInMeters();
+ method public long getReceivedGpsTowInNs();
+ method public long getReceivedGpsTowUncertaintyInNs();
+ method public double getSnrInDb();
+ method public short getState();
+ method public short getTimeFromLastBitInMs();
+ method public double getTimeOffsetInNs();
+ method public boolean hasAzimuthInDeg();
+ method public boolean hasAzimuthUncertaintyInDeg();
+ method public boolean hasBitNumber();
+ method public boolean hasCarrierCycles();
+ method public boolean hasCarrierFrequencyInHz();
+ method public boolean hasCarrierPhase();
+ method public boolean hasCarrierPhaseUncertainty();
+ method public boolean hasCodePhaseInChips();
+ method public boolean hasCodePhaseUncertaintyInChips();
+ method public boolean hasDopplerShiftInHz();
+ method public boolean hasDopplerShiftUncertaintyInHz();
+ method public boolean hasElevationInDeg();
+ method public boolean hasElevationUncertaintyInDeg();
+ method public boolean hasPseudorangeInMeters();
+ method public boolean hasPseudorangeUncertaintyInMeters();
+ method public boolean hasSnrInDb();
+ method public boolean hasTimeFromLastBitInMs();
+ method public boolean isPseudorangeRateCorrected();
+ method public boolean isUsedInFix();
+ method public void reset();
+ method public void resetAzimuthInDeg();
+ method public void resetAzimuthUncertaintyInDeg();
+ method public void resetBitNumber();
+ method public void resetCarrierCycles();
+ method public void resetCarrierFrequencyInHz();
+ method public void resetCarrierPhase();
+ method public void resetCarrierPhaseUncertainty();
+ method public void resetCodePhaseInChips();
+ method public void resetCodePhaseUncertaintyInChips();
+ method public void resetDopplerShiftInHz();
+ method public void resetDopplerShiftUncertaintyInHz();
+ method public void resetElevationInDeg();
+ method public void resetElevationUncertaintyInDeg();
+ method public void resetPseudorangeInMeters();
+ method public void resetPseudorangeUncertaintyInMeters();
+ method public void resetSnrInDb();
+ method public void resetTimeFromLastBitInMs();
+ method public void set(android.location.GpsMeasurement);
+ method public void setAccumulatedDeltaRangeInMeters(double);
+ method public void setAccumulatedDeltaRangeState(short);
+ method public void setAccumulatedDeltaRangeUncertaintyInMeters(double);
+ method public void setAzimuthInDeg(double);
+ method public void setAzimuthUncertaintyInDeg(double);
+ method public void setBitNumber(int);
+ method public void setCarrierCycles(long);
+ method public void setCarrierFrequencyInHz(float);
+ method public void setCarrierPhase(double);
+ method public void setCarrierPhaseUncertainty(double);
+ method public void setCn0InDbHz(double);
+ method public void setCodePhaseInChips(double);
+ method public void setCodePhaseUncertaintyInChips(double);
+ method public void setDopplerShiftInHz(double);
+ method public void setDopplerShiftUncertaintyInHz(double);
+ method public void setElevationInDeg(double);
+ method public void setElevationUncertaintyInDeg(double);
+ method public void setLossOfLock(byte);
+ method public void setMultipathIndicator(byte);
+ method public void setPrn(byte);
+ method public void setPseudorangeInMeters(double);
+ method public void setPseudorangeRateCarrierInMetersPerSec(double);
+ method public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double);
+ method public void setPseudorangeRateInMetersPerSec(double);
+ method public void setPseudorangeRateUncertaintyInMetersPerSec(double);
+ method public void setPseudorangeUncertaintyInMeters(double);
+ method public void setReceivedGpsTowInNs(long);
+ method public void setReceivedGpsTowUncertaintyInNs(long);
+ method public void setSnrInDb(double);
+ method public void setState(short);
+ method public void setTimeFromLastBitInMs(short);
+ method public void setTimeOffsetInNs(double);
+ method public void setUsedInFix(boolean);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final short ADR_STATE_CYCLE_SLIP = 4; // 0x4
+ field public static final short ADR_STATE_RESET = 2; // 0x2
+ field public static final short ADR_STATE_UNKNOWN = 0; // 0x0
+ field public static final short ADR_STATE_VALID = 1; // 0x1
+ field public static final android.os.Parcelable.Creator<android.location.GpsMeasurement> CREATOR;
+ field public static final byte LOSS_OF_LOCK_CYCLE_SLIP = 2; // 0x2
+ field public static final byte LOSS_OF_LOCK_OK = 1; // 0x1
+ field public static final byte LOSS_OF_LOCK_UNKNOWN = 0; // 0x0
+ field public static final byte MULTIPATH_INDICATOR_DETECTED = 1; // 0x1
+ field public static final byte MULTIPATH_INDICATOR_NOT_USED = 2; // 0x2
+ field public static final byte MULTIPATH_INDICATOR_UNKNOWN = 0; // 0x0
+ field public static final short STATE_BIT_SYNC = 2; // 0x2
+ field public static final short STATE_CODE_LOCK = 1; // 0x1
+ field public static final short STATE_MSEC_AMBIGUOUS = 16; // 0x10
+ field public static final short STATE_SUBFRAME_SYNC = 4; // 0x4
+ field public static final short STATE_TOW_DECODED = 8; // 0x8
+ field public static final short STATE_UNKNOWN = 0; // 0x0
+ }
+
+ public static abstract class GpsMeasurement.LossOfLockStatus implements java.lang.annotation.Annotation {
+ }
+
+ public static abstract class GpsMeasurement.MultipathIndicator implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsMeasurementsEvent implements android.os.Parcelable {
+ ctor public GpsMeasurementsEvent(android.location.GpsClock, android.location.GpsMeasurement[]);
+ method public int describeContents();
+ method public android.location.GpsClock getClock();
+ method public java.util.Collection<android.location.GpsMeasurement> getMeasurements();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.location.GpsMeasurementsEvent> CREATOR;
+ field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2
+ field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0
+ field public static final int STATUS_READY = 1; // 0x1
+ }
+
+ public static abstract class GpsMeasurementsEvent.Callback {
+ ctor public GpsMeasurementsEvent.Callback();
+ method public void onGpsMeasurementsReceived(android.location.GpsMeasurementsEvent);
+ method public void onStatusChanged(int);
+ }
+
+ public static abstract class GpsMeasurementsEvent.GpsMeasurementsStatus implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsNavigationMessage implements android.os.Parcelable {
+ method public int describeContents();
+ method public byte[] getData();
+ method public short getMessageId();
+ method public byte getPrn();
+ method public short getStatus();
+ method public short getSubmessageId();
+ method public byte getType();
+ method public void reset();
+ method public void set(android.location.GpsNavigationMessage);
+ method public void setData(byte[]);
+ method public void setMessageId(short);
+ method public void setPrn(byte);
+ method public void setStatus(short);
+ method public void setSubmessageId(short);
+ method public void setType(byte);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessage> CREATOR;
+ field public static final byte MESSAGE_TYPE_CNAV2 = 4; // 0x4
+ field public static final byte MESSAGE_TYPE_L1CA = 1; // 0x1
+ field public static final byte MESSAGE_TYPE_L2CNAV = 2; // 0x2
+ field public static final byte MESSAGE_TYPE_L5CNAV = 3; // 0x3
+ field public static final byte MESSAGE_TYPE_UNKNOWN = 0; // 0x0
+ field public static final short STATUS_PARITY_PASSED = 1; // 0x1
+ field public static final short STATUS_PARITY_REBUILT = 2; // 0x2
+ field public static final short STATUS_UNKNOWN = 0; // 0x0
+ }
+
+ public static abstract class GpsNavigationMessage.GpsNavigationMessageType implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsNavigationMessageEvent implements android.os.Parcelable {
+ ctor public GpsNavigationMessageEvent(android.location.GpsNavigationMessage);
+ method public int describeContents();
+ method public android.location.GpsNavigationMessage getNavigationMessage();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessageEvent> CREATOR;
+ field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2
+ field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0
+ field public static final int STATUS_READY = 1; // 0x1
+ }
+
+ public static abstract class GpsNavigationMessageEvent.Callback {
+ ctor public GpsNavigationMessageEvent.Callback();
+ method public void onGpsNavigationMessageReceived(android.location.GpsNavigationMessageEvent);
+ method public void onStatusChanged(int);
+ }
+
+ public static abstract class GpsNavigationMessageEvent.GpsNavigationMessageStatus implements java.lang.annotation.Annotation {
+ }
+
public final class GpsSatellite {
method public float getAzimuth();
method public float getElevation();
@@ -19109,8 +19402,10 @@
}
public class LocationManager {
- method public boolean addGpsStatusListener(android.location.GpsStatus.Listener);
- method public boolean addNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public deprecated boolean addGpsStatusListener(android.location.GpsStatus.Listener);
+ method public deprecated boolean addNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public boolean addNmeaListener(android.location.GnssNmeaListener);
+ method public boolean addNmeaListener(android.location.GnssNmeaListener, android.os.Handler);
method public void addProximityAlert(double, double, float, long, android.app.PendingIntent);
method public void addTestProvider(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int);
method public void clearTestProviderEnabled(java.lang.String);
@@ -19118,14 +19413,21 @@
method public void clearTestProviderStatus(java.lang.String);
method public java.util.List<java.lang.String> getAllProviders();
method public java.lang.String getBestProvider(android.location.Criteria, boolean);
- method public android.location.GpsStatus getGpsStatus(android.location.GpsStatus);
+ method public deprecated android.location.GpsStatus getGpsStatus(android.location.GpsStatus);
method public android.location.Location getLastKnownLocation(java.lang.String);
method public android.location.LocationProvider getProvider(java.lang.String);
method public java.util.List<java.lang.String> getProviders(boolean);
method public java.util.List<java.lang.String> getProviders(android.location.Criteria, boolean);
method public boolean isProviderEnabled(java.lang.String);
- method public void removeGpsStatusListener(android.location.GpsStatus.Listener);
- method public void removeNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback);
+ method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler);
+ method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback);
+ method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback, android.os.Handler);
+ method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback);
+ method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback, android.os.Handler);
+ method public deprecated void removeGpsStatusListener(android.location.GpsStatus.Listener);
+ method public deprecated void removeNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public void removeNmeaListener(android.location.GnssNmeaListener);
method public void removeProximityAlert(android.app.PendingIntent);
method public void removeTestProvider(java.lang.String);
method public void removeUpdates(android.location.LocationListener);
@@ -19143,6 +19445,9 @@
method public void setTestProviderEnabled(java.lang.String, boolean);
method public void setTestProviderLocation(java.lang.String, android.location.Location);
method public void setTestProviderStatus(java.lang.String, int, android.os.Bundle, long);
+ method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback);
+ method public void unregisterGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback);
+ method public void unregisterGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback);
field public static final java.lang.String GPS_PROVIDER = "gps";
field public static final java.lang.String KEY_LOCATION_CHANGED = "location";
field public static final java.lang.String KEY_PROVIDER_ENABLED = "providerEnabled";
@@ -19209,6 +19514,7 @@
field public static final android.os.Parcelable.Creator<android.media.AudioAttributes> CREATOR;
field public static final int FLAG_AUDIBILITY_ENFORCED = 1; // 0x1
field public static final int FLAG_HW_AV_SYNC = 16; // 0x10
+ field public static final int FLAG_LOW_LATENCY = 256; // 0x100
field public static final int USAGE_ALARM = 4; // 0x4
field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb
field public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE = 12; // 0xc
@@ -19606,6 +19912,7 @@
method public void flush();
method public int getAudioFormat();
method public int getAudioSessionId();
+ method public int getBufferCapacityInFrames();
method public int getBufferSizeInFrames();
method public int getChannelConfiguration();
method public int getChannelCount();
@@ -19627,6 +19934,7 @@
method public int getState();
method public int getStreamType();
method public boolean getTimestamp(android.media.AudioTimestamp);
+ method public int getUnderrunCount();
method public void pause() throws java.lang.IllegalStateException;
method public void play() throws java.lang.IllegalStateException;
method public void release();
@@ -19634,6 +19942,7 @@
method public deprecated void removeOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener);
method public void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);
method public int setAuxEffectSendLevel(float);
+ method public int setBufferSizeInFrames(int);
method public int setLoopPoints(int, int, int);
method public int setNotificationMarkerPosition(int);
method public int setPlaybackHeadPosition(int);
@@ -20479,6 +20788,16 @@
method public final void setInteger(java.lang.String, int);
method public final void setLong(java.lang.String, long);
method public final void setString(java.lang.String, java.lang.String);
+ field public static final int COLOR_RANGE_FULL = 1; // 0x1
+ field public static final int COLOR_RANGE_LIMITED = 2; // 0x2
+ field public static final int COLOR_STANDARD_BT2020 = 6; // 0x6
+ field public static final int COLOR_STANDARD_BT601_NTSC = 4; // 0x4
+ field public static final int COLOR_STANDARD_BT601_PAL = 2; // 0x2
+ field public static final int COLOR_STANDARD_BT709 = 1; // 0x1
+ field public static final int COLOR_TRANSFER_HLG = 7; // 0x7
+ field public static final int COLOR_TRANSFER_LINEAR = 1; // 0x1
+ field public static final int COLOR_TRANSFER_SDR_VIDEO = 3; // 0x3
+ field public static final int COLOR_TRANSFER_ST2084 = 6; // 0x6
field public static final java.lang.String KEY_AAC_DRC_ATTENUATION_FACTOR = "aac-drc-cut-level";
field public static final java.lang.String KEY_AAC_DRC_BOOST_FACTOR = "aac-drc-boost-level";
field public static final java.lang.String KEY_AAC_DRC_HEAVY_COMPRESSION = "aac-drc-heavy-compression";
@@ -20494,6 +20813,9 @@
field public static final java.lang.String KEY_CHANNEL_COUNT = "channel-count";
field public static final java.lang.String KEY_CHANNEL_MASK = "channel-mask";
field public static final java.lang.String KEY_COLOR_FORMAT = "color-format";
+ field public static final java.lang.String KEY_COLOR_RANGE = "color-range";
+ field public static final java.lang.String KEY_COLOR_STANDARD = "color-standard";
+ field public static final java.lang.String KEY_COLOR_TRANSFER = "color-transfer";
field public static final java.lang.String KEY_COMPLEXITY = "complexity";
field public static final java.lang.String KEY_DURATION = "durationUs";
field public static final java.lang.String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";
@@ -32429,6 +32751,7 @@
method public void copyTo(short[]);
method public void copyTo(int[]);
method public void copyTo(float[]);
+ method public static android.renderscript.Allocation[] createAllocations(android.renderscript.RenderScript, android.renderscript.Type, int, int);
method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap);
method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
@@ -32444,9 +32767,12 @@
method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int);
method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type);
method public void generateMipmaps();
+ method public java.nio.ByteBuffer getByteBuffer();
method public int getBytesSize();
method public android.renderscript.Element getElement();
+ method public long getStride();
method public android.view.Surface getSurface();
+ method public long getTimeStamp();
method public android.renderscript.Type getType();
method public int getUsage();
method public void ioReceive();
@@ -35395,14 +35721,14 @@
field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.CallScreeningService";
}
- public class CallScreeningService.CallResponse {
+ public static class CallScreeningService.CallResponse {
method public boolean getDisallowCall();
method public boolean getRejectCall();
method public boolean getSkipCallLog();
method public boolean getSkipNotification();
}
- public class CallScreeningService.CallResponse.Builder {
+ public static class CallScreeningService.CallResponse.Builder {
ctor public CallScreeningService.CallResponse.Builder();
method public android.telecom.CallScreeningService.CallResponse build();
method public android.telecom.CallScreeningService.CallResponse.Builder setDisallowCall(boolean);
diff --git a/api/system-current.txt b/api/system-current.txt
index c10954c..d29c496 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -13758,6 +13758,7 @@
method public float getResolution();
method public java.lang.String getStringType();
method public int getType();
+ method public java.util.UUID getUuid();
method public java.lang.String getVendor();
method public int getVersion();
method public boolean isDataInjectionSupported();
@@ -13768,6 +13769,7 @@
field public static final int REPORTING_MODE_SPECIAL_TRIGGER = 3; // 0x3
field public static final java.lang.String STRING_TYPE_ACCELEROMETER = "android.sensor.accelerometer";
field public static final java.lang.String STRING_TYPE_AMBIENT_TEMPERATURE = "android.sensor.ambient_temperature";
+ field public static final java.lang.String STRING_TYPE_DYNAMIC_SENSOR_META = "android.sensor.dynamic_sensor_meta";
field public static final java.lang.String STRING_TYPE_GAME_ROTATION_VECTOR = "android.sensor.game_rotation_vector";
field public static final java.lang.String STRING_TYPE_GEOMAGNETIC_ROTATION_VECTOR = "android.sensor.geomagnetic_rotation_vector";
field public static final java.lang.String STRING_TYPE_GRAVITY = "android.sensor.gravity";
@@ -13795,6 +13797,7 @@
field public static final int TYPE_ACCELEROMETER = 1; // 0x1
field public static final int TYPE_ALL = -1; // 0xffffffff
field public static final int TYPE_AMBIENT_TEMPERATURE = 13; // 0xd
+ field public static final int TYPE_DYNAMIC_SENSOR_META = 32; // 0x20
field public static final int TYPE_GAME_ROTATION_VECTOR = 15; // 0xf
field public static final int TYPE_GEOMAGNETIC_ROTATION_VECTOR = 20; // 0x14
field public static final int TYPE_GRAVITY = 9; // 0x9
@@ -13849,6 +13852,7 @@
method public static void getAngleChange(float[], float[], float[]);
method public android.hardware.Sensor getDefaultSensor(int);
method public android.hardware.Sensor getDefaultSensor(int, boolean);
+ method public java.util.List<android.hardware.Sensor> getDynamicSensorList(int);
method public static float getInclination(float[]);
method public static float[] getOrientation(float[], float[]);
method public static void getQuaternionFromVector(float[], float[]);
@@ -13858,6 +13862,8 @@
method public deprecated int getSensors();
method public boolean initDataInjection(boolean);
method public boolean injectSensorData(android.hardware.Sensor, float[], int, long);
+ method public void registerDynamicSensorCallback(android.hardware.SensorManager.DynamicSensorConnectionCallback);
+ method public void registerDynamicSensorCallback(android.hardware.SensorManager.DynamicSensorConnectionCallback, android.os.Handler);
method public deprecated boolean registerListener(android.hardware.SensorListener, int);
method public deprecated boolean registerListener(android.hardware.SensorListener, int, int);
method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int);
@@ -13866,6 +13872,7 @@
method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, int, android.os.Handler);
method public static boolean remapCoordinateSystem(float[], int, int, float[]);
method public boolean requestTriggerSensor(android.hardware.TriggerEventListener, android.hardware.Sensor);
+ method public void unregisterDynamicSensorCallback(android.hardware.SensorManager.DynamicSensorConnectionCallback);
method public deprecated void unregisterListener(android.hardware.SensorListener);
method public deprecated void unregisterListener(android.hardware.SensorListener, int);
method public void unregisterListener(android.hardware.SensorEventListener, android.hardware.Sensor);
@@ -13930,6 +13937,12 @@
field public static final float STANDARD_GRAVITY = 9.80665f;
}
+ public static abstract class SensorManager.DynamicSensorConnectionCallback {
+ ctor public SensorManager.DynamicSensorConnectionCallback();
+ method public void onDynamicSensorConnected(android.hardware.Sensor);
+ method public void onDynamicSensorDisconnected(android.hardware.Sensor);
+ }
+
public final class TriggerEvent {
field public android.hardware.Sensor sensor;
field public long timestamp;
@@ -20059,7 +20072,38 @@
method public static boolean isPresent();
}
- public class GpsClock implements android.os.Parcelable {
+ public abstract interface GnssNmeaListener {
+ method public abstract void onNmeaReceived(long, java.lang.String);
+ }
+
+ public final class GnssStatus {
+ method public float getAzimuth(int);
+ method public int getConstellationType(int);
+ method public float getElevation(int);
+ method public int getNumSatellites();
+ method public int getPrn(int);
+ method public float getSnr(int);
+ method public boolean hasAlmanac(int);
+ method public boolean hasEphemeris(int);
+ method public boolean usedInFix(int);
+ field public static final int CONSTELLATION_BEIDOU = 5; // 0x5
+ field public static final int CONSTELLATION_GALILEO = 6; // 0x6
+ field public static final int CONSTELLATION_GLONASS = 3; // 0x3
+ field public static final int CONSTELLATION_GPS = 1; // 0x1
+ field public static final int CONSTELLATION_QZSS = 4; // 0x4
+ field public static final int CONSTELLATION_SBAS = 2; // 0x2
+ field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0
+ }
+
+ public abstract class GnssStatusCallback {
+ ctor public GnssStatusCallback();
+ method public void onFirstFix(int);
+ method public void onSatelliteStatusChanged(android.location.GnssStatus);
+ method public void onStarted();
+ method public void onStopped();
+ }
+
+ public final class GpsClock implements android.os.Parcelable {
method public int describeContents();
method public double getBiasInNs();
method public double getBiasUncertaintyInNs();
@@ -20068,6 +20112,7 @@
method public long getFullBiasInNs();
method public short getLeapSecond();
method public long getTimeInNs();
+ method public long getTimeOfLastHwClockDiscontinuityInNs();
method public double getTimeUncertaintyInNs();
method public byte getType();
method public boolean hasBiasInNs();
@@ -20093,16 +20138,20 @@
method public void setFullBiasInNs(long);
method public void setLeapSecond(short);
method public void setTimeInNs(long);
+ method public void setTimeOfLastHwClockDiscontinuityInNs(long);
method public void setTimeUncertaintyInNs(double);
method public void setType(byte);
method public void writeToParcel(android.os.Parcel, int);
+ field public static final byte CLOCK_TYPE_GPS_TIME = 2; // 0x2
+ field public static final byte CLOCK_TYPE_LOCAL_HW_TIME = 1; // 0x1
+ field public static final byte CLOCK_TYPE_UNKNOWN = 0; // 0x0
field public static final android.os.Parcelable.Creator<android.location.GpsClock> CREATOR;
- field public static final byte TYPE_GPS_TIME = 2; // 0x2
- field public static final byte TYPE_LOCAL_HW_TIME = 1; // 0x1
- field public static final byte TYPE_UNKNOWN = 0; // 0x0
}
- public class GpsMeasurement implements android.os.Parcelable {
+ public static abstract class GpsClock.GpsClockType implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsMeasurement implements android.os.Parcelable {
method public int describeContents();
method public double getAccumulatedDeltaRangeInMeters();
method public short getAccumulatedDeltaRangeState();
@@ -20125,6 +20174,8 @@
method public byte getMultipathIndicator();
method public byte getPrn();
method public double getPseudorangeInMeters();
+ method public double getPseudorangeRateCarrierInMetersPerSec();
+ method public double getPseudorangeRateCarrierUncertaintyInMetersPerSec();
method public double getPseudorangeRateInMetersPerSec();
method public double getPseudorangeRateUncertaintyInMetersPerSec();
method public double getPseudorangeUncertaintyInMeters();
@@ -20193,6 +20244,8 @@
method public void setMultipathIndicator(byte);
method public void setPrn(byte);
method public void setPseudorangeInMeters(double);
+ method public void setPseudorangeRateCarrierInMetersPerSec(double);
+ method public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double);
method public void setPseudorangeRateInMetersPerSec(double);
method public void setPseudorangeRateUncertaintyInMetersPerSec(double);
method public void setPseudorangeUncertaintyInMeters(double);
@@ -20223,7 +20276,13 @@
field public static final short STATE_UNKNOWN = 0; // 0x0
}
- public class GpsMeasurementsEvent implements android.os.Parcelable {
+ public static abstract class GpsMeasurement.LossOfLockStatus implements java.lang.annotation.Annotation {
+ }
+
+ public static abstract class GpsMeasurement.MultipathIndicator implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsMeasurementsEvent implements android.os.Parcelable {
ctor public GpsMeasurementsEvent(android.location.GpsClock, android.location.GpsMeasurement[]);
method public int describeContents();
method public android.location.GpsClock getClock();
@@ -20235,12 +20294,16 @@
field public static final int STATUS_READY = 1; // 0x1
}
- public static abstract interface GpsMeasurementsEvent.Listener {
- method public abstract void onGpsMeasurementsReceived(android.location.GpsMeasurementsEvent);
- method public abstract void onStatusChanged(int);
+ public static abstract class GpsMeasurementsEvent.Callback {
+ ctor public GpsMeasurementsEvent.Callback();
+ method public void onGpsMeasurementsReceived(android.location.GpsMeasurementsEvent);
+ method public void onStatusChanged(int);
}
- public class GpsNavigationMessage implements android.os.Parcelable {
+ public static abstract class GpsMeasurementsEvent.GpsMeasurementsStatus implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsNavigationMessage implements android.os.Parcelable {
method public int describeContents();
method public byte[] getData();
method public short getMessageId();
@@ -20258,30 +20321,37 @@
method public void setType(byte);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessage> CREATOR;
+ field public static final byte MESSAGE_TYPE_CNAV2 = 4; // 0x4
+ field public static final byte MESSAGE_TYPE_L1CA = 1; // 0x1
+ field public static final byte MESSAGE_TYPE_L2CNAV = 2; // 0x2
+ field public static final byte MESSAGE_TYPE_L5CNAV = 3; // 0x3
+ field public static final byte MESSAGE_TYPE_UNKNOWN = 0; // 0x0
field public static final short STATUS_PARITY_PASSED = 1; // 0x1
field public static final short STATUS_PARITY_REBUILT = 2; // 0x2
field public static final short STATUS_UNKNOWN = 0; // 0x0
- field public static final byte TYPE_CNAV2 = 4; // 0x4
- field public static final byte TYPE_L1CA = 1; // 0x1
- field public static final byte TYPE_L2CNAV = 2; // 0x2
- field public static final byte TYPE_L5CNAV = 3; // 0x3
- field public static final byte TYPE_UNKNOWN = 0; // 0x0
}
- public class GpsNavigationMessageEvent implements android.os.Parcelable {
+ public static abstract class GpsNavigationMessage.GpsNavigationMessageType implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsNavigationMessageEvent implements android.os.Parcelable {
ctor public GpsNavigationMessageEvent(android.location.GpsNavigationMessage);
method public int describeContents();
method public android.location.GpsNavigationMessage getNavigationMessage();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessageEvent> CREATOR;
- field public static int STATUS_GPS_LOCATION_DISABLED;
- field public static int STATUS_NOT_SUPPORTED;
- field public static int STATUS_READY;
+ field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2
+ field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0
+ field public static final int STATUS_READY = 1; // 0x1
}
- public static abstract interface GpsNavigationMessageEvent.Listener {
- method public abstract void onGpsNavigationMessageReceived(android.location.GpsNavigationMessageEvent);
- method public abstract void onStatusChanged(int);
+ public static abstract class GpsNavigationMessageEvent.Callback {
+ ctor public GpsNavigationMessageEvent.Callback();
+ method public void onGpsNavigationMessageReceived(android.location.GpsNavigationMessageEvent);
+ method public void onStatusChanged(int);
+ }
+
+ public static abstract class GpsNavigationMessageEvent.GpsNavigationMessageStatus implements java.lang.annotation.Annotation {
}
public final class GpsSatellite {
@@ -20388,10 +20458,10 @@
}
public class LocationManager {
- method public boolean addGpsMeasurementListener(android.location.GpsMeasurementsEvent.Listener);
- method public boolean addGpsNavigationMessageListener(android.location.GpsNavigationMessageEvent.Listener);
- method public boolean addGpsStatusListener(android.location.GpsStatus.Listener);
- method public boolean addNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public deprecated boolean addGpsStatusListener(android.location.GpsStatus.Listener);
+ method public deprecated boolean addNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public boolean addNmeaListener(android.location.GnssNmeaListener);
+ method public boolean addNmeaListener(android.location.GnssNmeaListener, android.os.Handler);
method public void addProximityAlert(double, double, float, long, android.app.PendingIntent);
method public void addTestProvider(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int);
method public void clearTestProviderEnabled(java.lang.String);
@@ -20399,16 +20469,21 @@
method public void clearTestProviderStatus(java.lang.String);
method public java.util.List<java.lang.String> getAllProviders();
method public java.lang.String getBestProvider(android.location.Criteria, boolean);
- method public android.location.GpsStatus getGpsStatus(android.location.GpsStatus);
+ method public deprecated android.location.GpsStatus getGpsStatus(android.location.GpsStatus);
method public android.location.Location getLastKnownLocation(java.lang.String);
method public android.location.LocationProvider getProvider(java.lang.String);
method public java.util.List<java.lang.String> getProviders(boolean);
method public java.util.List<java.lang.String> getProviders(android.location.Criteria, boolean);
method public boolean isProviderEnabled(java.lang.String);
- method public void removeGpsMeasurementListener(android.location.GpsMeasurementsEvent.Listener);
- method public void removeGpsNavigationMessageListener(android.location.GpsNavigationMessageEvent.Listener);
- method public void removeGpsStatusListener(android.location.GpsStatus.Listener);
- method public void removeNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback);
+ method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler);
+ method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback);
+ method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback, android.os.Handler);
+ method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback);
+ method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback, android.os.Handler);
+ method public deprecated void removeGpsStatusListener(android.location.GpsStatus.Listener);
+ method public deprecated void removeNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public void removeNmeaListener(android.location.GnssNmeaListener);
method public void removeProximityAlert(android.app.PendingIntent);
method public void removeTestProvider(java.lang.String);
method public void removeUpdates(android.location.LocationListener);
@@ -20428,6 +20503,9 @@
method public void setTestProviderEnabled(java.lang.String, boolean);
method public void setTestProviderLocation(java.lang.String, android.location.Location);
method public void setTestProviderStatus(java.lang.String, int, android.os.Bundle, long);
+ method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback);
+ method public void unregisterGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback);
+ method public void unregisterGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback);
field public static final java.lang.String GPS_PROVIDER = "gps";
field public static final java.lang.String KEY_LOCATION_CHANGED = "location";
field public static final java.lang.String KEY_PROVIDER_ENABLED = "providerEnabled";
@@ -20534,6 +20612,7 @@
field public static final int FLAG_BYPASS_MUTE = 128; // 0x80
field public static final int FLAG_HW_AV_SYNC = 16; // 0x10
field public static final int FLAG_HW_HOTWORD = 32; // 0x20
+ field public static final int FLAG_LOW_LATENCY = 256; // 0x100
field public static final int USAGE_ALARM = 4; // 0x4
field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb
field public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE = 12; // 0xc
@@ -20957,6 +21036,7 @@
method public void flush();
method public int getAudioFormat();
method public int getAudioSessionId();
+ method public int getBufferCapacityInFrames();
method public int getBufferSizeInFrames();
method public int getChannelConfiguration();
method public int getChannelCount();
@@ -20978,6 +21058,7 @@
method public int getState();
method public int getStreamType();
method public boolean getTimestamp(android.media.AudioTimestamp);
+ method public int getUnderrunCount();
method public void pause() throws java.lang.IllegalStateException;
method public void play() throws java.lang.IllegalStateException;
method public void release();
@@ -20985,6 +21066,7 @@
method public deprecated void removeOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener);
method public void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);
method public int setAuxEffectSendLevel(float);
+ method public int setBufferSizeInFrames(int);
method public int setLoopPoints(int, int, int);
method public int setNotificationMarkerPosition(int);
method public int setPlaybackHeadPosition(int);
@@ -21830,6 +21912,16 @@
method public final void setInteger(java.lang.String, int);
method public final void setLong(java.lang.String, long);
method public final void setString(java.lang.String, java.lang.String);
+ field public static final int COLOR_RANGE_FULL = 1; // 0x1
+ field public static final int COLOR_RANGE_LIMITED = 2; // 0x2
+ field public static final int COLOR_STANDARD_BT2020 = 6; // 0x6
+ field public static final int COLOR_STANDARD_BT601_NTSC = 4; // 0x4
+ field public static final int COLOR_STANDARD_BT601_PAL = 2; // 0x2
+ field public static final int COLOR_STANDARD_BT709 = 1; // 0x1
+ field public static final int COLOR_TRANSFER_HLG = 7; // 0x7
+ field public static final int COLOR_TRANSFER_LINEAR = 1; // 0x1
+ field public static final int COLOR_TRANSFER_SDR_VIDEO = 3; // 0x3
+ field public static final int COLOR_TRANSFER_ST2084 = 6; // 0x6
field public static final java.lang.String KEY_AAC_DRC_ATTENUATION_FACTOR = "aac-drc-cut-level";
field public static final java.lang.String KEY_AAC_DRC_BOOST_FACTOR = "aac-drc-boost-level";
field public static final java.lang.String KEY_AAC_DRC_HEAVY_COMPRESSION = "aac-drc-heavy-compression";
@@ -21845,6 +21937,9 @@
field public static final java.lang.String KEY_CHANNEL_COUNT = "channel-count";
field public static final java.lang.String KEY_CHANNEL_MASK = "channel-mask";
field public static final java.lang.String KEY_COLOR_FORMAT = "color-format";
+ field public static final java.lang.String KEY_COLOR_RANGE = "color-range";
+ field public static final java.lang.String KEY_COLOR_STANDARD = "color-standard";
+ field public static final java.lang.String KEY_COLOR_TRANSFER = "color-transfer";
field public static final java.lang.String KEY_COMPLEXITY = "complexity";
field public static final java.lang.String KEY_DURATION = "durationUs";
field public static final java.lang.String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";
@@ -34655,6 +34750,7 @@
method public void copyTo(short[]);
method public void copyTo(int[]);
method public void copyTo(float[]);
+ method public static android.renderscript.Allocation[] createAllocations(android.renderscript.RenderScript, android.renderscript.Type, int, int);
method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap);
method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
@@ -34670,9 +34766,12 @@
method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int);
method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type);
method public void generateMipmaps();
+ method public java.nio.ByteBuffer getByteBuffer();
method public int getBytesSize();
method public android.renderscript.Element getElement();
+ method public long getStride();
method public android.view.Surface getSurface();
+ method public long getTimeStamp();
method public android.renderscript.Type getType();
method public int getUsage();
method public void ioReceive();
@@ -37701,14 +37800,14 @@
field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.CallScreeningService";
}
- public class CallScreeningService.CallResponse {
+ public static class CallScreeningService.CallResponse {
method public boolean getDisallowCall();
method public boolean getRejectCall();
method public boolean getSkipCallLog();
method public boolean getSkipNotification();
}
- public class CallScreeningService.CallResponse.Builder {
+ public static class CallScreeningService.CallResponse.Builder {
ctor public CallScreeningService.CallResponse.Builder();
method public android.telecom.CallScreeningService.CallResponse build();
method public android.telecom.CallScreeningService.CallResponse.Builder setDisallowCall(boolean);
diff --git a/api/test-current.txt b/api/test-current.txt
index c076ad6..3797805 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -13366,6 +13366,7 @@
method public float getResolution();
method public java.lang.String getStringType();
method public int getType();
+ method public java.util.UUID getUuid();
method public java.lang.String getVendor();
method public int getVersion();
method public boolean isWakeUpSensor();
@@ -13454,6 +13455,7 @@
method public static void getAngleChange(float[], float[], float[]);
method public android.hardware.Sensor getDefaultSensor(int);
method public android.hardware.Sensor getDefaultSensor(int, boolean);
+ method public java.util.List<android.hardware.Sensor> getDynamicSensorList(int);
method public static float getInclination(float[]);
method public static float[] getOrientation(float[], float[]);
method public static void getQuaternionFromVector(float[], float[]);
@@ -13461,6 +13463,8 @@
method public static void getRotationMatrixFromVector(float[], float[]);
method public java.util.List<android.hardware.Sensor> getSensorList(int);
method public deprecated int getSensors();
+ method public void registerDynamicSensorCallback(android.hardware.SensorManager.DynamicSensorConnectionCallback);
+ method public void registerDynamicSensorCallback(android.hardware.SensorManager.DynamicSensorConnectionCallback, android.os.Handler);
method public deprecated boolean registerListener(android.hardware.SensorListener, int);
method public deprecated boolean registerListener(android.hardware.SensorListener, int, int);
method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int);
@@ -13469,6 +13473,7 @@
method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, int, android.os.Handler);
method public static boolean remapCoordinateSystem(float[], int, int, float[]);
method public boolean requestTriggerSensor(android.hardware.TriggerEventListener, android.hardware.Sensor);
+ method public void unregisterDynamicSensorCallback(android.hardware.SensorManager.DynamicSensorConnectionCallback);
method public deprecated void unregisterListener(android.hardware.SensorListener);
method public deprecated void unregisterListener(android.hardware.SensorListener, int);
method public void unregisterListener(android.hardware.SensorEventListener, android.hardware.Sensor);
@@ -13533,6 +13538,12 @@
field public static final float STANDARD_GRAVITY = 9.80665f;
}
+ public static abstract class SensorManager.DynamicSensorConnectionCallback {
+ ctor public SensorManager.DynamicSensorConnectionCallback();
+ method public void onDynamicSensorConnected(android.hardware.Sensor);
+ method public void onDynamicSensorDisconnected(android.hardware.Sensor);
+ }
+
public final class TriggerEvent {
field public android.hardware.Sensor sensor;
field public long timestamp;
@@ -19033,6 +19044,288 @@
method public static boolean isPresent();
}
+ public abstract interface GnssNmeaListener {
+ method public abstract void onNmeaReceived(long, java.lang.String);
+ }
+
+ public final class GnssStatus {
+ method public float getAzimuth(int);
+ method public int getConstellationType(int);
+ method public float getElevation(int);
+ method public int getNumSatellites();
+ method public int getPrn(int);
+ method public float getSnr(int);
+ method public boolean hasAlmanac(int);
+ method public boolean hasEphemeris(int);
+ method public boolean usedInFix(int);
+ field public static final int CONSTELLATION_BEIDOU = 5; // 0x5
+ field public static final int CONSTELLATION_GALILEO = 6; // 0x6
+ field public static final int CONSTELLATION_GLONASS = 3; // 0x3
+ field public static final int CONSTELLATION_GPS = 1; // 0x1
+ field public static final int CONSTELLATION_QZSS = 4; // 0x4
+ field public static final int CONSTELLATION_SBAS = 2; // 0x2
+ field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0
+ }
+
+ public abstract class GnssStatusCallback {
+ ctor public GnssStatusCallback();
+ method public void onFirstFix(int);
+ method public void onSatelliteStatusChanged(android.location.GnssStatus);
+ method public void onStarted();
+ method public void onStopped();
+ }
+
+ public final class GpsClock implements android.os.Parcelable {
+ method public int describeContents();
+ method public double getBiasInNs();
+ method public double getBiasUncertaintyInNs();
+ method public double getDriftInNsPerSec();
+ method public double getDriftUncertaintyInNsPerSec();
+ method public long getFullBiasInNs();
+ method public short getLeapSecond();
+ method public long getTimeInNs();
+ method public long getTimeOfLastHwClockDiscontinuityInNs();
+ method public double getTimeUncertaintyInNs();
+ method public byte getType();
+ method public boolean hasBiasInNs();
+ method public boolean hasBiasUncertaintyInNs();
+ method public boolean hasDriftInNsPerSec();
+ method public boolean hasDriftUncertaintyInNsPerSec();
+ method public boolean hasFullBiasInNs();
+ method public boolean hasLeapSecond();
+ method public boolean hasTimeUncertaintyInNs();
+ method public void reset();
+ method public void resetBiasInNs();
+ method public void resetBiasUncertaintyInNs();
+ method public void resetDriftInNsPerSec();
+ method public void resetDriftUncertaintyInNsPerSec();
+ method public void resetFullBiasInNs();
+ method public void resetLeapSecond();
+ method public void resetTimeUncertaintyInNs();
+ method public void set(android.location.GpsClock);
+ method public void setBiasInNs(double);
+ method public void setBiasUncertaintyInNs(double);
+ method public void setDriftInNsPerSec(double);
+ method public void setDriftUncertaintyInNsPerSec(double);
+ method public void setFullBiasInNs(long);
+ method public void setLeapSecond(short);
+ method public void setTimeInNs(long);
+ method public void setTimeOfLastHwClockDiscontinuityInNs(long);
+ method public void setTimeUncertaintyInNs(double);
+ method public void setType(byte);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final byte CLOCK_TYPE_GPS_TIME = 2; // 0x2
+ field public static final byte CLOCK_TYPE_LOCAL_HW_TIME = 1; // 0x1
+ field public static final byte CLOCK_TYPE_UNKNOWN = 0; // 0x0
+ field public static final android.os.Parcelable.Creator<android.location.GpsClock> CREATOR;
+ }
+
+ public static abstract class GpsClock.GpsClockType implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsMeasurement implements android.os.Parcelable {
+ method public int describeContents();
+ method public double getAccumulatedDeltaRangeInMeters();
+ method public short getAccumulatedDeltaRangeState();
+ method public double getAccumulatedDeltaRangeUncertaintyInMeters();
+ method public double getAzimuthInDeg();
+ method public double getAzimuthUncertaintyInDeg();
+ method public int getBitNumber();
+ method public long getCarrierCycles();
+ method public float getCarrierFrequencyInHz();
+ method public double getCarrierPhase();
+ method public double getCarrierPhaseUncertainty();
+ method public double getCn0InDbHz();
+ method public double getCodePhaseInChips();
+ method public double getCodePhaseUncertaintyInChips();
+ method public double getDopplerShiftInHz();
+ method public double getDopplerShiftUncertaintyInHz();
+ method public double getElevationInDeg();
+ method public double getElevationUncertaintyInDeg();
+ method public byte getLossOfLock();
+ method public byte getMultipathIndicator();
+ method public byte getPrn();
+ method public double getPseudorangeInMeters();
+ method public double getPseudorangeRateCarrierInMetersPerSec();
+ method public double getPseudorangeRateCarrierUncertaintyInMetersPerSec();
+ method public double getPseudorangeRateInMetersPerSec();
+ method public double getPseudorangeRateUncertaintyInMetersPerSec();
+ method public double getPseudorangeUncertaintyInMeters();
+ method public long getReceivedGpsTowInNs();
+ method public long getReceivedGpsTowUncertaintyInNs();
+ method public double getSnrInDb();
+ method public short getState();
+ method public short getTimeFromLastBitInMs();
+ method public double getTimeOffsetInNs();
+ method public boolean hasAzimuthInDeg();
+ method public boolean hasAzimuthUncertaintyInDeg();
+ method public boolean hasBitNumber();
+ method public boolean hasCarrierCycles();
+ method public boolean hasCarrierFrequencyInHz();
+ method public boolean hasCarrierPhase();
+ method public boolean hasCarrierPhaseUncertainty();
+ method public boolean hasCodePhaseInChips();
+ method public boolean hasCodePhaseUncertaintyInChips();
+ method public boolean hasDopplerShiftInHz();
+ method public boolean hasDopplerShiftUncertaintyInHz();
+ method public boolean hasElevationInDeg();
+ method public boolean hasElevationUncertaintyInDeg();
+ method public boolean hasPseudorangeInMeters();
+ method public boolean hasPseudorangeUncertaintyInMeters();
+ method public boolean hasSnrInDb();
+ method public boolean hasTimeFromLastBitInMs();
+ method public boolean isPseudorangeRateCorrected();
+ method public boolean isUsedInFix();
+ method public void reset();
+ method public void resetAzimuthInDeg();
+ method public void resetAzimuthUncertaintyInDeg();
+ method public void resetBitNumber();
+ method public void resetCarrierCycles();
+ method public void resetCarrierFrequencyInHz();
+ method public void resetCarrierPhase();
+ method public void resetCarrierPhaseUncertainty();
+ method public void resetCodePhaseInChips();
+ method public void resetCodePhaseUncertaintyInChips();
+ method public void resetDopplerShiftInHz();
+ method public void resetDopplerShiftUncertaintyInHz();
+ method public void resetElevationInDeg();
+ method public void resetElevationUncertaintyInDeg();
+ method public void resetPseudorangeInMeters();
+ method public void resetPseudorangeUncertaintyInMeters();
+ method public void resetSnrInDb();
+ method public void resetTimeFromLastBitInMs();
+ method public void set(android.location.GpsMeasurement);
+ method public void setAccumulatedDeltaRangeInMeters(double);
+ method public void setAccumulatedDeltaRangeState(short);
+ method public void setAccumulatedDeltaRangeUncertaintyInMeters(double);
+ method public void setAzimuthInDeg(double);
+ method public void setAzimuthUncertaintyInDeg(double);
+ method public void setBitNumber(int);
+ method public void setCarrierCycles(long);
+ method public void setCarrierFrequencyInHz(float);
+ method public void setCarrierPhase(double);
+ method public void setCarrierPhaseUncertainty(double);
+ method public void setCn0InDbHz(double);
+ method public void setCodePhaseInChips(double);
+ method public void setCodePhaseUncertaintyInChips(double);
+ method public void setDopplerShiftInHz(double);
+ method public void setDopplerShiftUncertaintyInHz(double);
+ method public void setElevationInDeg(double);
+ method public void setElevationUncertaintyInDeg(double);
+ method public void setLossOfLock(byte);
+ method public void setMultipathIndicator(byte);
+ method public void setPrn(byte);
+ method public void setPseudorangeInMeters(double);
+ method public void setPseudorangeRateCarrierInMetersPerSec(double);
+ method public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double);
+ method public void setPseudorangeRateInMetersPerSec(double);
+ method public void setPseudorangeRateUncertaintyInMetersPerSec(double);
+ method public void setPseudorangeUncertaintyInMeters(double);
+ method public void setReceivedGpsTowInNs(long);
+ method public void setReceivedGpsTowUncertaintyInNs(long);
+ method public void setSnrInDb(double);
+ method public void setState(short);
+ method public void setTimeFromLastBitInMs(short);
+ method public void setTimeOffsetInNs(double);
+ method public void setUsedInFix(boolean);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final short ADR_STATE_CYCLE_SLIP = 4; // 0x4
+ field public static final short ADR_STATE_RESET = 2; // 0x2
+ field public static final short ADR_STATE_UNKNOWN = 0; // 0x0
+ field public static final short ADR_STATE_VALID = 1; // 0x1
+ field public static final android.os.Parcelable.Creator<android.location.GpsMeasurement> CREATOR;
+ field public static final byte LOSS_OF_LOCK_CYCLE_SLIP = 2; // 0x2
+ field public static final byte LOSS_OF_LOCK_OK = 1; // 0x1
+ field public static final byte LOSS_OF_LOCK_UNKNOWN = 0; // 0x0
+ field public static final byte MULTIPATH_INDICATOR_DETECTED = 1; // 0x1
+ field public static final byte MULTIPATH_INDICATOR_NOT_USED = 2; // 0x2
+ field public static final byte MULTIPATH_INDICATOR_UNKNOWN = 0; // 0x0
+ field public static final short STATE_BIT_SYNC = 2; // 0x2
+ field public static final short STATE_CODE_LOCK = 1; // 0x1
+ field public static final short STATE_MSEC_AMBIGUOUS = 16; // 0x10
+ field public static final short STATE_SUBFRAME_SYNC = 4; // 0x4
+ field public static final short STATE_TOW_DECODED = 8; // 0x8
+ field public static final short STATE_UNKNOWN = 0; // 0x0
+ }
+
+ public static abstract class GpsMeasurement.LossOfLockStatus implements java.lang.annotation.Annotation {
+ }
+
+ public static abstract class GpsMeasurement.MultipathIndicator implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsMeasurementsEvent implements android.os.Parcelable {
+ ctor public GpsMeasurementsEvent(android.location.GpsClock, android.location.GpsMeasurement[]);
+ method public int describeContents();
+ method public android.location.GpsClock getClock();
+ method public java.util.Collection<android.location.GpsMeasurement> getMeasurements();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.location.GpsMeasurementsEvent> CREATOR;
+ field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2
+ field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0
+ field public static final int STATUS_READY = 1; // 0x1
+ }
+
+ public static abstract class GpsMeasurementsEvent.Callback {
+ ctor public GpsMeasurementsEvent.Callback();
+ method public void onGpsMeasurementsReceived(android.location.GpsMeasurementsEvent);
+ method public void onStatusChanged(int);
+ }
+
+ public static abstract class GpsMeasurementsEvent.GpsMeasurementsStatus implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsNavigationMessage implements android.os.Parcelable {
+ method public int describeContents();
+ method public byte[] getData();
+ method public short getMessageId();
+ method public byte getPrn();
+ method public short getStatus();
+ method public short getSubmessageId();
+ method public byte getType();
+ method public void reset();
+ method public void set(android.location.GpsNavigationMessage);
+ method public void setData(byte[]);
+ method public void setMessageId(short);
+ method public void setPrn(byte);
+ method public void setStatus(short);
+ method public void setSubmessageId(short);
+ method public void setType(byte);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessage> CREATOR;
+ field public static final byte MESSAGE_TYPE_CNAV2 = 4; // 0x4
+ field public static final byte MESSAGE_TYPE_L1CA = 1; // 0x1
+ field public static final byte MESSAGE_TYPE_L2CNAV = 2; // 0x2
+ field public static final byte MESSAGE_TYPE_L5CNAV = 3; // 0x3
+ field public static final byte MESSAGE_TYPE_UNKNOWN = 0; // 0x0
+ field public static final short STATUS_PARITY_PASSED = 1; // 0x1
+ field public static final short STATUS_PARITY_REBUILT = 2; // 0x2
+ field public static final short STATUS_UNKNOWN = 0; // 0x0
+ }
+
+ public static abstract class GpsNavigationMessage.GpsNavigationMessageType implements java.lang.annotation.Annotation {
+ }
+
+ public final class GpsNavigationMessageEvent implements android.os.Parcelable {
+ ctor public GpsNavigationMessageEvent(android.location.GpsNavigationMessage);
+ method public int describeContents();
+ method public android.location.GpsNavigationMessage getNavigationMessage();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessageEvent> CREATOR;
+ field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2
+ field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0
+ field public static final int STATUS_READY = 1; // 0x1
+ }
+
+ public static abstract class GpsNavigationMessageEvent.Callback {
+ ctor public GpsNavigationMessageEvent.Callback();
+ method public void onGpsNavigationMessageReceived(android.location.GpsNavigationMessageEvent);
+ method public void onStatusChanged(int);
+ }
+
+ public static abstract class GpsNavigationMessageEvent.GpsNavigationMessageStatus implements java.lang.annotation.Annotation {
+ }
+
public final class GpsSatellite {
method public float getAzimuth();
method public float getElevation();
@@ -19117,8 +19410,10 @@
}
public class LocationManager {
- method public boolean addGpsStatusListener(android.location.GpsStatus.Listener);
- method public boolean addNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public deprecated boolean addGpsStatusListener(android.location.GpsStatus.Listener);
+ method public deprecated boolean addNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public boolean addNmeaListener(android.location.GnssNmeaListener);
+ method public boolean addNmeaListener(android.location.GnssNmeaListener, android.os.Handler);
method public void addProximityAlert(double, double, float, long, android.app.PendingIntent);
method public void addTestProvider(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int);
method public void clearTestProviderEnabled(java.lang.String);
@@ -19126,14 +19421,22 @@
method public void clearTestProviderStatus(java.lang.String);
method public java.util.List<java.lang.String> getAllProviders();
method public java.lang.String getBestProvider(android.location.Criteria, boolean);
- method public android.location.GpsStatus getGpsStatus(android.location.GpsStatus);
+ method public deprecated android.location.GpsStatus getGpsStatus(android.location.GpsStatus);
+ method public int getGpsYearOfHardware();
method public android.location.Location getLastKnownLocation(java.lang.String);
method public android.location.LocationProvider getProvider(java.lang.String);
method public java.util.List<java.lang.String> getProviders(boolean);
method public java.util.List<java.lang.String> getProviders(android.location.Criteria, boolean);
method public boolean isProviderEnabled(java.lang.String);
- method public void removeGpsStatusListener(android.location.GpsStatus.Listener);
- method public void removeNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback);
+ method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler);
+ method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback);
+ method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback, android.os.Handler);
+ method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback);
+ method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback, android.os.Handler);
+ method public deprecated void removeGpsStatusListener(android.location.GpsStatus.Listener);
+ method public deprecated void removeNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public void removeNmeaListener(android.location.GnssNmeaListener);
method public void removeProximityAlert(android.app.PendingIntent);
method public void removeTestProvider(java.lang.String);
method public void removeUpdates(android.location.LocationListener);
@@ -19151,6 +19454,9 @@
method public void setTestProviderEnabled(java.lang.String, boolean);
method public void setTestProviderLocation(java.lang.String, android.location.Location);
method public void setTestProviderStatus(java.lang.String, int, android.os.Bundle, long);
+ method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback);
+ method public void unregisterGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback);
+ method public void unregisterGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback);
field public static final java.lang.String GPS_PROVIDER = "gps";
field public static final java.lang.String KEY_LOCATION_CHANGED = "location";
field public static final java.lang.String KEY_PROVIDER_ENABLED = "providerEnabled";
@@ -19217,6 +19523,7 @@
field public static final android.os.Parcelable.Creator<android.media.AudioAttributes> CREATOR;
field public static final int FLAG_AUDIBILITY_ENFORCED = 1; // 0x1
field public static final int FLAG_HW_AV_SYNC = 16; // 0x10
+ field public static final int FLAG_LOW_LATENCY = 256; // 0x100
field public static final int USAGE_ALARM = 4; // 0x4
field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb
field public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE = 12; // 0xc
@@ -19614,6 +19921,7 @@
method public void flush();
method public int getAudioFormat();
method public int getAudioSessionId();
+ method public int getBufferCapacityInFrames();
method public int getBufferSizeInFrames();
method public int getChannelConfiguration();
method public int getChannelCount();
@@ -19635,6 +19943,7 @@
method public int getState();
method public int getStreamType();
method public boolean getTimestamp(android.media.AudioTimestamp);
+ method public int getUnderrunCount();
method public void pause() throws java.lang.IllegalStateException;
method public void play() throws java.lang.IllegalStateException;
method public void release();
@@ -19642,6 +19951,7 @@
method public deprecated void removeOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener);
method public void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);
method public int setAuxEffectSendLevel(float);
+ method public int setBufferSizeInFrames(int);
method public int setLoopPoints(int, int, int);
method public int setNotificationMarkerPosition(int);
method public int setPlaybackHeadPosition(int);
@@ -20487,6 +20797,16 @@
method public final void setInteger(java.lang.String, int);
method public final void setLong(java.lang.String, long);
method public final void setString(java.lang.String, java.lang.String);
+ field public static final int COLOR_RANGE_FULL = 1; // 0x1
+ field public static final int COLOR_RANGE_LIMITED = 2; // 0x2
+ field public static final int COLOR_STANDARD_BT2020 = 6; // 0x6
+ field public static final int COLOR_STANDARD_BT601_NTSC = 4; // 0x4
+ field public static final int COLOR_STANDARD_BT601_PAL = 2; // 0x2
+ field public static final int COLOR_STANDARD_BT709 = 1; // 0x1
+ field public static final int COLOR_TRANSFER_HLG = 7; // 0x7
+ field public static final int COLOR_TRANSFER_LINEAR = 1; // 0x1
+ field public static final int COLOR_TRANSFER_SDR_VIDEO = 3; // 0x3
+ field public static final int COLOR_TRANSFER_ST2084 = 6; // 0x6
field public static final java.lang.String KEY_AAC_DRC_ATTENUATION_FACTOR = "aac-drc-cut-level";
field public static final java.lang.String KEY_AAC_DRC_BOOST_FACTOR = "aac-drc-boost-level";
field public static final java.lang.String KEY_AAC_DRC_HEAVY_COMPRESSION = "aac-drc-heavy-compression";
@@ -20502,6 +20822,9 @@
field public static final java.lang.String KEY_CHANNEL_COUNT = "channel-count";
field public static final java.lang.String KEY_CHANNEL_MASK = "channel-mask";
field public static final java.lang.String KEY_COLOR_FORMAT = "color-format";
+ field public static final java.lang.String KEY_COLOR_RANGE = "color-range";
+ field public static final java.lang.String KEY_COLOR_STANDARD = "color-standard";
+ field public static final java.lang.String KEY_COLOR_TRANSFER = "color-transfer";
field public static final java.lang.String KEY_COMPLEXITY = "complexity";
field public static final java.lang.String KEY_DURATION = "durationUs";
field public static final java.lang.String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";
@@ -32443,6 +32766,7 @@
method public void copyTo(short[]);
method public void copyTo(int[]);
method public void copyTo(float[]);
+ method public static android.renderscript.Allocation[] createAllocations(android.renderscript.RenderScript, android.renderscript.Type, int, int);
method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap);
method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
@@ -32458,9 +32782,12 @@
method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int);
method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type);
method public void generateMipmaps();
+ method public java.nio.ByteBuffer getByteBuffer();
method public int getBytesSize();
method public android.renderscript.Element getElement();
+ method public long getStride();
method public android.view.Surface getSurface();
+ method public long getTimeStamp();
method public android.renderscript.Type getType();
method public int getUsage();
method public void ioReceive();
@@ -35409,14 +35736,14 @@
field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.CallScreeningService";
}
- public class CallScreeningService.CallResponse {
+ public static class CallScreeningService.CallResponse {
method public boolean getDisallowCall();
method public boolean getRejectCall();
method public boolean getSkipCallLog();
method public boolean getSkipNotification();
}
- public class CallScreeningService.CallResponse.Builder {
+ public static class CallScreeningService.CallResponse.Builder {
ctor public CallScreeningService.CallResponse.Builder();
method public android.telecom.CallScreeningService.CallResponse build();
method public android.telecom.CallScreeningService.CallResponse.Builder setDisallowCall(boolean);
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 06da4955..158a284 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -2618,8 +2618,7 @@
* turned off</li>
* </ul>
*
- * <p class="note">This is a protected intent that can only be sent
- * by the system.
+ * <p class="note">This is a protected intent that can only be sent by the system.</p>
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_AIRPLANE_MODE_CHANGED = "android.intent.action.AIRPLANE_MODE";
@@ -3210,6 +3209,18 @@
public static final String
ACTION_OPEN_EXTERNAL_DIRECTORY = "android.intent.action.OPEN_EXTERNAL_DIRECTORY";
+ /**
+ * Broadcast Action: List of dynamic sensor is changed due to new sensor being connected or
+ * exisiting sensor being disconnected.
+ *
+ * <p class="note">This is a protected intent that can only be sent by the system.</p>
+ *
+ * {@hide}
+ */
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+ public static final String
+ ACTION_DYNAMIC_SENSOR_CHANGED = "android.intent.action.DYNAMIC_SENSOR_CHANGED";
+
/** {@hide} */
public static final String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR";
@@ -5698,6 +5709,9 @@
case "--receiver-replace-pending":
intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
break;
+ case "--receiver-foreground":
+ intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+ break;
case "--selector":
intent.setDataAndType(data, type);
intent = new Intent();
@@ -5807,6 +5821,7 @@
" [--esal <EXTRA_KEY> <EXTRA_STRING_VALUE>[,<EXTRA_STRING_VALUE...]]",
" (mutiple extras passed as List<String>; to embed a comma into a string,",
" escape it using \"\\,\")",
+ " [--f <FLAG>]",
" [--grant-read-uri-permission] [--grant-write-uri-permission]",
" [--grant-persistable-uri-permission] [--grant-prefix-uri-permission]",
" [--debug-log-resolution] [--exclude-stopped-packages]",
@@ -5820,6 +5835,7 @@
" [--activity-single-top] [--activity-clear-task]",
" [--activity-task-on-home]",
" [--receiver-registered-only] [--receiver-replace-pending]",
+ " [--receiver-foreground]",
" [--selector]",
" [<URI> | <PACKAGE> | <COMPONENT>]"
};
diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java
index c710f21..841e5b0 100644
--- a/core/java/android/hardware/Sensor.java
+++ b/core/java/android/hardware/Sensor.java
@@ -17,8 +17,10 @@
package android.hardware;
-import android.os.Build;
import android.annotation.SystemApi;
+import android.os.Build;
+
+import java.util.UUID;
/**
* Class representing a sensor. Use {@link SensorManager#getSensorList} to get
@@ -622,6 +624,29 @@
public static final String STRING_TYPE_HEART_BEAT = "android.sensor.heart_beat";
/**
+ * A constant describing a dynamic sensor meta event sensor.
+ *
+ * A sensor event of this type is received when a dynamic sensor is added to or removed from
+ * the system. This sensor type should always use special trigger report mode ({@code
+ * SensorManager.REPORTING_MODE_SPECIAL_TRIGGER}).
+ *
+ * @hide This sensor is expected to be used only by system services.
+ */
+ @SystemApi
+ public static final int TYPE_DYNAMIC_SENSOR_META = 32;
+
+ /**
+ * A constant string describing a dynamic sensor meta event sensor.
+ *
+ * @see #TYPE_DYNAMIC_SENSOR_META
+ *
+ * @hide This sensor is expected to only be used by the system service
+ */
+ @SystemApi
+ public static final String STRING_TYPE_DYNAMIC_SENSOR_META =
+ "android.sensor.dynamic_sensor_meta";
+
+ /**
* A constant describing all sensor types.
*/
@@ -708,7 +733,11 @@
1, // SENSOR_TYPE_PICK_UP_GESTURE
1, // SENSOR_TYPE_WRIST_TILT_GESTURE
1, // SENSOR_TYPE_DEVICE_ORIENTATION
- 16, // SENSOR_TYPE_POSE_6DOF
+ 16,// SENSOR_TYPE_POSE_6DOF
+ 1, // SENSOR_TYPE_STATIONARY_DETECT
+ 1, // SENSOR_TYPE_MOTION_DETECT
+ 1, // SENSOR_TYPE_HEART_BEAT
+ 2, // SENSOR_TYPE_DYNAMIC_SENSOR_META
};
/**
@@ -734,12 +763,10 @@
}
int offset = sensor.mType;
if (offset >= sSensorReportingModes.length) {
- // we don't know about this sensor, so this is probably a
- // vendor-defined sensor, in that case, we don't know how many value
- // it has
- // so we return the maximum and assume the app will know.
- // FIXME: sensor HAL should advertise how much data is returned per
- // sensor
+ // we don't know about this sensor, so this is probably a vendor-defined sensor, in that
+ // case, we don't know how many value it has so we return the maximum and assume the app
+ // will know.
+ // FIXME: sensor HAL should advertise how much data is returned per sensor
return 16;
}
return sSensorReportingModes[offset];
@@ -763,6 +790,7 @@
private String mRequiredPermission;
private int mMaxDelay;
private int mFlags;
+ private UUID mUuid;
Sensor() {
}
@@ -851,6 +879,13 @@
}
/**
+ * @return The type of this sensor as a string.
+ */
+ public UUID getUuid() {
+ return mUuid;
+ }
+
+ /**
* @hide
* @return The permission required to access this sensor. If empty, no permission is required.
*/
@@ -1033,6 +1068,9 @@
case TYPE_DEVICE_ORIENTATION:
mStringType = STRING_TYPE_DEVICE_ORIENTATION;
return true;
+ case TYPE_DYNAMIC_SENSOR_META:
+ mStringType = STRING_TYPE_DYNAMIC_SENSOR_META;
+ return true;
default:
return false;
}
diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java
index 5d405f9..f0b17c30 100644
--- a/core/java/android/hardware/SensorManager.java
+++ b/core/java/android/hardware/SensorManager.java
@@ -377,6 +377,12 @@
protected abstract List<Sensor> getFullSensorList();
/**
+ * Gets the full list of dynamic sensors that are available.
+ * @hide
+ */
+ protected abstract List<Sensor> getFullDynamicSensorList();
+
+ /**
* @return available sensors.
* @deprecated This method is deprecated, use
* {@link SensorManager#getSensorList(int)} instead
@@ -430,6 +436,38 @@
}
/**
+ * Use this method to get a list of available dynamic sensors of a certain type.
+ * Make multiple calls to get sensors of different types or use
+ * {@link android.hardware.Sensor#TYPE_ALL Sensor.TYPE_ALL} to get all dynamic sensors.
+ *
+ * <p class="note">
+ * NOTE: Both wake-up and non wake-up sensors matching the given type are
+ * returned. Check {@link Sensor#isWakeUpSensor()} to know the wake-up properties
+ * of the returned {@link Sensor}.
+ * </p>
+ *
+ * @param type of sensors requested
+ *
+ * @return a list of dynamic sensors matching the requested type.
+ *
+ * @see Sensor
+ */
+ public List<Sensor> getDynamicSensorList(int type) {
+ // cache the returned lists the first time
+ final List<Sensor> fullList = getFullDynamicSensorList();
+ if (type == Sensor.TYPE_ALL) {
+ return Collections.unmodifiableList(fullList);
+ } else {
+ List<Sensor> list = new ArrayList();
+ for (Sensor i : fullList) {
+ if (i.getType() == type)
+ list.add(i);
+ }
+ return Collections.unmodifiableList(list);
+ }
+ }
+
+ /**
* Use this method to get the default sensor for a given type. Note that the
* returned sensor could be a composite sensor, and its data could be
* averaged or filtered. If you need to access the raw sensors use
@@ -841,6 +879,86 @@
/** @hide */
protected abstract boolean flushImpl(SensorEventListener listener);
+
+ /**
+ * Used for receiving notifications from the SensorManager when dynamic sensors are connected or
+ * disconnected.
+ */
+ public static abstract class DynamicSensorConnectionCallback {
+ /**
+ * Called when there is a dynamic sensor being connected to the system.
+ *
+ * @param sensor the newly connected sensor. See {@link android.hardware.Sensor Sensor}.
+ */
+ public void onDynamicSensorConnected(Sensor sensor) {}
+
+ /**
+ * Called when there is a dynamic sensor being disconnected from the system.
+ *
+ * @param sensor the disconnected sensor. See {@link android.hardware.Sensor Sensor}.
+ */
+ public void onDynamicSensorDisconnected(Sensor sensor) {}
+ }
+
+
+ /**
+ * Add a {@link android.hardware.SensorManager.DynamicSensorConnectionCallback
+ * DynamicSensorConnectionCallback} to receive dynamic sensor connection callbacks. Repeat
+ * registration with the already registered callback object will have no additional effect.
+ *
+ * @param callback An object that implements the
+ * {@link android.hardware.SensorManager.DynamicSensorConnectionCallback
+ * DynamicSensorConnectionCallback}
+ * interface for receiving callbacks.
+ * @see #addDynamicSensorCallback(DynamicSensorConnectionCallback, Handler)
+ *
+ * @throws IllegalArgumentException when callback is null.
+ */
+ public void registerDynamicSensorCallback(DynamicSensorConnectionCallback callback) {
+ registerDynamicSensorCallback(callback, null);
+ }
+
+ /**
+ * Add a {@link android.hardware.SensorManager.DynamicSensorConnectionCallback
+ * DynamicSensorConnectionCallback} to receive dynamic sensor connection callbacks. Repeat
+ * registration with the already registered callback object will have no additional effect.
+ *
+ * @param callback An object that implements the
+ * {@link android.hardware.SensorManager.DynamicSensorConnectionCallback
+ * DynamicSensorConnectionCallback} interface for receiving callbacks.
+ * @param handler The {@link android.os.Handler Handler} the {@link
+ * android.hardware.SensorManager.DynamicSensorConnectionCallback
+ * sensor connection events} will be delivered to.
+ *
+ * @throws IllegalArgumentException when callback is null.
+ */
+ public void registerDynamicSensorCallback(
+ DynamicSensorConnectionCallback callback, Handler handler) {
+ registerDynamicSensorCallbackImpl(callback, handler);
+ }
+
+ /**
+ * Remove a {@link android.hardware.SensorManager.DynamicSensorConnectionCallback
+ * DynamicSensorConnectionCallback} to stop sending dynamic sensor connection events to that
+ * callback.
+ *
+ * @param callback An object that implements the
+ * {@link android.hardware.SensorManager.DynamicSensorConnectionCallback
+ * DynamicSensorConnectionCallback}
+ * interface for receiving callbacks.
+ */
+ public void unregisterDynamicSensorCallback(DynamicSensorConnectionCallback callback) {
+ unregisterDynamicSensorCallbackImpl(callback);
+ }
+
+ /** @hide */
+ protected abstract void registerDynamicSensorCallbackImpl(
+ DynamicSensorConnectionCallback callback, Handler handler);
+
+ /** @hide */
+ protected abstract void unregisterDynamicSensorCallbackImpl(
+ DynamicSensorConnectionCallback callback);
+
/**
* <p>
* Computes the inclination matrix <b>I</b> as well as the rotation matrix
diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java
index 2fe8fb6..e91195c 100644
--- a/core/java/android/hardware/SystemSensorManager.java
+++ b/core/java/android/hardware/SystemSensorManager.java
@@ -17,7 +17,10 @@
package android.hardware;
import android.Manifest;
+import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.os.Handler;
import android.os.Looper;
@@ -32,6 +35,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Sensor manager implementation that communicates with the built-in
@@ -40,10 +44,14 @@
* @hide
*/
public class SystemSensorManager extends SensorManager {
+ //TODO: disable extra logging before release
+ private static boolean DEBUG_DYNAMIC_SENSOR = true;
+
private static native void nativeClassInit();
private static native long nativeCreate(String opPackageName);
private static native boolean nativeGetSensorAtIndex(long nativeInstance,
Sensor sensor, int index);
+ private static native void nativeGetDynamicSensors(long nativeInstance, List<Sensor> list);
private static native boolean nativeIsDataInjectionEnabled(long nativeInstance);
private static boolean sSensorModuleInitialized = false;
@@ -52,7 +60,10 @@
private final Object mLock = new Object();
private final ArrayList<Sensor> mFullSensorsList = new ArrayList<>();
- private final SparseArray<Sensor> mHandleToSensor = new SparseArray<>();
+ private List<Sensor> mFullDynamicSensorsList = new ArrayList<>();
+ private boolean mDynamicSensorListDirty = true;
+
+ private final HashMap<Integer, Sensor> mHandleToSensor = new HashMap<>();
// Listener list
private final HashMap<SensorEventListener, SensorEventQueue> mSensorListeners =
@@ -60,6 +71,11 @@
private final HashMap<TriggerEventListener, TriggerEventQueue> mTriggerListeners =
new HashMap<TriggerEventListener, TriggerEventQueue>();
+ // Dynamic Sensor callbacks
+ private HashMap<DynamicSensorConnectionCallback, Handler>
+ mDynamicSensorCallbacks = new HashMap<>();
+ private BroadcastReceiver mDynamicSensorBroadcastReceiver;
+
// Looper associated with the context in which this instance was created.
private final Looper mMainLooper;
private final int mTargetSdkLevel;
@@ -84,7 +100,7 @@
Sensor sensor = new Sensor();
if (!nativeGetSensorAtIndex(mNativeInstance, sensor, index)) break;
mFullSensorsList.add(sensor);
- mHandleToSensor.append(sensor.getHandle(), sensor);
+ mHandleToSensor.put(sensor.getHandle(), sensor);
}
}
}
@@ -96,6 +112,15 @@
return mFullSensorsList;
}
+ /** @hide */
+ @Override
+ protected List<Sensor> getFullDynamicSensorList() {
+ // only set up broadcast receiver if the application tries to find dynamic sensors or
+ // explicitly register a DynamicSensorConnectionCallback
+ setupDynamicSensorBroadcastReceiver();
+ updateDynamicSensorList();
+ return mFullDynamicSensorsList;
+ }
/** @hide */
@Override
@@ -274,6 +299,187 @@
}
}
+ private void cleanupSensorConnection(Sensor sensor) {
+ mHandleToSensor.remove(sensor.getHandle());
+
+ if (sensor.getReportingMode() == Sensor.REPORTING_MODE_ONE_SHOT) {
+ synchronized(mTriggerListeners) {
+ for (TriggerEventListener l: mTriggerListeners.keySet()) {
+ if (DEBUG_DYNAMIC_SENSOR){
+ Log.i(TAG, "removed trigger listener" + l.toString() +
+ " due to sensor disconnection");
+ }
+ cancelTriggerSensorImpl(l, sensor, true);
+ }
+ }
+ } else {
+ synchronized(mSensorListeners) {
+ for (SensorEventListener l: mSensorListeners.keySet()) {
+ if (DEBUG_DYNAMIC_SENSOR){
+ Log.i(TAG, "removed event listener" + l.toString() +
+ " due to sensor disconnection");
+ }
+ unregisterListenerImpl(l, sensor);
+ }
+ }
+ }
+ }
+
+ private void updateDynamicSensorList() {
+ synchronized(mFullDynamicSensorsList) {
+ if (mDynamicSensorListDirty) {
+ List<Sensor> list = new ArrayList<>();
+ nativeGetDynamicSensors(mNativeInstance, list);
+
+ final List<Sensor> updatedList = new ArrayList<>();
+ final List<Sensor> addedList = new ArrayList<>();
+ final List<Sensor> removedList = new ArrayList<>();
+
+ boolean changed = diffSortedSensorList(
+ mFullDynamicSensorsList, list, updatedList, addedList, removedList);
+
+ if (changed) {
+ if (DEBUG_DYNAMIC_SENSOR) {
+ Log.i(TAG, "DYNS dynamic sensor list cached should be updated");
+ }
+ mFullDynamicSensorsList = updatedList;
+
+ for (Sensor s: addedList) {
+ mHandleToSensor.put(s.getHandle(), s);
+ }
+
+ Handler mainHandler = new Handler(mContext.getMainLooper());
+
+ for (Map.Entry<DynamicSensorConnectionCallback, Handler> entry :
+ mDynamicSensorCallbacks.entrySet()) {
+ final DynamicSensorConnectionCallback callback = entry.getKey();
+ Handler handler =
+ entry.getValue() == null ? mainHandler : entry.getValue();
+
+ handler.post(new Runnable() {
+ @Override
+ public void run() {
+ for (Sensor s: addedList) {
+ callback.onDynamicSensorConnected(s);
+ }
+ for (Sensor s: removedList) {
+ callback.onDynamicSensorDisconnected(s);
+ }
+ }
+ });
+ }
+
+ for (Sensor s: removedList) {
+ cleanupSensorConnection(s);
+ }
+ }
+
+ mDynamicSensorListDirty = false;
+ }
+ }
+ }
+
+ private void setupDynamicSensorBroadcastReceiver() {
+ if (mDynamicSensorBroadcastReceiver == null) {
+ mDynamicSensorBroadcastReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (intent.getAction() == Intent.ACTION_DYNAMIC_SENSOR_CHANGED) {
+ if (DEBUG_DYNAMIC_SENSOR) {
+ Log.i(TAG, "DYNS received DYNAMIC_SENSOR_CHANED broadcast");
+ }
+ // Dynamic sensors probably changed
+ mDynamicSensorListDirty = true;
+ updateDynamicSensorList();
+ }
+ }
+ };
+
+ IntentFilter filter = new IntentFilter("dynamic_sensor_change");
+ filter.addAction(Intent.ACTION_DYNAMIC_SENSOR_CHANGED);
+ mContext.registerReceiver(mDynamicSensorBroadcastReceiver, filter);
+ }
+ }
+
+ private void teardownDynamicSensorBroadcastReceiver() {
+ mDynamicSensorCallbacks.clear();
+ mContext.unregisterReceiver(mDynamicSensorBroadcastReceiver);
+ mDynamicSensorBroadcastReceiver = null;
+ }
+
+ /** @hide */
+ protected void registerDynamicSensorCallbackImpl(
+ DynamicSensorConnectionCallback callback, Handler handler) {
+ if (DEBUG_DYNAMIC_SENSOR) {
+ Log.i(TAG, "DYNS Register dynamic sensor callback");
+ }
+
+ if (callback == null) {
+ throw new IllegalArgumentException("callback cannot be null");
+ }
+ if (mDynamicSensorCallbacks.containsKey(callback)) {
+ // has been already registered, ignore
+ return;
+ }
+
+ setupDynamicSensorBroadcastReceiver();
+ mDynamicSensorCallbacks.put(callback, handler);
+ }
+
+ /** @hide */
+ protected void unregisterDynamicSensorCallbackImpl(
+ DynamicSensorConnectionCallback callback) {
+ if (DEBUG_DYNAMIC_SENSOR) {
+ Log.i(TAG, "Removing dynamic sensor listerner");
+ }
+ mDynamicSensorCallbacks.remove(callback);
+ }
+
+ /*
+ * Find the difference of two List<Sensor> assuming List are sorted by handle of sensor,
+ * assuming the input list is already sorted by handle. Inputs are ol and nl; outputs are
+ * updated, added and removed. Any of the output lists can be null in case the result is not
+ * interested.
+ */
+ private static boolean diffSortedSensorList(
+ List<Sensor> oldList, List<Sensor> newList, List<Sensor> updated,
+ List<Sensor> added, List<Sensor> removed) {
+
+ boolean changed = false;
+
+ int i = 0, j = 0;
+ while (true) {
+ if (j < oldList.size() && ( i >= newList.size() ||
+ newList.get(i).getHandle() > oldList.get(j).getHandle()) ) {
+ changed = true;
+ if (removed != null) {
+ removed.add(oldList.get(j));
+ }
+ ++j;
+ } else if (i < newList.size() && ( j >= oldList.size() ||
+ newList.get(i).getHandle() < oldList.get(j).getHandle())) {
+ changed = true;
+ if (added != null) {
+ added.add(newList.get(i));
+ }
+ if (updated != null) {
+ updated.add(newList.get(i));
+ }
+ ++i;
+ } else if (i < newList.size() && j < oldList.size() &&
+ newList.get(i).getHandle() == oldList.get(j).getHandle()) {
+ if (updated != null) {
+ updated.add(oldList.get(j));
+ }
+ ++i;
+ ++j;
+ } else {
+ break;
+ }
+ }
+ return changed;
+ }
+
/*
* BaseEventQueue is the communication channel with the sensor service,
* SensorEventQueue, TriggerEventQueue are subclases and there is one-to-one mapping between
@@ -297,7 +503,6 @@
private long nSensorEventQueue;
private final SparseBooleanArray mActiveSensors = new SparseBooleanArray();
protected final SparseIntArray mSensorAccuracies = new SparseIntArray();
- protected final SparseBooleanArray mFirstEvent = new SparseBooleanArray();
private final CloseGuard mCloseGuard = CloseGuard.get();
private final float[] mScratch = new float[16];
protected final SystemSensorManager mManager;
@@ -348,7 +553,7 @@
mActiveSensors.put(handle, false);
removeSensorEvent(sensor);
} else {
- // it should never happen -- just ignore.
+ // sensor just disconnected -- just ignore.
}
}
}
@@ -456,6 +661,11 @@
protected void dispatchSensorEvent(int handle, float[] values, int inAccuracy,
long timestamp) {
final Sensor sensor = mManager.mHandleToSensor.get(handle);
+ if (sensor == null) {
+ // sensor disconnected
+ return;
+ }
+
SensorEvent t = null;
synchronized (mSensorsEvents) {
t = mSensorsEvents.get(handle);
@@ -485,6 +695,10 @@
protected void dispatchFlushCompleteEvent(int handle) {
if (mListener instanceof SensorEventListener2) {
final Sensor sensor = mManager.mHandleToSensor.get(handle);
+ if (sensor == null) {
+ // sensor disconnected
+ return;
+ }
((SensorEventListener2)mListener).onFlushCompleted(sensor);
}
return;
@@ -523,6 +737,10 @@
protected void dispatchSensorEvent(int handle, float[] values, int accuracy,
long timestamp) {
final Sensor sensor = mManager.mHandleToSensor.get(handle);
+ if (sensor == null) {
+ // sensor disconnected
+ return;
+ }
TriggerEvent t = null;
synchronized (mTriggerEvents) {
t = mTriggerEvents.get(handle);
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 92c721b..25b38c0 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1189,7 +1189,7 @@
return TYPE_NONE;
}
- // Do this only for SUPL, until GpsLocationProvider is fixed. http://b/25876485 .
+ // Do this only for SUPL, until GnssLocationProvider is fixed. http://b/25876485 .
if (!netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_SUPL)) {
// NOTE: if this causes app breakage, we should not just comment out this early return;
// instead, we should make this early return conditional on the requesting app's target
@@ -3170,7 +3170,7 @@
// Checks whether the calling app can use the legacy routing API (startUsingNetworkFeature,
// stopUsingNetworkFeature, requestRouteToHost), and if not throw UnsupportedOperationException.
- // TODO: convert the existing system users (Tethering, GpsLocationProvider) to the new APIs and
+ // TODO: convert the existing system users (Tethering, GnssLocationProvider) to the new APIs and
// remove these exemptions. Note that this check is not secure, and apps can still access these
// functions by accessing ConnectivityService directly. However, it should be clear that doing
// so is unsupported and may break in the future. http://b/22728205
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 9180506..52fa2ed 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -201,9 +201,14 @@
private static final String BATTERY_LEVEL_DATA = "lv";
private static final String GLOBAL_WIFI_DATA = "gwfl";
private static final String WIFI_DATA = "wfl";
- private static final String GLOBAL_BLUETOOTH_DATA = "gble";
+ private static final String GLOBAL_WIFI_CONTROLLER_DATA = "gwfcd";
+ private static final String WIFI_CONTROLLER_DATA = "wfcd";
+ private static final String GLOBAL_BLUETOOTH_CONTROLLER_DATA = "gble";
+ private static final String BLUETOOTH_CONTROLLER_DATA = "ble";
private static final String MISC_DATA = "m";
private static final String GLOBAL_NETWORK_DATA = "gn";
+ private static final String GLOBAL_MODEM_CONTROLLER_DATA = "gmcd";
+ private static final String MODEM_CONTROLLER_DATA = "mcd";
private static final String HISTORY_STRING_POOL = "hsp";
private static final String HISTORY_DATA = "h";
private static final String SCREEN_BRIGHTNESS_DATA = "br";
@@ -271,6 +276,39 @@
}
/**
+ * Container class that aggregates counters for transmit, receive, and idle state of a
+ * radio controller.
+ */
+ public static abstract class ControllerActivityCounter {
+ /**
+ * @return a non-null {@link LongCounter} representing time spent (milliseconds) in the
+ * idle state.
+ */
+ public abstract LongCounter getIdleTimeCounter();
+
+ /**
+ * @return a non-null {@link LongCounter} representing time spent (milliseconds) in the
+ * receive state.
+ */
+ public abstract LongCounter getRxTimeCounter();
+
+ /**
+ * An array of {@link LongCounter}, representing various transmit levels, where each level
+ * may draw a different amount of power. The levels themselves are controller-specific.
+ * @return non-null array of {@link LongCounter}s representing time spent (milliseconds) in
+ * various transmit level states.
+ */
+ public abstract LongCounter[] getTxTimeCounters();
+
+ /**
+ * @return a non-null {@link LongCounter} representing the power consumed by the controller
+ * in all states, measured in milli-ampere-milliseconds (mAms). The counter may always
+ * yield a value of 0 if the device doesn't support power calculations.
+ */
+ public abstract LongCounter getPowerCounter();
+ }
+
+ /**
* State for keeping track of timing information.
*/
public static abstract class Timer {
@@ -367,25 +405,9 @@
*/
public abstract ArrayMap<String, ? extends Pkg> getPackageStats();
- /**
- * Returns the time in milliseconds that this app kept the WiFi controller in the
- * specified state <code>type</code>.
- * @param type one of {@link #CONTROLLER_IDLE_TIME}, {@link #CONTROLLER_RX_TIME}, or
- * {@link #CONTROLLER_TX_TIME}.
- * @param which one of {@link #STATS_CURRENT}, {@link #STATS_SINCE_CHARGED}, or
- * {@link #STATS_SINCE_UNPLUGGED}.
- */
- public abstract long getWifiControllerActivity(int type, int which);
-
- /**
- * Returns the time in milliseconds that this app kept the Bluetooth controller in the
- * specified state <code>type</code>.
- * @param type one of {@link #CONTROLLER_IDLE_TIME}, {@link #CONTROLLER_RX_TIME}, or
- * {@link #CONTROLLER_TX_TIME}.
- * @param which one of {@link #STATS_CURRENT}, {@link #STATS_SINCE_CHARGED}, or
- * {@link #STATS_SINCE_UNPLUGGED}.
- */
- public abstract long getBluetoothControllerActivity(int type, int which);
+ public abstract ControllerActivityCounter getWifiControllerActivity();
+ public abstract ControllerActivityCounter getBluetoothControllerActivity();
+ public abstract ControllerActivityCounter getModemControllerActivity();
/**
* {@hide}
@@ -2031,43 +2053,47 @@
public abstract long getNetworkActivityBytes(int type, int which);
public abstract long getNetworkActivityPackets(int type, int which);
- public static final int CONTROLLER_IDLE_TIME = 0;
- public static final int CONTROLLER_RX_TIME = 1;
- public static final int CONTROLLER_TX_TIME = 2;
- public static final int CONTROLLER_POWER_DRAIN = 3;
- public static final int NUM_CONTROLLER_ACTIVITY_TYPES = CONTROLLER_POWER_DRAIN + 1;
-
- /**
- * Returns true if the BatteryStats object has detailed bluetooth power reports.
- * When true, calling {@link #getBluetoothControllerActivity(int, int)} will yield the
- * actual power data.
- */
- public abstract boolean hasBluetoothActivityReporting();
-
- /**
- * For {@link #CONTROLLER_IDLE_TIME}, {@link #CONTROLLER_RX_TIME}, and
- * {@link #CONTROLLER_TX_TIME}, returns the time spent (in milliseconds) in the
- * respective state.
- * For {@link #CONTROLLER_POWER_DRAIN}, returns the power used by the controller in
- * milli-ampere-milliseconds (mAms).
- */
- public abstract long getBluetoothControllerActivity(int type, int which);
-
/**
* Returns true if the BatteryStats object has detailed WiFi power reports.
- * When true, calling {@link #getWifiControllerActivity(int, int)} will yield the
+ * When true, calling {@link #getWifiControllerActivity()} will yield the
* actual power data.
*/
public abstract boolean hasWifiActivityReporting();
/**
- * For {@link #CONTROLLER_IDLE_TIME}, {@link #CONTROLLER_RX_TIME}, and
- * {@link #CONTROLLER_TX_TIME}, returns the time spent (in milliseconds) in the
- * respective state.
- * For {@link #CONTROLLER_POWER_DRAIN}, returns the power used by the controller in
- * milli-ampere-milliseconds (mAms).
+ * Returns a {@link ControllerActivityCounter} which is an aggregate of the times spent
+ * in various radio controller states, such as transmit, receive, and idle.
+ * @return non-null {@link ControllerActivityCounter}
*/
- public abstract long getWifiControllerActivity(int type, int which);
+ public abstract ControllerActivityCounter getWifiControllerActivity();
+
+ /**
+ * Returns true if the BatteryStats object has detailed bluetooth power reports.
+ * When true, calling {@link #getBluetoothControllerActivity()} will yield the
+ * actual power data.
+ */
+ public abstract boolean hasBluetoothActivityReporting();
+
+ /**
+ * Returns a {@link ControllerActivityCounter} which is an aggregate of the times spent
+ * in various radio controller states, such as transmit, receive, and idle.
+ * @return non-null {@link ControllerActivityCounter}
+ */
+ public abstract ControllerActivityCounter getBluetoothControllerActivity();
+
+ /**
+ * Returns true if the BatteryStats object has detailed modem power reports.
+ * When true, calling {@link #getModemControllerActivity()} will yield the
+ * actual power data.
+ */
+ public abstract boolean hasModemActivityReporting();
+
+ /**
+ * Returns a {@link ControllerActivityCounter} which is an aggregate of the times spent
+ * in various radio controller states, such as transmit, receive, and idle.
+ * @return non-null {@link ControllerActivityCounter}
+ */
+ public abstract ControllerActivityCounter getModemControllerActivity();
/**
* Return the wall clock time when battery stats data collection started.
@@ -2496,6 +2522,17 @@
return ",";
}
+ private static final void dumpLineHeader(PrintWriter pw, int uid, String category,
+ String type) {
+ pw.print(BATTERY_STATS_CHECKIN_VERSION);
+ pw.print(',');
+ pw.print(uid);
+ pw.print(',');
+ pw.print(category);
+ pw.print(',');
+ pw.print(type);
+ }
+
/**
* Dump a comma-separated line of values for terse checkin mode.
*
@@ -2506,14 +2543,7 @@
*/
private static final void dumpLine(PrintWriter pw, int uid, String category, String type,
Object... args ) {
- pw.print(BATTERY_STATS_CHECKIN_VERSION);
- pw.print(',');
- pw.print(uid);
- pw.print(',');
- pw.print(category);
- pw.print(',');
- pw.print(type);
-
+ dumpLineHeader(pw, uid, category, type);
for (Object arg : args) {
pw.print(',');
pw.print(arg);
@@ -2546,6 +2576,140 @@
}
/**
+ * Checks if the ControllerActivityCounter has any data worth dumping.
+ */
+ private static boolean controllerActivityHasData(ControllerActivityCounter counter, int which) {
+ if (counter == null) {
+ return false;
+ }
+
+ if (counter.getIdleTimeCounter().getCountLocked(which) != 0
+ || counter.getRxTimeCounter().getCountLocked(which) != 0
+ || counter.getPowerCounter().getCountLocked(which) != 0) {
+ return true;
+ }
+
+ for (LongCounter c : counter.getTxTimeCounters()) {
+ if (c.getCountLocked(which) != 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Dumps the ControllerActivityCounter if it has any data worth dumping.
+ * The order of the arguments in the final check in line is:
+ *
+ * idle, rx, power, tx...
+ *
+ * where tx... is one or more transmit level times.
+ */
+ private static final void dumpControllerActivityLine(PrintWriter pw, int uid, String category,
+ String type,
+ ControllerActivityCounter counter,
+ int which) {
+ if (!controllerActivityHasData(counter, which)) {
+ return;
+ }
+
+ dumpLineHeader(pw, uid, category, type);
+ pw.print(",");
+ pw.print(counter.getIdleTimeCounter().getCountLocked(which));
+ pw.print(",");
+ pw.print(counter.getRxTimeCounter().getCountLocked(which));
+ pw.print(",");
+ pw.print(counter.getPowerCounter().getCountLocked(which) / (1000 * 60 * 60));
+ for (LongCounter c : counter.getTxTimeCounters()) {
+ pw.print(",");
+ pw.print(c.getCountLocked(which));
+ }
+ pw.println();
+ }
+
+ private final void printControllerActivityIfInteresting(PrintWriter pw, StringBuilder sb,
+ String prefix, String controllerName,
+ ControllerActivityCounter counter,
+ int which) {
+ if (controllerActivityHasData(counter, which)) {
+ printControllerActivity(pw, sb, prefix, controllerName, counter, which);
+ }
+ }
+
+ private final void printControllerActivity(PrintWriter pw, StringBuilder sb, String prefix,
+ String controllerName,
+ ControllerActivityCounter counter, int which) {
+ final long idleTimeMs = counter.getIdleTimeCounter().getCountLocked(which);
+ final long rxTimeMs = counter.getRxTimeCounter().getCountLocked(which);
+ final long powerDrainMaMs = counter.getPowerCounter().getCountLocked(which);
+ long totalTxTimeMs = 0;
+ for (LongCounter txState : counter.getTxTimeCounters()) {
+ totalTxTimeMs += txState.getCountLocked(which);
+ }
+
+ final long totalTimeMs = idleTimeMs + rxTimeMs + totalTxTimeMs;
+
+ sb.setLength(0);
+ sb.append(prefix);
+ sb.append(" ");
+ sb.append(controllerName);
+ sb.append(" Idle time: ");
+ formatTimeMs(sb, idleTimeMs);
+ sb.append("(");
+ sb.append(formatRatioLocked(idleTimeMs, totalTimeMs));
+ sb.append(")");
+ pw.println(sb.toString());
+
+ sb.setLength(0);
+ sb.append(prefix);
+ sb.append(" ");
+ sb.append(controllerName);
+ sb.append(" Rx time: ");
+ formatTimeMs(sb, rxTimeMs);
+ sb.append("(");
+ sb.append(formatRatioLocked(rxTimeMs, totalTimeMs));
+ sb.append(")");
+ pw.println(sb.toString());
+
+ sb.setLength(0);
+ sb.append(prefix);
+ sb.append(" ");
+ sb.append(controllerName);
+ sb.append(" Tx time: ");
+ formatTimeMs(sb, totalTxTimeMs);
+ sb.append("(");
+ sb.append(formatRatioLocked(totalTxTimeMs, totalTimeMs));
+ sb.append(")");
+ pw.println(sb.toString());
+
+ final int numTxLvls = counter.getTxTimeCounters().length;
+ if (numTxLvls > 1) {
+ for (int lvl = 0; lvl < numTxLvls; lvl++) {
+ final long txLvlTimeMs = counter.getTxTimeCounters()[lvl].getCountLocked(which);
+ sb.setLength(0);
+ sb.append(prefix);
+ sb.append(" [");
+ sb.append(lvl);
+ sb.append("] ");
+ formatTimeMs(sb, txLvlTimeMs);
+ sb.append("(");
+ sb.append(formatRatioLocked(txLvlTimeMs, totalTxTimeMs));
+ sb.append(")");
+ pw.println(sb.toString());
+ }
+ }
+
+ sb.setLength(0);
+ sb.append(prefix);
+ sb.append(" ");
+ sb.append(controllerName);
+ sb.append(" Power drain: ").append(
+ BatteryStatsHelper.makemAh(powerDrainMaMs / (double) (1000*60*60)));
+ sb.append("mAh");
+ pw.println(sb.toString());
+ }
+
+ /**
* Temporary for settings.
*/
public final void dumpCheckinLocked(Context context, PrintWriter pw, int which, int reqUid) {
@@ -2637,24 +2801,22 @@
mobileRxTotalBytes, mobileTxTotalBytes, wifiRxTotalBytes, wifiTxTotalBytes,
mobileRxTotalPackets, mobileTxTotalPackets, wifiRxTotalPackets, wifiTxTotalPackets);
+ // Dump Modem controller stats
+ dumpControllerActivityLine(pw, 0 /* uid */, category, GLOBAL_MODEM_CONTROLLER_DATA,
+ getModemControllerActivity(), which);
+
// Dump Wifi controller stats
final long wifiOnTime = getWifiOnTime(rawRealtime, which);
final long wifiRunningTime = getGlobalWifiRunningTime(rawRealtime, which);
- final long wifiIdleTimeMs = getWifiControllerActivity(CONTROLLER_IDLE_TIME, which);
- final long wifiRxTimeMs = getWifiControllerActivity(CONTROLLER_RX_TIME, which);
- final long wifiTxTimeMs = getWifiControllerActivity(CONTROLLER_TX_TIME, which);
- final long wifiPowerMaMs = getWifiControllerActivity(CONTROLLER_POWER_DRAIN, which);
- dumpLine(pw, 0 /* uid */, category, GLOBAL_WIFI_DATA,
- wifiOnTime / 1000, wifiRunningTime / 1000,
- wifiIdleTimeMs, wifiRxTimeMs, wifiTxTimeMs, wifiPowerMaMs / (1000*60*60));
+ dumpLine(pw, 0 /* uid */, category, GLOBAL_WIFI_DATA, wifiOnTime / 1000,
+ wifiRunningTime / 1000, /* legacy fields follow, keep at 0 */ 0, 0, 0, 0);
+
+ dumpControllerActivityLine(pw, 0 /* uid */, category, GLOBAL_WIFI_CONTROLLER_DATA,
+ getWifiControllerActivity(), which);
// Dump Bluetooth controller stats
- final long btIdleTimeMs = getBluetoothControllerActivity(CONTROLLER_IDLE_TIME, which);
- final long btRxTimeMs = getBluetoothControllerActivity(CONTROLLER_RX_TIME, which);
- final long btTxTimeMs = getBluetoothControllerActivity(CONTROLLER_TX_TIME, which);
- final long btPowerMaMs = getBluetoothControllerActivity(CONTROLLER_POWER_DRAIN, which);
- dumpLine(pw, 0 /* uid */, category, GLOBAL_BLUETOOTH_DATA,
- btIdleTimeMs, btRxTimeMs, btTxTimeMs, btPowerMaMs / (1000*60*60));
+ dumpControllerActivityLine(pw, 0 /* uid */, category, GLOBAL_BLUETOOTH_CONTROLLER_DATA,
+ getBluetoothControllerActivity(), which);
// Dump misc stats
dumpLine(pw, 0 /* uid */, category, MISC_DATA,
@@ -2865,21 +3027,25 @@
mobileActiveTime, mobileActiveCount);
}
+ // Dump modem controller data, per UID.
+ dumpControllerActivityLine(pw, uid, category, MODEM_CONTROLLER_DATA,
+ u.getModemControllerActivity(), which);
+
+ // Dump Wifi controller data, per UID.
final long fullWifiLockOnTime = u.getFullWifiLockTime(rawRealtime, which);
final long wifiScanTime = u.getWifiScanTime(rawRealtime, which);
final int wifiScanCount = u.getWifiScanCount(which);
final long uidWifiRunningTime = u.getWifiRunningTime(rawRealtime, which);
- final long uidWifiIdleTimeMs = u.getWifiControllerActivity(CONTROLLER_IDLE_TIME, which);
- final long uidWifiRxTimeMs = u.getWifiControllerActivity(CONTROLLER_RX_TIME, which);
- final long uidWifiTxTimeMs = u.getWifiControllerActivity(CONTROLLER_TX_TIME, which);
if (fullWifiLockOnTime != 0 || wifiScanTime != 0 || wifiScanCount != 0
- || uidWifiRunningTime != 0 || uidWifiIdleTimeMs != 0 || uidWifiRxTimeMs != 0
- || uidWifiTxTimeMs != 0) {
- dumpLine(pw, uid, category, WIFI_DATA,
- fullWifiLockOnTime, wifiScanTime, uidWifiRunningTime, wifiScanCount,
- uidWifiIdleTimeMs, uidWifiRxTimeMs, uidWifiTxTimeMs);
+ || uidWifiRunningTime != 0) {
+ dumpLine(pw, uid, category, WIFI_DATA, fullWifiLockOnTime, wifiScanTime,
+ uidWifiRunningTime, wifiScanCount,
+ /* legacy fields follow, keep at 0 */ 0, 0, 0, 0);
}
+ dumpControllerActivityLine(pw, uid, category, WIFI_CONTROLLER_DATA,
+ u.getWifiControllerActivity(), which);
+
if (u.hasUserActivity()) {
args = new Object[Uid.NUM_USER_ACTIVITY_TYPES];
boolean hasData = false;
@@ -3409,6 +3575,8 @@
pw.println(sb.toString());
}
+ printControllerActivity(pw, sb, prefix, "Radio", getModemControllerActivity(), which);
+
pw.print(prefix);
pw.print(" Wi-Fi total received: "); pw.print(formatBytesLocked(wifiRxTotalBytes));
pw.print(", sent: "); pw.print(formatBytesLocked(wifiTxTotalBytes));
@@ -3494,85 +3662,14 @@
if (!didOne) sb.append(" (no activity)");
pw.println(sb.toString());
- final long wifiIdleTimeMs = getWifiControllerActivity(CONTROLLER_IDLE_TIME, which);
- final long wifiRxTimeMs = getWifiControllerActivity(CONTROLLER_RX_TIME, which);
- final long wifiTxTimeMs = getWifiControllerActivity(CONTROLLER_TX_TIME, which);
- final long wifiPowerDrainMaMs = getWifiControllerActivity(CONTROLLER_POWER_DRAIN, which);
- final long wifiTotalTimeMs = wifiIdleTimeMs + wifiRxTimeMs + wifiTxTimeMs;
-
- sb.setLength(0);
- sb.append(prefix);
- sb.append(" WiFi Idle time: "); formatTimeMs(sb, wifiIdleTimeMs);
- sb.append("(");
- sb.append(formatRatioLocked(wifiIdleTimeMs, wifiTotalTimeMs));
- sb.append(")");
- pw.println(sb.toString());
-
- sb.setLength(0);
- sb.append(prefix);
- sb.append(" WiFi Rx time: "); formatTimeMs(sb, wifiRxTimeMs);
- sb.append("(");
- sb.append(formatRatioLocked(wifiRxTimeMs, wifiTotalTimeMs));
- sb.append(")");
- pw.println(sb.toString());
-
- sb.setLength(0);
- sb.append(prefix);
- sb.append(" WiFi Tx time: "); formatTimeMs(sb, wifiTxTimeMs);
- sb.append("(");
- sb.append(formatRatioLocked(wifiTxTimeMs, wifiTotalTimeMs));
- sb.append(")");
- pw.println(sb.toString());
-
- sb.setLength(0);
- sb.append(prefix);
- sb.append(" WiFi Power drain: ").append(
- BatteryStatsHelper.makemAh(wifiPowerDrainMaMs / (double) (1000*60*60)));
- sb.append("mAh");
- pw.println(sb.toString());
+ printControllerActivity(pw, sb, prefix, "WiFi", getWifiControllerActivity(), which);
pw.print(prefix);
pw.print(" Bluetooth total received: "); pw.print(formatBytesLocked(btRxTotalBytes));
pw.print(", sent: "); pw.println(formatBytesLocked(btTxTotalBytes));
- final long bluetoothIdleTimeMs =
- getBluetoothControllerActivity(CONTROLLER_IDLE_TIME, which);
- final long bluetoothRxTimeMs = getBluetoothControllerActivity(CONTROLLER_RX_TIME, which);
- final long bluetoothTxTimeMs = getBluetoothControllerActivity(CONTROLLER_TX_TIME, which);
- final long bluetoothTotalTimeMs = bluetoothIdleTimeMs + bluetoothRxTimeMs +
- bluetoothTxTimeMs;
-
- sb.setLength(0);
- sb.append(prefix);
- sb.append(" Bluetooth Idle time: "); formatTimeMs(sb, bluetoothIdleTimeMs);
- sb.append("(");
- sb.append(formatRatioLocked(bluetoothIdleTimeMs, bluetoothTotalTimeMs));
- sb.append(")");
- pw.println(sb.toString());
-
- sb.setLength(0);
- sb.append(prefix);
- sb.append(" Bluetooth Rx time: "); formatTimeMs(sb, bluetoothRxTimeMs);
- sb.append("(");
- sb.append(formatRatioLocked(bluetoothRxTimeMs, bluetoothTotalTimeMs));
- sb.append(")");
- pw.println(sb.toString());
-
- sb.setLength(0);
- sb.append(prefix);
- sb.append(" Bluetooth Tx time: "); formatTimeMs(sb, bluetoothTxTimeMs);
- sb.append("(");
- sb.append(formatRatioLocked(bluetoothTxTimeMs, bluetoothTotalTimeMs));
- sb.append(")");
- pw.println(sb.toString());
-
- sb.setLength(0);
- sb.append(prefix);
- sb.append(" Bluetooth Power drain: ").append(BatteryStatsHelper.makemAh(
- getBluetoothControllerActivity(CONTROLLER_POWER_DRAIN, which) /
- (double)(1000*60*60)));
- sb.append("mAh");
- pw.println(sb.toString());
+ printControllerActivity(pw, sb, prefix, "Bluetooth", getBluetoothControllerActivity(),
+ which);
pw.println();
@@ -3897,6 +3994,9 @@
pw.println(sb.toString());
}
+ printControllerActivityIfInteresting(pw, sb, prefix + " ", "Modem",
+ u.getModemControllerActivity(), which);
+
if (wifiRxBytes > 0 || wifiTxBytes > 0 || wifiRxPackets > 0 || wifiTxPackets > 0) {
pw.print(prefix); pw.print(" Wi-Fi network: ");
pw.print(formatBytesLocked(wifiRxBytes)); pw.print(" received, ");
@@ -3925,26 +4025,8 @@
pw.println(sb.toString());
}
- final long uidWifiIdleTimeMs = u.getWifiControllerActivity(CONTROLLER_IDLE_TIME, which);
- final long uidWifiRxTimeMs = u.getWifiControllerActivity(CONTROLLER_RX_TIME, which);
- final long uidWifiTxTimeMs = u.getWifiControllerActivity(CONTROLLER_TX_TIME, which);
- final long uidWifiTotalTimeMs = uidWifiIdleTimeMs + uidWifiRxTimeMs + uidWifiTxTimeMs;
- if (uidWifiTotalTimeMs > 0) {
- sb.setLength(0);
- sb.append(prefix).append(" WiFi Idle time: ");
- formatTimeMs(sb, uidWifiIdleTimeMs);
- sb.append("(").append(formatRatioLocked(uidWifiIdleTimeMs, uidWifiTotalTimeMs))
- .append(")\n");
-
- sb.append(prefix).append(" WiFi Rx time: "); formatTimeMs(sb, uidWifiRxTimeMs);
- sb.append("(").append(formatRatioLocked(uidWifiRxTimeMs, uidWifiTotalTimeMs))
- .append(")\n");
-
- sb.append(prefix).append(" WiFi Tx time: "); formatTimeMs(sb, uidWifiTxTimeMs);
- sb.append("(").append(formatRatioLocked(uidWifiTxTimeMs, uidWifiTotalTimeMs))
- .append(")");
- pw.println(sb.toString());
- }
+ printControllerActivityIfInteresting(pw, sb, prefix + " ", "WiFi",
+ u.getWifiControllerActivity(), which);
if (btRxBytes > 0 || btTxBytes > 0) {
pw.print(prefix); pw.print(" Bluetooth network: ");
@@ -3953,30 +4035,6 @@
pw.println(" sent");
}
- final long uidBtIdleTimeMs = u.getBluetoothControllerActivity(CONTROLLER_IDLE_TIME,
- which);
- final long uidBtRxTimeMs = u.getBluetoothControllerActivity(CONTROLLER_RX_TIME, which);
- final long uidBtTxTimeMs = u.getBluetoothControllerActivity(CONTROLLER_TX_TIME, which);
- final long uidBtTotalTimeMs = uidBtIdleTimeMs + uidBtRxTimeMs + uidBtTxTimeMs;
- if (uidBtTotalTimeMs > 0) {
- sb.setLength(0);
- sb.append(prefix).append(" Bluetooth Idle time: ");
- formatTimeMs(sb, uidBtIdleTimeMs);
- sb.append("(").append(formatRatioLocked(uidBtIdleTimeMs, uidBtTotalTimeMs))
- .append(")\n");
-
- sb.append(prefix).append(" Bluetooth Rx time: ");
- formatTimeMs(sb, uidBtRxTimeMs);
- sb.append("(").append(formatRatioLocked(uidBtRxTimeMs, uidBtTotalTimeMs))
- .append(")\n");
-
- sb.append(prefix).append(" Bluetooth Tx time: ");
- formatTimeMs(sb, uidBtTxTimeMs);
- sb.append("(").append(formatRatioLocked(uidBtTxTimeMs, uidBtTotalTimeMs))
- .append(")");
- pw.println(sb.toString());
- }
-
if (u.hasUserActivity()) {
boolean hasData = false;
for (int i=0; i<Uid.NUM_USER_ACTIVITY_TYPES; i++) {
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index eca2c3b..1552a3c 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -150,6 +150,12 @@
public static final int AUDIOSERVER_UID = 1041;
/**
+ * Defines the UID/GID for the cameraserver process
+ * @hide
+ */
+ public static final int CAMERASERVER_UID = 1046;
+
+ /**
* Defines the start of a range of UIDs (and GIDs), going from this
* number to {@link #LAST_APPLICATION_UID} that are reserved for assigning
* to applications.
diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java
index dbec740..1244987 100644
--- a/core/java/com/android/internal/app/IntentForwarderActivity.java
+++ b/core/java/com/android/internal/app/IntentForwarderActivity.java
@@ -100,7 +100,7 @@
final boolean shouldShowDisclosure = ri == null || ri.activityInfo == null ||
!"android".equals(ri.activityInfo.packageName) ||
!(ResolverActivity.class.getName().equals(ri.activityInfo.name)
- || ChooserActivity.class.getName().equals(ri.activityInfo.name));
+ || "com.android.systemui.chooser.ChooserActivity".equals(ri.activityInfo.name));
try {
startActivityAsCaller(newIntent, null, false, targetUserId);
diff --git a/core/java/com/android/internal/app/NetInitiatedActivity.java b/core/java/com/android/internal/app/NetInitiatedActivity.java
index b951f50e..d3bae16 100644
--- a/core/java/com/android/internal/app/NetInitiatedActivity.java
+++ b/core/java/com/android/internal/app/NetInitiatedActivity.java
@@ -133,7 +133,7 @@
notificationId = -1;
}
- // Respond to NI Handler under GpsLocationProvider, 1 = accept, 2 = deny
+ // Respond to NI Handler under GnssLocationProvider, 1 = accept, 2 = deny
private void sendUserResponse(int response) {
if (DEBUG) Log.d(TAG, "sendUserResponse, response: " + response);
LocationManager locationManager = (LocationManager)
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index aa38de7..4e48c1b4 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -22,6 +22,7 @@
import android.app.VoiceInteractor.PickOptionRequest;
import android.app.VoiceInteractor.PickOptionRequest.Option;
import android.app.VoiceInteractor.Prompt;
+import android.content.pm.ComponentInfo;
import android.os.AsyncTask;
import android.provider.Settings;
import android.text.TextUtils;
@@ -336,12 +337,12 @@
/**
* Perform any initialization needed for voice interaction.
*/
- void onSetupVoiceInteraction() {
+ public void onSetupVoiceInteraction() {
// Do it right now. Subclasses may delay this and send it later.
sendVoiceChoicesIfNeeded();
}
- void sendVoiceChoicesIfNeeded() {
+ public void sendVoiceChoicesIfNeeded() {
if (!isVoiceInteraction()) {
// Clearly not needed.
return;
@@ -382,7 +383,7 @@
return null;
}
- int getLayoutResource() {
+ public int getLayoutResource() {
return R.layout.resolver_list;
}
@@ -591,7 +592,7 @@
mAlwaysUseOption);
}
- void startSelected(int which, boolean always, boolean filtered) {
+ public void startSelected(int which, boolean always, boolean filtered) {
if (isFinishing()) {
return;
}
@@ -761,7 +762,7 @@
return true;
}
- void safelyStartActivity(TargetInfo cti) {
+ public void safelyStartActivity(TargetInfo cti) {
// If needed, show that intent is forwarded
// from managed profile to owner or other way around.
if (mProfileSwitchMessageId != -1) {
@@ -791,26 +792,26 @@
}
}
- void onActivityStarted(TargetInfo cti) {
+ public void onActivityStarted(TargetInfo cti) {
// Do nothing
}
- boolean shouldGetActivityMetadata() {
+ public boolean shouldGetActivityMetadata() {
return false;
}
- boolean shouldAutoLaunchSingleChoice(TargetInfo target) {
+ public boolean shouldAutoLaunchSingleChoice(TargetInfo target) {
return true;
}
- void showAppDetails(ResolveInfo ri) {
+ public void showTargetDetails(ResolveInfo ri) {
Intent in = new Intent().setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
.setData(Uri.fromParts("package", ri.activityInfo.packageName, null))
.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
startActivity(in);
}
- ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents,
+ public ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents,
Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid,
boolean filterLastUsed) {
return new ResolveListAdapter(context, payloadIntents, initialIntents, rList,
@@ -820,7 +821,7 @@
/**
* Returns true if the activity is finishing and creation should halt
*/
- boolean configureContentView(List<Intent> payloadIntents, Intent[] initialIntents,
+ public boolean configureContentView(List<Intent> payloadIntents, Intent[] initialIntents,
List<ResolveInfo> rList, boolean alwaysUseOption) {
// The last argument of createAdapter is whether to do special handling
// of the last used choice to highlight it in the list. We need to always
@@ -867,7 +868,7 @@
return false;
}
- void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter,
+ public void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter,
boolean alwaysUseOption) {
final boolean useHeader = adapter.hasFilteredItem();
final ListView listView = adapterView instanceof ListView ? (ListView) adapterView : null;
@@ -898,7 +899,7 @@
&& Objects.equals(lhs.activityInfo.packageName, rhs.activityInfo.packageName);
}
- final class DisplayResolveInfo implements TargetInfo {
+ public final class DisplayResolveInfo implements TargetInfo {
private final ResolveInfo mResolveInfo;
private final CharSequence mDisplayLabel;
private Drawable mDisplayIcon;
@@ -906,8 +907,9 @@
private final CharSequence mExtendedInfo;
private final Intent mResolvedIntent;
private final List<Intent> mSourceIntents = new ArrayList<>();
+ private boolean mPinned;
- DisplayResolveInfo(Intent originalIntent, ResolveInfo pri, CharSequence pLabel,
+ public DisplayResolveInfo(Intent originalIntent, ResolveInfo pri, CharSequence pLabel,
CharSequence pInfo, Intent pOrigIntent) {
mSourceIntents.add(originalIntent);
mResolveInfo = pri;
@@ -932,6 +934,7 @@
mExtendedInfo = other.mExtendedInfo;
mResolvedIntent = new Intent(other.mResolvedIntent);
mResolvedIntent.fillIn(fillInIntent, flags);
+ mPinned = other.mPinned;
}
public ResolveInfo getResolveInfo() {
@@ -1026,6 +1029,15 @@
activity.startActivityAsUser(mResolvedIntent, options, user);
return false;
}
+
+ @Override
+ public boolean isPinned() {
+ return mPinned;
+ }
+
+ public void setPinned(boolean pinned) {
+ mPinned = pinned;
+ }
}
/**
@@ -1039,7 +1051,7 @@
*
* @return the resolved intent for this target
*/
- public Intent getResolvedIntent();
+ Intent getResolvedIntent();
/**
* Get the resolved component name that represents this target. Note that this may not
@@ -1048,7 +1060,7 @@
*
* @return the resolved ComponentName for this target
*/
- public ComponentName getResolvedComponentName();
+ ComponentName getResolvedComponentName();
/**
* Start the activity referenced by this target.
@@ -1057,7 +1069,7 @@
* @param options ActivityOptions bundle
* @return true if the start completed successfully
*/
- public boolean start(Activity activity, Bundle options);
+ boolean start(Activity activity, Bundle options);
/**
* Start the activity referenced by this target as if the ResolverActivity's caller
@@ -1068,7 +1080,7 @@
* @param userId userId to start as or {@link UserHandle#USER_NULL} for activity's caller
* @return true if the start completed successfully
*/
- public boolean startAsCaller(Activity activity, Bundle options, int userId);
+ boolean startAsCaller(Activity activity, Bundle options, int userId);
/**
* Start the activity referenced by this target as a given user.
@@ -1078,7 +1090,7 @@
* @param user handle for the user to start the activity as
* @return true if the start completed successfully
*/
- public boolean startAsUser(Activity activity, Bundle options, UserHandle user);
+ boolean startAsUser(Activity activity, Bundle options, UserHandle user);
/**
* Return the ResolveInfo about how and why this target matched the original query
@@ -1086,14 +1098,14 @@
*
* @return ResolveInfo representing this target's match
*/
- public ResolveInfo getResolveInfo();
+ ResolveInfo getResolveInfo();
/**
* Return the human-readable text label for this target.
*
* @return user-visible target label
*/
- public CharSequence getDisplayLabel();
+ CharSequence getDisplayLabel();
/**
* Return any extended info for this target. This may be used to disambiguate
@@ -1101,35 +1113,40 @@
*
* @return human-readable disambig string or null if none present
*/
- public CharSequence getExtendedInfo();
+ CharSequence getExtendedInfo();
/**
* @return The drawable that should be used to represent this target
*/
- public Drawable getDisplayIcon();
+ Drawable getDisplayIcon();
/**
* @return The (small) icon to badge the target with
*/
- public Drawable getBadgeIcon();
+ Drawable getBadgeIcon();
/**
* @return The content description for the badge icon
*/
- public CharSequence getBadgeContentDescription();
+ CharSequence getBadgeContentDescription();
/**
* Clone this target with the given fill-in information.
*/
- public TargetInfo cloneFilledIn(Intent fillInIntent, int flags);
+ TargetInfo cloneFilledIn(Intent fillInIntent, int flags);
/**
* @return the list of supported source intents deduped against this single target
*/
- public List<Intent> getAllSourceIntents();
+ List<Intent> getAllSourceIntents();
+
+ /**
+ * @return true if this target should be pinned to the front by the request of the user
+ */
+ boolean isPinned();
}
- class ResolveListAdapter extends BaseAdapter {
+ public class ResolveListAdapter extends BaseAdapter {
private final List<Intent> mIntents;
private final Intent[] mInitialIntents;
private final List<ResolveInfo> mBaseResolveList;
@@ -1372,9 +1389,12 @@
}
}
if (!found) {
- into.add(new ResolvedComponentInfo(new ComponentName(
- newInfo.activityInfo.packageName, newInfo.activityInfo.name),
- intent, newInfo));
+ final ComponentName name = new ComponentName(
+ newInfo.activityInfo.packageName, newInfo.activityInfo.name);
+ final ResolvedComponentInfo rci = new ResolvedComponentInfo(name,
+ intent, newInfo);
+ rci.setPinned(isComponentPinned(name));
+ into.add(rci);
}
}
}
@@ -1450,6 +1470,8 @@
final Intent replaceIntent = getReplacementIntent(add.activityInfo, intent);
final DisplayResolveInfo dri = new DisplayResolveInfo(intent, add, roLabel,
extraInfo, replaceIntent);
+ final ComponentInfo ci = add.getComponentInfo();
+ dri.setPinned(rci.isPinned());
addResolveInfo(dri);
if (replaceIntent == intent) {
// Only add alternates if we didn't get a specific replacement from
@@ -1533,11 +1555,11 @@
return false;
}
- protected int getDisplayResolveInfoCount() {
+ public int getDisplayResolveInfoCount() {
return mDisplayList.size();
}
- protected DisplayResolveInfo getDisplayResolveInfo(int index) {
+ public DisplayResolveInfo getDisplayResolveInfo(int index) {
// Used to query services. We only query services for primary targets, not alternates.
return mDisplayList.get(index);
}
@@ -1567,6 +1589,10 @@
return !TextUtils.isEmpty(info.getExtendedInfo());
}
+ public boolean isComponentPinned(ComponentName name) {
+ return false;
+ }
+
public final void bindView(int position, View view) {
onBindView(view, getItem(position));
}
@@ -1603,6 +1629,7 @@
static final class ResolvedComponentInfo {
public final ComponentName name;
+ private boolean mPinned;
private final List<Intent> mIntents = new ArrayList<>();
private final List<ResolveInfo> mResolveInfos = new ArrayList<>();
@@ -1645,6 +1672,14 @@
}
return -1;
}
+
+ public boolean isPinned() {
+ return mPinned;
+ }
+
+ public void setPinned(boolean pinned) {
+ mPinned = pinned;
+ }
}
static class ViewHolder {
@@ -1698,7 +1733,7 @@
return false;
}
ResolveInfo ri = mAdapter.resolveInfoForPosition(position, true);
- showAppDetails(ri);
+ showTargetDetails(ri);
return true;
}
diff --git a/core/java/com/android/internal/app/ResolverComparator.java b/core/java/com/android/internal/app/ResolverComparator.java
index 31556e2..964a7f5 100644
--- a/core/java/com/android/internal/app/ResolverComparator.java
+++ b/core/java/com/android/internal/app/ResolverComparator.java
@@ -48,7 +48,7 @@
private static final boolean DEBUG = false;
// Two weeks
- private static final long USAGE_STATS_PERIOD = 1000 * 60 * 60 * 24 * 14;
+ private static final long USAGE_STATS_PERIOD = 1000 * 60 * 60 * 24 * 7;
private static final long RECENCY_TIME_PERIOD = 1000 * 60 * 60 * 12;
@@ -171,15 +171,27 @@
}
}
- if (mStats != null) {
- final ScoredTarget lhsTarget = mScoredTargets.get(new ComponentName(
- lhs.activityInfo.packageName, lhs.activityInfo.name));
- final ScoredTarget rhsTarget = mScoredTargets.get(new ComponentName(
- rhs.activityInfo.packageName, rhs.activityInfo.name));
- final float diff = rhsTarget.score - lhsTarget.score;
+ final boolean lPinned = lhsp.isPinned();
+ final boolean rPinned = rhsp.isPinned();
- if (diff != 0) {
- return diff > 0 ? 1 : -1;
+ if (lPinned && !rPinned) {
+ return -1;
+ } else if (!lPinned && rPinned) {
+ return 1;
+ }
+
+ // Pinned items stay stable within a normal lexical sort and ignore scoring.
+ if (!lPinned && !rPinned) {
+ if (mStats != null) {
+ final ScoredTarget lhsTarget = mScoredTargets.get(new ComponentName(
+ lhs.activityInfo.packageName, lhs.activityInfo.name));
+ final ScoredTarget rhsTarget = mScoredTargets.get(new ComponentName(
+ rhs.activityInfo.packageName, rhs.activityInfo.name));
+ final float diff = rhsTarget.score - lhsTarget.score;
+
+ if (diff != 0) {
+ return diff > 0 ? 1 : -1;
+ }
}
}
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 57220b1..c71c131 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -41,6 +41,7 @@
import android.os.SystemProperties;
import android.os.WorkSource;
import android.telephony.DataConnectionRealTimeInfo;
+import android.telephony.ModemActivityInfo;
import android.telephony.ServiceState;
import android.telephony.SignalStrength;
import android.telephony.TelephonyManager;
@@ -106,7 +107,7 @@
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
- private static final int VERSION = 139 + (USE_OLD_HISTORY ? 1000 : 0);
+ private static final int VERSION = 140 + (USE_OLD_HISTORY ? 1000 : 0);
// Maximum number of items we will record in the history.
private static final int MAX_HISTORY_ITEMS = 2000;
@@ -119,6 +120,12 @@
// in to one common name.
private static final int MAX_WAKELOCKS_PER_UID = 100;
+ // Number of transmit power states the Wifi controller can be in.
+ private static final int NUM_WIFI_TX_LEVELS = 1;
+
+ // Number of transmit power states the Bluetooth controller can be in.
+ private static final int NUM_BT_TX_LEVELS = 1;
+
private final JournaledFile mFile;
public final AtomicFile mCheckinFile;
public final AtomicFile mDailyFile;
@@ -379,11 +386,38 @@
final LongSamplingCounter[] mNetworkPacketActivityCounters =
new LongSamplingCounter[NUM_NETWORK_ACTIVITY_TYPES];
- final LongSamplingCounter[] mBluetoothActivityCounters =
- new LongSamplingCounter[NUM_CONTROLLER_ACTIVITY_TYPES];
+ /**
+ * The WiFi controller activity (time in tx, rx, idle, and power consumed) for the device.
+ */
+ ControllerActivityCounterImpl mWifiActivity;
- final LongSamplingCounter[] mWifiActivityCounters =
- new LongSamplingCounter[NUM_CONTROLLER_ACTIVITY_TYPES];
+ /**
+ * The Bluetooth controller activity (time in tx, rx, idle, and power consumed) for the device.
+ */
+ ControllerActivityCounterImpl mBluetoothActivity;
+
+ /**
+ * The Modem controller activity (time in tx, rx, idle, and power consumed) for the device.
+ */
+ ControllerActivityCounterImpl mModemActivity;
+
+ /**
+ * Whether the device supports WiFi controller energy reporting. This is set to true on
+ * the first WiFi energy report. See {@link #mWifiActivity}.
+ */
+ boolean mHasWifiReporting = false;
+
+ /**
+ * Whether the device supports Bluetooth controller energy reporting. This is set to true on
+ * the first Bluetooth energy report. See {@link #mBluetoothActivity}.
+ */
+ boolean mHasBluetoothReporting = false;
+
+ /**
+ * Whether the device supports Modem controller energy reporting. This is set to true on
+ * the first Modem energy report. See {@link #mModemActivity}.
+ */
+ boolean mHasModemReporting = false;
boolean mWifiOn;
StopwatchTimer mWifiOnTimer;
@@ -479,8 +513,6 @@
private final NetworkStats.Entry mTmpNetworkStatsEntry = new NetworkStats.Entry();
private PowerProfile mPowerProfile;
- private boolean mHasWifiEnergyReporting = false;
- private boolean mHasBluetoothEnergyReporting = false;
/*
* Holds a SamplingTimer associated with each kernel wakelock name being tracked.
@@ -1770,6 +1802,131 @@
public abstract T instantiateObject();
}
+ public static class ControllerActivityCounterImpl extends ControllerActivityCounter
+ implements Parcelable {
+ private final LongSamplingCounter mIdleTimeMillis;
+ private final LongSamplingCounter mRxTimeMillis;
+ private final LongSamplingCounter[] mTxTimeMillis;
+ private final LongSamplingCounter mPowerDrainMaMs;
+
+ public ControllerActivityCounterImpl(TimeBase timeBase, int numTxStates) {
+ mIdleTimeMillis = new LongSamplingCounter(timeBase);
+ mRxTimeMillis = new LongSamplingCounter(timeBase);
+ mTxTimeMillis = new LongSamplingCounter[numTxStates];
+ for (int i = 0; i < numTxStates; i++) {
+ mTxTimeMillis[i] = new LongSamplingCounter(timeBase);
+ }
+ mPowerDrainMaMs = new LongSamplingCounter(timeBase);
+ }
+
+ public ControllerActivityCounterImpl(TimeBase timeBase, int numTxStates, Parcel in) {
+ mIdleTimeMillis = new LongSamplingCounter(timeBase, in);
+ mRxTimeMillis = new LongSamplingCounter(timeBase, in);
+ final int recordedTxStates = in.readInt();
+ if (recordedTxStates != numTxStates) {
+ throw new ParcelFormatException("inconsistent tx state lengths");
+ }
+
+ mTxTimeMillis = new LongSamplingCounter[numTxStates];
+ for (int i = 0; i < numTxStates; i++) {
+ mTxTimeMillis[i] = new LongSamplingCounter(timeBase, in);
+ }
+ mPowerDrainMaMs = new LongSamplingCounter(timeBase, in);
+ }
+
+ public void readSummaryFromParcel(Parcel in) {
+ mIdleTimeMillis.readSummaryFromParcelLocked(in);
+ mRxTimeMillis.readSummaryFromParcelLocked(in);
+ final int recordedTxStates = in.readInt();
+ if (recordedTxStates != mTxTimeMillis.length) {
+ throw new ParcelFormatException("inconsistent tx state lengths");
+ }
+ for (LongSamplingCounter counter : mTxTimeMillis) {
+ counter.readSummaryFromParcelLocked(in);
+ }
+ mPowerDrainMaMs.readSummaryFromParcelLocked(in);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ public void writeSummaryToParcel(Parcel dest) {
+ mIdleTimeMillis.writeSummaryFromParcelLocked(dest);
+ mRxTimeMillis.writeSummaryFromParcelLocked(dest);
+ dest.writeInt(mTxTimeMillis.length);
+ for (LongSamplingCounter counter : mTxTimeMillis) {
+ counter.writeSummaryFromParcelLocked(dest);
+ }
+ mPowerDrainMaMs.writeSummaryFromParcelLocked(dest);
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ mIdleTimeMillis.writeToParcel(dest);
+ mRxTimeMillis.writeToParcel(dest);
+ dest.writeInt(mTxTimeMillis.length);
+ for (LongSamplingCounter counter : mTxTimeMillis) {
+ counter.writeToParcel(dest);
+ }
+ mPowerDrainMaMs.writeToParcel(dest);
+ }
+
+ public void reset(boolean detachIfReset) {
+ mIdleTimeMillis.reset(detachIfReset);
+ mRxTimeMillis.reset(detachIfReset);
+ for (LongSamplingCounter counter : mTxTimeMillis) {
+ counter.reset(detachIfReset);
+ }
+ mPowerDrainMaMs.reset(detachIfReset);
+ }
+
+ public void detach() {
+ mIdleTimeMillis.detach();
+ mRxTimeMillis.detach();
+ for (LongSamplingCounter counter : mTxTimeMillis) {
+ counter.detach();
+ }
+ mPowerDrainMaMs.detach();
+ }
+
+ /**
+ * @return a LongSamplingCounter, measuring time spent in the idle state in
+ * milliseconds.
+ */
+ @Override
+ public LongSamplingCounter getIdleTimeCounter() {
+ return mRxTimeMillis;
+ }
+
+ /**
+ * @return a LongSamplingCounter, measuring time spent in the receive state in
+ * milliseconds.
+ */
+ @Override
+ public LongSamplingCounter getRxTimeCounter() {
+ return mRxTimeMillis;
+ }
+
+ /**
+ * @return a LongSamplingCounter[], measuring time spent in various transmit states in
+ * milliseconds.
+ */
+ @Override
+ public LongSamplingCounter[] getTxTimeCounters() {
+ return mTxTimeMillis;
+ }
+
+ /**
+ * @return a LongSamplingCounter, measuring power use in milli-ampere milliseconds (mAmS).
+ */
+ @Override
+ public LongSamplingCounter getPowerCounter() {
+ return mPowerDrainMaMs;
+ }
+ }
+
/*
* Get the wakeup reason counter, and create a new one if one
* doesn't already exist.
@@ -3198,7 +3355,7 @@
mMobileRadioActivePerAppTimer.startRunningLocked(elapsedRealtime);
} else {
mMobileRadioActiveTimer.stopRunningLocked(realElapsedRealtimeMs);
- updateMobileRadioStateLocked(realElapsedRealtimeMs);
+ updateMobileRadioStateLocked(realElapsedRealtimeMs, null);
mMobileRadioActivePerAppTimer.stopRunningLocked(realElapsedRealtimeMs);
}
}
@@ -4144,8 +4301,7 @@
// During device boot, qtaguid isn't enabled until after the inital
// loading of battery stats. Now that they're enabled, take our initial
// snapshot for future delta calculation.
- final long elapsedRealtimeMs = SystemClock.elapsedRealtime();
- updateMobileRadioStateLocked(elapsedRealtimeMs);
+ updateMobileRadioStateLocked(SystemClock.elapsedRealtime(), null);
updateWifiStateLocked(null);
}
@@ -4328,26 +4484,34 @@
return mWifiSignalStrengthsTimer[strengthBin].getCountLocked(which);
}
- @Override public boolean hasBluetoothActivityReporting() {
- return mHasBluetoothEnergyReporting;
+ @Override
+ public ControllerActivityCounter getBluetoothControllerActivity() {
+ return mBluetoothActivity;
}
- @Override public long getBluetoothControllerActivity(int type, int which) {
- if (type >= 0 && type < mBluetoothActivityCounters.length) {
- return mBluetoothActivityCounters[type].getCountLocked(which);
- }
- return 0;
+ @Override
+ public ControllerActivityCounter getWifiControllerActivity() {
+ return mWifiActivity;
}
- @Override public boolean hasWifiActivityReporting() {
- return mHasWifiEnergyReporting;
+ @Override
+ public ControllerActivityCounter getModemControllerActivity() {
+ return mModemActivity;
}
- @Override public long getWifiControllerActivity(int type, int which) {
- if (type >= 0 && type < mWifiActivityCounters.length) {
- return mWifiActivityCounters[type].getCountLocked(which);
- }
- return 0;
+ @Override
+ public boolean hasBluetoothActivityReporting() {
+ return mHasBluetoothReporting;
+ }
+
+ @Override
+ public boolean hasWifiActivityReporting() {
+ return mHasWifiReporting;
+ }
+
+ @Override
+ public boolean hasModemActivityReporting() {
+ return mHasModemReporting;
}
@Override
@@ -4457,15 +4621,21 @@
/**
* The amount of time this uid has kept the WiFi controller in idle, tx, and rx mode.
+ * Can be null if the UID has had no such activity.
*/
- LongSamplingCounter[] mWifiControllerTime =
- new LongSamplingCounter[NUM_CONTROLLER_ACTIVITY_TYPES];
+ private ControllerActivityCounterImpl mWifiControllerActivity;
/**
* The amount of time this uid has kept the Bluetooth controller in idle, tx, and rx mode.
+ * Can be null if the UID has had no such activity.
*/
- LongSamplingCounter[] mBluetoothControllerTime =
- new LongSamplingCounter[NUM_CONTROLLER_ACTIVITY_TYPES];
+ private ControllerActivityCounterImpl mBluetoothControllerActivity;
+
+ /**
+ * The amount of time this uid has kept the Modem controller in idle, tx, and rx mode.
+ * Can be null if the UID has had no such activity.
+ */
+ private ControllerActivityCounterImpl mModemControllerActivity;
/**
* The CPU times we had at the last history details update.
@@ -4684,18 +4854,43 @@
}
}
- public void noteWifiControllerActivityLocked(int type, long timeMs) {
- if (mWifiControllerTime[type] == null) {
- mWifiControllerTime[type] = new LongSamplingCounter(mOnBatteryTimeBase);
- }
- mWifiControllerTime[type].addCountLocked(timeMs);
+ @Override
+ public ControllerActivityCounter getWifiControllerActivity() {
+ return mWifiControllerActivity;
}
- public void noteBluetoothControllerActivityLocked(int type, long timeMs) {
- if (mBluetoothControllerTime[type] == null) {
- mBluetoothControllerTime[type] = new LongSamplingCounter(mOnBatteryTimeBase);
+ @Override
+ public ControllerActivityCounter getBluetoothControllerActivity() {
+ return mBluetoothControllerActivity;
+ }
+
+ @Override
+ public ControllerActivityCounter getModemControllerActivity() {
+ return mModemControllerActivity;
+ }
+
+ public ControllerActivityCounterImpl getOrCreateWifiControllerActivityLocked() {
+ if (mWifiControllerActivity == null) {
+ mWifiControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ NUM_BT_TX_LEVELS);
}
- mBluetoothControllerTime[type].addCountLocked(timeMs);
+ return mWifiControllerActivity;
+ }
+
+ public ControllerActivityCounterImpl getOrCreateBluetoothControllerActivityLocked() {
+ if (mBluetoothControllerActivity == null) {
+ mBluetoothControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ NUM_BT_TX_LEVELS);
+ }
+ return mBluetoothControllerActivity;
+ }
+
+ public ControllerActivityCounterImpl getOrCreateModemControllerActivityLocked() {
+ if (mModemControllerActivity == null) {
+ mModemControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ ModemActivityInfo.TX_POWER_LEVELS);
+ }
+ return mModemControllerActivity;
}
public StopwatchTimer createAudioTurnedOnTimerLocked() {
@@ -5083,24 +5278,6 @@
return 0;
}
- @Override
- public long getWifiControllerActivity(int type, int which) {
- if (type >= 0 && type < NUM_CONTROLLER_ACTIVITY_TYPES &&
- mWifiControllerTime[type] != null) {
- return mWifiControllerTime[type].getCountLocked(which);
- }
- return 0;
- }
-
- @Override
- public long getBluetoothControllerActivity(int type, int which) {
- if (type >= 0 && type < NUM_CONTROLLER_ACTIVITY_TYPES &&
- mBluetoothControllerTime[type] != null) {
- return mBluetoothControllerTime[type].getCountLocked(which);
- }
- return 0;
- }
-
void initNetworkActivityLocked() {
mNetworkByteActivityCounters = new LongSamplingCounter[NUM_NETWORK_ACTIVITY_TYPES];
mNetworkPacketActivityCounters = new LongSamplingCounter[NUM_NETWORK_ACTIVITY_TYPES];
@@ -5190,14 +5367,16 @@
mMobileRadioActiveCount.reset(false);
}
- for (int i = 0; i < NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- if (mWifiControllerTime[i] != null) {
- mWifiControllerTime[i].reset(false);
- }
+ if (mWifiControllerActivity != null) {
+ mWifiControllerActivity.reset(false);
+ }
- if (mBluetoothControllerTime[i] != null) {
- mBluetoothControllerTime[i].reset(false);
- }
+ if (mBluetoothActivity != null) {
+ mBluetoothActivity.reset(false);
+ }
+
+ if (mModemActivity != null) {
+ mModemActivity.reset(false);
}
mUserCpuTime.reset(false);
@@ -5342,15 +5521,18 @@
}
}
- for (int i = 0; i < NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- if (mWifiControllerTime[i] != null) {
- mWifiControllerTime[i].detach();
- }
-
- if (mBluetoothControllerTime[i] != null) {
- mBluetoothControllerTime[i].detach();
- }
+ if (mWifiControllerActivity != null) {
+ mWifiControllerActivity.detach();
}
+
+ if (mBluetoothControllerActivity != null) {
+ mBluetoothControllerActivity.detach();
+ }
+
+ if (mModemControllerActivity != null) {
+ mModemControllerActivity.detach();
+ }
+
mPids.clear();
mUserCpuTime.detach();
@@ -5521,22 +5703,25 @@
out.writeInt(0);
}
- for (int i = 0; i < NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- if (mWifiControllerTime[i] != null) {
- out.writeInt(1);
- mWifiControllerTime[i].writeToParcel(out);
- } else {
- out.writeInt(0);
- }
+ if (mWifiControllerActivity != null) {
+ out.writeInt(1);
+ mWifiControllerActivity.writeToParcel(out, 0);
+ } else {
+ out.writeInt(0);
}
- for (int i = 0; i < NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- if (mBluetoothControllerTime[i] != null) {
- out.writeInt(1);
- mBluetoothControllerTime[i].writeToParcel(out);
- } else {
- out.writeInt(0);
- }
+ if (mBluetoothControllerActivity != null) {
+ out.writeInt(1);
+ mBluetoothControllerActivity.writeToParcel(out, 0);
+ } else {
+ out.writeInt(0);
+ }
+
+ if (mModemControllerActivity != null) {
+ out.writeInt(1);
+ mModemControllerActivity.writeToParcel(out, 0);
+ } else {
+ out.writeInt(0);
}
mUserCpuTime.writeToParcel(out);
@@ -5727,20 +5912,25 @@
mNetworkPacketActivityCounters = null;
}
- for (int i = 0; i < NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- if (in.readInt() != 0) {
- mWifiControllerTime[i] = new LongSamplingCounter(mOnBatteryTimeBase, in);
- } else {
- mWifiControllerTime[i] = null;
- }
+ if (in.readInt() != 0) {
+ mWifiControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ NUM_WIFI_TX_LEVELS, in);
+ } else {
+ mWifiControllerActivity = null;
}
- for (int i = 0; i < NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- if (in.readInt() != 0) {
- mBluetoothControllerTime[i] = new LongSamplingCounter(mOnBatteryTimeBase, in);
- } else {
- mBluetoothControllerTime[i] = null;
- }
+ if (in.readInt() != 0) {
+ mBluetoothControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ NUM_BT_TX_LEVELS, in);
+ } else {
+ mBluetoothControllerActivity = null;
+ }
+
+ if (in.readInt() != 0) {
+ mModemControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ ModemActivityInfo.TX_POWER_LEVELS, in);
+ } else {
+ mModemControllerActivity = null;
}
mUserCpuTime = new LongSamplingCounter(mOnBatteryTimeBase, in);
@@ -6916,10 +7106,12 @@
mNetworkByteActivityCounters[i] = new LongSamplingCounter(mOnBatteryTimeBase);
mNetworkPacketActivityCounters[i] = new LongSamplingCounter(mOnBatteryTimeBase);
}
- for (int i = 0; i < NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- mBluetoothActivityCounters[i] = new LongSamplingCounter(mOnBatteryTimeBase);
- mWifiActivityCounters[i] = new LongSamplingCounter(mOnBatteryTimeBase);
- }
+ mWifiActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase, NUM_WIFI_TX_LEVELS);
+ mBluetoothActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ NUM_BT_TX_LEVELS);
+ mModemActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ ModemActivityInfo.TX_POWER_LEVELS);
+
mMobileRadioActiveTimer = new StopwatchTimer(null, -400, null, mOnBatteryTimeBase);
mMobileRadioActivePerAppTimer = new StopwatchTimer(null, -401, null, mOnBatteryTimeBase);
mMobileRadioActiveAdjustedTime = new LongSamplingCounter(mOnBatteryTimeBase);
@@ -7567,10 +7759,9 @@
for (int i=0; i<NUM_WIFI_SIGNAL_STRENGTH_BINS; i++) {
mWifiSignalStrengthsTimer[i].reset(false);
}
- for (int i=0; i< NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- mBluetoothActivityCounters[i].reset(false);
- mWifiActivityCounters[i].reset(false);
- }
+ mWifiActivity.reset(false);
+ mBluetoothActivity.reset(false);
+ mModemActivity.reset(false);
mNumConnectivityChange = mLoadedNumConnectivityChange = mUnpluggedNumConnectivityChange = 0;
for (int i=0; i<mUidStats.size(); i++) {
@@ -7781,7 +7972,7 @@
}
if (info != null) {
- mHasWifiEnergyReporting = true;
+ mHasWifiReporting = true;
// Measured in mAms
final long txTimeMs = info.getControllerTxTimeMillis();
@@ -7861,8 +8052,11 @@
+ scanRxTimeSinceMarkMs + " ms Tx:"
+ scanTxTimeSinceMarkMs + " ms)");
}
- uid.noteWifiControllerActivityLocked(CONTROLLER_RX_TIME, scanRxTimeSinceMarkMs);
- uid.noteWifiControllerActivityLocked(CONTROLLER_TX_TIME, scanTxTimeSinceMarkMs);
+
+ ControllerActivityCounterImpl activityCounter =
+ uid.getOrCreateWifiControllerActivityLocked();
+ activityCounter.getRxTimeCounter().addCountLocked(scanRxTimeSinceMarkMs);
+ activityCounter.getTxTimeCounters()[0].addCountLocked(scanTxTimeSinceMarkMs);
leftOverRxTimeMs -= scanRxTimeSinceMarkMs;
leftOverTxTimeMs -= scanTxTimeSinceMarkMs;
}
@@ -7881,7 +8075,8 @@
Slog.d(TAG, " IdleTime for UID " + uid.getUid() + ": "
+ myIdleTimeMs + " ms");
}
- uid.noteWifiControllerActivityLocked(CONTROLLER_IDLE_TIME, myIdleTimeMs);
+ uid.getOrCreateWifiControllerActivityLocked().getIdleTimeCounter()
+ .addCountLocked(myIdleTimeMs);
}
}
@@ -7898,7 +8093,8 @@
if (DEBUG_ENERGY) {
Slog.d(TAG, " TxTime for UID " + uid.getUid() + ": " + myTxTimeMs + " ms");
}
- uid.noteWifiControllerActivityLocked(CONTROLLER_TX_TIME, myTxTimeMs);
+ uid.getOrCreateWifiControllerActivityLocked().getTxTimeCounters()[0]
+ .addCountLocked(myTxTimeMs);
}
// Distribute the remaining Rx power appropriately between all apps that received
@@ -7909,25 +8105,23 @@
if (DEBUG_ENERGY) {
Slog.d(TAG, " RxTime for UID " + uid.getUid() + ": " + myRxTimeMs + " ms");
}
- uid.noteWifiControllerActivityLocked(CONTROLLER_RX_TIME, myRxTimeMs);
+ uid.getOrCreateWifiControllerActivityLocked().getRxTimeCounter()
+ .addCountLocked(myRxTimeMs);
}
// Any left over power use will be picked up by the WiFi category in BatteryStatsHelper.
// Update WiFi controller stats.
- mWifiActivityCounters[CONTROLLER_RX_TIME].addCountLocked(
- info.getControllerRxTimeMillis());
- mWifiActivityCounters[CONTROLLER_TX_TIME].addCountLocked(
- info.getControllerTxTimeMillis());
- mWifiActivityCounters[CONTROLLER_IDLE_TIME].addCountLocked(
- info.getControllerIdleTimeMillis());
+ mWifiActivity.getRxTimeCounter().addCountLocked(info.getControllerRxTimeMillis());
+ mWifiActivity.getTxTimeCounters()[0].addCountLocked(info.getControllerTxTimeMillis());
+ mWifiActivity.getIdleTimeCounter().addCountLocked(info.getControllerIdleTimeMillis());
// POWER_WIFI_CONTROLLER_OPERATING_VOLTAGE is measured in mV, so convert to V.
final double opVolt = mPowerProfile.getAveragePower(
PowerProfile.POWER_WIFI_CONTROLLER_OPERATING_VOLTAGE) / 1000.0;
if (opVolt != 0) {
// We store the power drain as mAms.
- mWifiActivityCounters[CONTROLLER_POWER_DRAIN].addCountLocked(
+ mWifiActivity.getPowerCounter().addCountLocked(
(long)(info.getControllerEnergyUsed() / opVolt));
}
}
@@ -7936,9 +8130,10 @@
/**
* Distribute Cell radio energy info and network traffic to apps.
*/
- public void updateMobileRadioStateLocked(final long elapsedRealtimeMs) {
+ public void updateMobileRadioStateLocked(final long elapsedRealtimeMs,
+ final ModemActivityInfo activityInfo) {
if (DEBUG_ENERGY) {
- Slog.d(TAG, "Updating mobile radio stats");
+ Slog.d(TAG, "Updating mobile radio stats with " + activityInfo);
}
NetworkStats delta = null;
@@ -7951,60 +8146,112 @@
return;
}
- if (delta == null || !mOnBatteryInternal) {
+ if (!mOnBatteryInternal) {
return;
}
long radioTime = mMobileRadioActivePerAppTimer.getTimeSinceMarkLocked(
elapsedRealtimeMs * 1000);
mMobileRadioActivePerAppTimer.setMark(elapsedRealtimeMs);
- long totalPackets = delta.getTotalPackets();
- final int size = delta.size();
- for (int i = 0; i < size; i++) {
- final NetworkStats.Entry entry = delta.getValues(i, mTmpNetworkStatsEntry);
+ long totalRxPackets = 0;
+ long totalTxPackets = 0;
+ if (delta != null) {
+ final int size = delta.size();
+ for (int i = 0; i < size; i++) {
+ final NetworkStats.Entry entry = delta.getValues(i, mTmpNetworkStatsEntry);
+ if (entry.rxPackets == 0 || entry.txPackets == 0) {
+ continue;
+ }
- if (entry.rxBytes == 0 || entry.txBytes == 0) {
- continue;
+ if (DEBUG_ENERGY) {
+ Slog.d(TAG, "Mobile uid " + entry.uid + ": delta rx=" + entry.rxBytes
+ + " tx=" + entry.txBytes + " rxPackets=" + entry.rxPackets
+ + " txPackets=" + entry.txPackets);
+ }
+
+ totalRxPackets += entry.rxPackets;
+ totalTxPackets += entry.txPackets;
+
+ final Uid u = getUidStatsLocked(mapUid(entry.uid));
+ u.noteNetworkActivityLocked(NETWORK_MOBILE_RX_DATA, entry.rxBytes, entry.rxPackets);
+ u.noteNetworkActivityLocked(NETWORK_MOBILE_TX_DATA, entry.txBytes, entry.txPackets);
+
+ mNetworkByteActivityCounters[NETWORK_MOBILE_RX_DATA].addCountLocked(
+ entry.rxBytes);
+ mNetworkByteActivityCounters[NETWORK_MOBILE_TX_DATA].addCountLocked(
+ entry.txBytes);
+ mNetworkPacketActivityCounters[NETWORK_MOBILE_RX_DATA].addCountLocked(
+ entry.rxPackets);
+ mNetworkPacketActivityCounters[NETWORK_MOBILE_TX_DATA].addCountLocked(
+ entry.txPackets);
}
- if (DEBUG_ENERGY) {
- Slog.d(TAG, "Mobile uid " + entry.uid + ": delta rx=" + entry.rxBytes
- + " tx=" + entry.txBytes + " rxPackets=" + entry.rxPackets
- + " txPackets=" + entry.txPackets);
- }
+ // Now distribute proportional blame to the apps that did networking.
+ long totalPackets = totalRxPackets + totalTxPackets;
+ if (totalPackets > 0) {
+ for (int i = 0; i < size; i++) {
+ final NetworkStats.Entry entry = delta.getValues(i, mTmpNetworkStatsEntry);
+ if (entry.rxPackets == 0 && entry.txPackets == 0) {
+ continue;
+ }
- final Uid u = getUidStatsLocked(mapUid(entry.uid));
- u.noteNetworkActivityLocked(NETWORK_MOBILE_RX_DATA, entry.rxBytes,
- entry.rxPackets);
- u.noteNetworkActivityLocked(NETWORK_MOBILE_TX_DATA, entry.txBytes,
- entry.txPackets);
+ final Uid u = getUidStatsLocked(mapUid(entry.uid));
+
+ // Distribute total radio active time in to this app.
+ final long appPackets = entry.rxPackets + entry.txPackets;
+ final long appRadioTime = (radioTime * appPackets) / totalPackets;
+ u.noteMobileRadioActiveTimeLocked(appRadioTime);
+
+ // Remove this app from the totals, so that we don't lose any time
+ // due to rounding.
+ radioTime -= appRadioTime;
+ totalPackets -= appPackets;
+
+ if (activityInfo != null) {
+ ControllerActivityCounterImpl activityCounter =
+ u.getOrCreateModemControllerActivityLocked();
+ if (entry.rxPackets != 0) {
+ final long rxMs = (entry.rxPackets * activityInfo.getRxTimeMillis())
+ / totalRxPackets;
+ activityCounter.getRxTimeCounter().addCountLocked(rxMs);
+ }
+
+ if (entry.txPackets != 0) {
+ for (int lvl = 0; lvl < ModemActivityInfo.TX_POWER_LEVELS; lvl++) {
+ long txMs = entry.txPackets * activityInfo.getTxTimeMillis()[lvl];
+ txMs /= totalTxPackets;
+ activityCounter.getTxTimeCounters()[lvl].addCountLocked(txMs);
+ }
+ }
+ }
+ }
+ }
if (radioTime > 0) {
- // Distribute total radio active time in to this app.
- long appPackets = entry.rxPackets + entry.txPackets;
- long appRadioTime = (radioTime*appPackets)/totalPackets;
- u.noteMobileRadioActiveTimeLocked(appRadioTime);
- // Remove this app from the totals, so that we don't lose any time
- // due to rounding.
- radioTime -= appRadioTime;
- totalPackets -= appPackets;
+ // Whoops, there is some radio time we can't blame on an app!
+ mMobileRadioActiveUnknownTime.addCountLocked(radioTime);
+ mMobileRadioActiveUnknownCount.addCountLocked(1);
}
-
- mNetworkByteActivityCounters[NETWORK_MOBILE_RX_DATA].addCountLocked(
- entry.rxBytes);
- mNetworkByteActivityCounters[NETWORK_MOBILE_TX_DATA].addCountLocked(
- entry.txBytes);
- mNetworkPacketActivityCounters[NETWORK_MOBILE_RX_DATA].addCountLocked(
- entry.rxPackets);
- mNetworkPacketActivityCounters[NETWORK_MOBILE_TX_DATA].addCountLocked(
- entry.txPackets);
}
- if (radioTime > 0) {
- // Whoops, there is some radio time we can't blame on an app!
- mMobileRadioActiveUnknownTime.addCountLocked(radioTime);
- mMobileRadioActiveUnknownCount.addCountLocked(1);
+ if (activityInfo != null) {
+ mHasModemReporting = true;
+ mModemActivity.getIdleTimeCounter().addCountLocked(activityInfo.getIdleTimeMillis());
+ mModemActivity.getRxTimeCounter().addCountLocked(activityInfo.getRxTimeMillis());
+ for (int lvl = 0; lvl < ModemActivityInfo.TX_POWER_LEVELS; lvl++) {
+ mModemActivity.getTxTimeCounters()[lvl]
+ .addCountLocked(activityInfo.getTxTimeMillis()[lvl]);
+ }
+
+ // POWER_MODEM_CONTROLLER_OPERATING_VOLTAGE is measured in mV, so convert to V.
+ final double opVolt = mPowerProfile.getAveragePower(
+ PowerProfile.POWER_MODEM_CONTROLLER_OPERATING_VOLTAGE) / 1000.0;
+ if (opVolt != 0) {
+ // We store the power drain as mAms.
+ mModemActivity.getPowerCounter().addCountLocked(
+ (long) (activityInfo.getEnergyUsed() / opVolt));
+ }
}
}
@@ -8018,12 +8265,12 @@
}
if (info != null && mOnBatteryInternal) {
- mHasBluetoothEnergyReporting = true;
- mBluetoothActivityCounters[CONTROLLER_RX_TIME].addCountLocked(
+ mHasBluetoothReporting = true;
+ mBluetoothActivity.getRxTimeCounter().addCountLocked(
info.getControllerRxTimeMillis());
- mBluetoothActivityCounters[CONTROLLER_TX_TIME].addCountLocked(
+ mBluetoothActivity.getTxTimeCounters()[0].addCountLocked(
info.getControllerTxTimeMillis());
- mBluetoothActivityCounters[CONTROLLER_IDLE_TIME].addCountLocked(
+ mBluetoothActivity.getIdleTimeCounter().addCountLocked(
info.getControllerIdleTimeMillis());
// POWER_BLUETOOTH_CONTROLLER_OPERATING_VOLTAGE is measured in mV, so convert to V.
@@ -8031,7 +8278,7 @@
PowerProfile.POWER_BLUETOOTH_CONTROLLER_OPERATING_VOLTAGE) / 1000.0;
if (opVolt != 0) {
// We store the power drain as mAms.
- mBluetoothActivityCounters[CONTROLLER_POWER_DRAIN].addCountLocked(
+ mBluetoothActivity.getPowerCounter().addCountLocked(
(long) (info.getControllerEnergyUsed() / opVolt));
}
@@ -9337,12 +9584,12 @@
for (int i=0; i<NUM_WIFI_SIGNAL_STRENGTH_BINS; i++) {
mWifiSignalStrengthsTimer[i].readSummaryFromParcelLocked(in);
}
- for (int i = 0; i < NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- mBluetoothActivityCounters[i].readSummaryFromParcelLocked(in);
- }
- for (int i = 0; i < NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- mWifiActivityCounters[i].readSummaryFromParcelLocked(in);
- }
+ mWifiActivity.readSummaryFromParcel(in);
+ mBluetoothActivity.readSummaryFromParcel(in);
+ mModemActivity.readSummaryFromParcel(in);
+ mHasWifiReporting = in.readInt() != 0;
+ mHasBluetoothReporting = in.readInt() != 0;
+ mHasModemReporting = in.readInt() != 0;
mNumConnectivityChange = mLoadedNumConnectivityChange = in.readInt();
mFlashlightOnNesting = 0;
@@ -9671,12 +9918,13 @@
for (int i=0; i<NUM_WIFI_SIGNAL_STRENGTH_BINS; i++) {
mWifiSignalStrengthsTimer[i].writeSummaryFromParcelLocked(out, NOWREAL_SYS);
}
- for (int i=0; i< NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- mBluetoothActivityCounters[i].writeSummaryFromParcelLocked(out);
- }
- for (int i=0; i< NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- mWifiActivityCounters[i].writeSummaryFromParcelLocked(out);
- }
+ mWifiActivity.writeSummaryToParcel(out);
+ mBluetoothActivity.writeSummaryToParcel(out);
+ mModemActivity.writeSummaryToParcel(out);
+ out.writeInt(mHasWifiReporting ? 1 : 0);
+ out.writeInt(mHasBluetoothReporting ? 1 : 0);
+ out.writeInt(mHasModemReporting ? 1 : 0);
+
out.writeInt(mNumConnectivityChange);
mFlashlightOnTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);
mCameraOnTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);
@@ -10019,15 +10267,17 @@
mWifiSignalStrengthsTimer[i] = new StopwatchTimer(null, -800-i,
null, mOnBatteryTimeBase, in);
}
- for (int i = 0; i < NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- mBluetoothActivityCounters[i] = new LongSamplingCounter(mOnBatteryTimeBase, in);
- }
- for (int i = 0; i < NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- mWifiActivityCounters[i] = new LongSamplingCounter(mOnBatteryTimeBase, in);
- }
- mHasWifiEnergyReporting = in.readInt() != 0;
- mHasBluetoothEnergyReporting = in.readInt() != 0;
+ mWifiActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ NUM_WIFI_TX_LEVELS, in);
+ mBluetoothActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ NUM_BT_TX_LEVELS, in);
+ mModemActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ ModemActivityInfo.TX_POWER_LEVELS, in);
+ mHasWifiReporting = in.readInt() != 0;
+ mHasBluetoothReporting = in.readInt() != 0;
+ mHasModemReporting = in.readInt() != 0;
+
mNumConnectivityChange = in.readInt();
mLoadedNumConnectivityChange = in.readInt();
mUnpluggedNumConnectivityChange = in.readInt();
@@ -10174,14 +10424,13 @@
for (int i=0; i<NUM_WIFI_SIGNAL_STRENGTH_BINS; i++) {
mWifiSignalStrengthsTimer[i].writeToParcel(out, uSecRealtime);
}
- for (int i=0; i< NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- mBluetoothActivityCounters[i].writeToParcel(out);
- }
- for (int i=0; i< NUM_CONTROLLER_ACTIVITY_TYPES; i++) {
- mWifiActivityCounters[i].writeToParcel(out);
- }
- out.writeInt(mHasWifiEnergyReporting ? 1 : 0);
- out.writeInt(mHasBluetoothEnergyReporting ? 1 : 0);
+ mWifiActivity.writeToParcel(out, 0);
+ mBluetoothActivity.writeToParcel(out, 0);
+ mModemActivity.writeToParcel(out, 0);
+ out.writeInt(mHasWifiReporting ? 1 : 0);
+ out.writeInt(mHasBluetoothReporting ? 1 : 0);
+ out.writeInt(mHasModemReporting ? 1 : 0);
+
out.writeInt(mNumConnectivityChange);
out.writeInt(mLoadedNumConnectivityChange);
out.writeInt(mUnpluggedNumConnectivityChange);
diff --git a/core/java/com/android/internal/os/BluetoothPowerCalculator.java b/core/java/com/android/internal/os/BluetoothPowerCalculator.java
index 1f59672..531d1fa 100644
--- a/core/java/com/android/internal/os/BluetoothPowerCalculator.java
+++ b/core/java/com/android/internal/os/BluetoothPowerCalculator.java
@@ -40,15 +40,15 @@
@Override
public void calculateRemaining(BatterySipper app, BatteryStats stats, long rawRealtimeUs,
long rawUptimeUs, int statsType) {
- final long idleTimeMs = stats.getBluetoothControllerActivity(
- BatteryStats.CONTROLLER_IDLE_TIME, statsType);
- final long txTimeMs = stats.getBluetoothControllerActivity(
- BatteryStats.CONTROLLER_TX_TIME, statsType);
- final long rxTimeMs = stats.getBluetoothControllerActivity(
- BatteryStats.CONTROLLER_RX_TIME, statsType);
+ final BatteryStats.ControllerActivityCounter counter =
+ stats.getBluetoothControllerActivity();
+
+ final long idleTimeMs = counter.getIdleTimeCounter().getCountLocked(statsType);
+ final long txTimeMs = counter.getTxTimeCounters()[0].getCountLocked(statsType);
+ final long rxTimeMs = counter.getRxTimeCounter().getCountLocked(statsType);
final long totalTimeMs = idleTimeMs + txTimeMs + rxTimeMs;
- double powerMah = stats.getBluetoothControllerActivity(
- BatteryStats.CONTROLLER_POWER_DRAIN, statsType) / (double)(1000*60*60);
+ double powerMah = counter.getPowerCounter().getCountLocked(statsType)
+ / (double)(1000*60*60);
if (powerMah == 0) {
// Some devices do not report the power, so calculate it.
diff --git a/core/java/com/android/internal/os/PowerProfile.java b/core/java/com/android/internal/os/PowerProfile.java
index aaa9f73..14ebe22 100644
--- a/core/java/com/android/internal/os/PowerProfile.java
+++ b/core/java/com/android/internal/os/PowerProfile.java
@@ -93,6 +93,12 @@
public static final String POWER_BLUETOOTH_CONTROLLER_OPERATING_VOLTAGE =
"bluetooth.controller.voltage";
+ public static final String POWER_MODEM_CONTROLLER_IDLE = "modem.controller.idle";
+ public static final String POWER_MODEM_CONTROLLER_RX = "modem.controller.rx";
+ public static final String POWER_MODEM_CONTROLLER_TX = "modem.controller.tx";
+ public static final String POWER_MODEM_CONTROLLER_OPERATING_VOLTAGE =
+ "modem.controller.voltage";
+
/**
* Power consumption when GPS is on.
*/
@@ -100,17 +106,23 @@
/**
* Power consumption when Bluetooth driver is on.
+ * @deprecated
*/
+ @Deprecated
public static final String POWER_BLUETOOTH_ON = "bluetooth.on";
/**
* Power consumption when Bluetooth driver is transmitting/receiving.
+ * @deprecated
*/
+ @Deprecated
public static final String POWER_BLUETOOTH_ACTIVE = "bluetooth.active";
/**
* Power consumption when Bluetooth driver gets an AT command.
+ * @deprecated
*/
+ @Deprecated
public static final String POWER_BLUETOOTH_AT_CMD = "bluetooth.at";
diff --git a/core/java/com/android/internal/os/WifiPowerCalculator.java b/core/java/com/android/internal/os/WifiPowerCalculator.java
index 146c0f8..2a27f70 100644
--- a/core/java/com/android/internal/os/WifiPowerCalculator.java
+++ b/core/java/com/android/internal/os/WifiPowerCalculator.java
@@ -39,10 +39,14 @@
@Override
public void calculateApp(BatterySipper app, BatteryStats.Uid u, long rawRealtimeUs,
long rawUptimeUs, int statsType) {
- final long idleTime = u.getWifiControllerActivity(BatteryStats.CONTROLLER_IDLE_TIME,
- statsType);
- final long txTime = u.getWifiControllerActivity(BatteryStats.CONTROLLER_TX_TIME, statsType);
- final long rxTime = u.getWifiControllerActivity(BatteryStats.CONTROLLER_RX_TIME, statsType);
+ final BatteryStats.ControllerActivityCounter counter = u.getWifiControllerActivity();
+ if (counter == null) {
+ return;
+ }
+
+ final long idleTime = counter.getIdleTimeCounter().getCountLocked(statsType);
+ final long txTime = counter.getTxTimeCounters()[0].getCountLocked(statsType);
+ final long rxTime = counter.getRxTimeCounter().getCountLocked(statsType);
app.wifiRunningTimeMs = idleTime + rxTime + txTime;
app.wifiPowerMah =
((idleTime * mIdleCurrentMa) + (txTime * mTxCurrentMa) + (rxTime * mRxCurrentMa))
@@ -67,16 +71,15 @@
@Override
public void calculateRemaining(BatterySipper app, BatteryStats stats, long rawRealtimeUs,
long rawUptimeUs, int statsType) {
- final long idleTimeMs = stats.getWifiControllerActivity(BatteryStats.CONTROLLER_IDLE_TIME,
- statsType);
- final long rxTimeMs = stats.getWifiControllerActivity(BatteryStats.CONTROLLER_RX_TIME,
- statsType);
- final long txTimeMs = stats.getWifiControllerActivity(BatteryStats.CONTROLLER_TX_TIME,
- statsType);
+ final BatteryStats.ControllerActivityCounter counter = stats.getWifiControllerActivity();
+
+ final long idleTimeMs = counter.getIdleTimeCounter().getCountLocked(statsType);
+ final long txTimeMs = counter.getTxTimeCounters()[0].getCountLocked(statsType);
+ final long rxTimeMs = counter.getRxTimeCounter().getCountLocked(statsType);
app.wifiRunningTimeMs = idleTimeMs + rxTimeMs + txTimeMs;
- double powerDrainMah = stats.getWifiControllerActivity(BatteryStats.CONTROLLER_POWER_DRAIN,
- statsType) / (double)(1000*60*60);
+ double powerDrainMah = counter.getPowerCounter().getCountLocked(statsType)
+ / (double)(1000*60*60);
if (powerDrainMah == 0) {
// Some controllers do not report power drain, so we can calculate it here.
powerDrainMah = ((idleTimeMs * mIdleCurrentMa) + (txTimeMs * mTxCurrentMa)
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index 414eba7..806fcc3 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -534,7 +534,7 @@
if (halVersion == CAMERA_HAL_API_VERSION_NORMAL_CONNECT) {
// Default path: hal version is don't care, do normal camera connect.
camera = Camera::connect(cameraId, clientName,
- Camera::USE_CALLING_UID);
+ Camera::USE_CALLING_UID, Camera::USE_CALLING_PID);
} else {
jint status = Camera::connectLegacy(cameraId, halVersion, clientName,
Camera::USE_CALLING_UID, camera);
diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp
index 2e5cda0..a582492 100644
--- a/core/jni/android_hardware_SensorManager.cpp
+++ b/core/jni/android_hardware_SensorManager.cpp
@@ -23,6 +23,7 @@
#include <utils/Log.h>
#include <utils/Looper.h>
+#include <utils/Vector.h>
#include <gui/Sensor.h>
#include <gui/SensorManager.h>
@@ -45,6 +46,7 @@
struct SensorOffsets
{
+ jclass clazz;
jfieldID name;
jfieldID vendor;
jfieldID version;
@@ -60,8 +62,13 @@
jfieldID maxDelay;
jfieldID flags;
jmethodID setType;
+ jmethodID init;
} gSensorOffsets;
+struct ListOffsets {
+ jclass clazz;
+ jmethodID add;
+} gListOffsets;
/*
* The method below are not thread-safe and not intended to be
@@ -70,8 +77,10 @@
static void
nativeClassInit (JNIEnv *_env, jclass _this)
{
- jclass sensorClass = _env->FindClass("android/hardware/Sensor");
+ //android.hardware.Sensor
SensorOffsets& sensorOffsets = gSensorOffsets;
+ jclass sensorClass = (jclass) _env->NewGlobalRef(_env->FindClass("android/hardware/Sensor"));
+ sensorOffsets.clazz = sensorClass;
sensorOffsets.name = _env->GetFieldID(sensorClass, "mName", "Ljava/lang/String;");
sensorOffsets.vendor = _env->GetFieldID(sensorClass, "mVendor", "Ljava/lang/String;");
sensorOffsets.version = _env->GetFieldID(sensorClass, "mVersion", "I");
@@ -88,7 +97,15 @@
"Ljava/lang/String;");
sensorOffsets.maxDelay = _env->GetFieldID(sensorClass, "mMaxDelay", "I");
sensorOffsets.flags = _env->GetFieldID(sensorClass, "mFlags", "I");
+
sensorOffsets.setType = _env->GetMethodID(sensorClass, "setType", "(I)Z");
+ sensorOffsets.init = _env->GetMethodID(sensorClass, "<init>", "()V");
+
+ // java.util.List;
+ ListOffsets& listOffsets = gListOffsets;
+ jclass listClass = (jclass) _env->NewGlobalRef(_env->FindClass("java/util/List"));
+ listOffsets.clazz = listClass;
+ listOffsets.add = _env->GetMethodID(listClass, "add", "(Ljava/lang/Object;)Z");
}
/**
@@ -141,6 +158,46 @@
return (jlong) &SensorManager::getInstanceForPackage(String16(opPackageNameUtf.c_str()));
}
+static jobject
+translateNativeSensorToJavaSensor(JNIEnv *env, jobject sensor, const Sensor& nativeSensor) {
+ const SensorOffsets& sensorOffsets(gSensorOffsets);
+
+ if (sensor == NULL) {
+ // Sensor sensor = new Sensor();
+ sensor = env->NewObject(sensorOffsets.clazz, sensorOffsets.init, "");
+ }
+
+ if (sensor != NULL) {
+ jstring name = env->NewStringUTF(nativeSensor.getName().string());
+ jstring vendor = env->NewStringUTF(nativeSensor.getVendor().string());
+ jstring requiredPermission =
+ env->NewStringUTF(nativeSensor.getRequiredPermission().string());
+
+ env->SetObjectField(sensor, sensorOffsets.name, name);
+ env->SetObjectField(sensor, sensorOffsets.vendor, vendor);
+ env->SetIntField(sensor, sensorOffsets.version, nativeSensor.getVersion());
+ env->SetIntField(sensor, sensorOffsets.handle, nativeSensor.getHandle());
+ env->SetFloatField(sensor, sensorOffsets.range, nativeSensor.getMaxValue());
+ env->SetFloatField(sensor, sensorOffsets.resolution, nativeSensor.getResolution());
+ env->SetFloatField(sensor, sensorOffsets.power, nativeSensor.getPowerUsage());
+ env->SetIntField(sensor, sensorOffsets.minDelay, nativeSensor.getMinDelay());
+ env->SetIntField(sensor, sensorOffsets.fifoReservedEventCount,
+ nativeSensor.getFifoReservedEventCount());
+ env->SetIntField(sensor, sensorOffsets.fifoMaxEventCount,
+ nativeSensor.getFifoMaxEventCount());
+ env->SetObjectField(sensor, sensorOffsets.requiredPermission,
+ requiredPermission);
+ env->SetIntField(sensor, sensorOffsets.maxDelay, nativeSensor.getMaxDelay());
+ env->SetIntField(sensor, sensorOffsets.flags, nativeSensor.getFlags());
+ if (env->CallBooleanMethod(sensor, sensorOffsets.setType, nativeSensor.getType())
+ == JNI_FALSE) {
+ jstring stringType = getInternedString(env, &nativeSensor.getStringType());
+ env->SetObjectField(sensor, sensorOffsets.stringType, stringType);
+ }
+ }
+ return sensor;
+}
+
static jboolean
nativeGetSensorAtIndex(JNIEnv *env, jclass clazz, jlong sensorManager, jobject sensor, jint index)
{
@@ -180,6 +237,24 @@
return true;
}
+static void
+nativeGetDynamicSensors(JNIEnv *env, jclass clazz, jlong sensorManager, jobject sensorList) {
+
+ SensorManager* mgr = reinterpret_cast<SensorManager*>(sensorManager);
+ const ListOffsets& listOffsets(gListOffsets);
+
+ Vector<Sensor> nativeList;
+
+ mgr->getDynamicSensorList(nativeList);
+
+ ALOGI("DYNS native SensorManager.getDynamicSensorList return %d sensors", nativeList.size());
+ for (size_t i = 0; i < nativeList.size(); ++i) {
+ jobject sensor = translateNativeSensorToJavaSensor(env, NULL, nativeList[i]);
+ // add to list
+ env->CallBooleanMethod(sensorList, listOffsets.add, sensor);
+ }
+}
+
static jboolean nativeIsDataInjectionEnabled(JNIEnv *_env, jclass _this, jlong sensorManager) {
SensorManager* mgr = reinterpret_cast<SensorManager*>(sensorManager);
return mgr->isDataInjectionEnabled();
@@ -235,6 +310,11 @@
// step-counter returns a uint64, but the java API only deals with floats
float value = float(buffer[i].u64.step_counter);
env->SetFloatArrayRegion(mScratch, 0, 1, &value);
+ } else if (buffer[i].type == SENSOR_TYPE_DYNAMIC_SENSOR_META) {
+ float value[2];
+ value[0] = buffer[i].dynamic_sensor_meta.connected ? 1.f: 0.f;
+ value[1] = float(buffer[i].dynamic_sensor_meta.handle);
+ env->SetFloatArrayRegion(mScratch, 0, 2, value);
} else {
env->SetFloatArrayRegion(mScratch, 0, 16, buffer[i].data);
}
@@ -355,6 +435,10 @@
"(JLandroid/hardware/Sensor;I)Z",
(void*)nativeGetSensorAtIndex },
+ {"nativeGetDynamicSensors",
+ "(JLjava/util/List;)V",
+ (void*)nativeGetDynamicSensors },
+
{"nativeIsDataInjectionEnabled",
"(J)Z",
(void*)nativeIsDataInjectionEnabled},
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 3aa7de5..4ab81e9 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -420,6 +420,8 @@
<protected-broadcast android:name="android.permission.GET_APP_GRANTED_URI_PERMISSIONS" />
<protected-broadcast android:name="android.permission.CLEAR_APP_GRANTED_URI_PERMISSIONS" />
+ <protected-broadcast android:name="android.intent.action.DYNAMIC_SENSOR_CHANGED" />
+
<!-- ====================================================================== -->
<!-- RUNTIME PERMISSIONS -->
<!-- ====================================================================== -->
@@ -2885,19 +2887,6 @@
android:theme="@style/Theme.Material.DayNight.DarkActionBar"
android:forceDeviceEncrypted="true"
android:encryptionAware="true">
- <activity android:name="com.android.internal.app.ChooserActivity"
- android:theme="@style/Theme.DeviceDefault.Resolver"
- android:finishOnCloseSystemDialogs="true"
- android:excludeFromRecents="true"
- android:documentLaunchMode="never"
- android:relinquishTaskIdentity="true"
- android:process=":ui">
- <intent-filter>
- <action android:name="android.intent.action.CHOOSER" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE" />
- </intent-filter>
- </activity>
<activity android:name="com.android.internal.app.IntentForwarderActivity"
android:finishOnCloseSystemDialogs="true"
android:theme="@style/Theme.NoDisplay"
diff --git a/core/res/res/xml/power_profile.xml b/core/res/res/xml/power_profile.xml
index ddd0ca2..76b5fe1 100644
--- a/core/res/res/xml/power_profile.xml
+++ b/core/res/res/xml/power_profile.xml
@@ -39,15 +39,27 @@
<item name="dsp.video">0.1</item> <!-- ~50mA -->
<item name="camera.flashlight">0.1</item> <!-- Avg. power for camera flash, ~160mA -->
<item name="camera.avg">0.1</item> <!-- Avg. power use of camera in standard usecases, ~550mA -->
+ <item name="gps.on">0.1</item> <!-- ~50mA -->
+
+ <!-- Radio related values. For modems without energy reporting support in firmware, use
+ radio.active, radio.scanning, and radio.on. -->
<item name="radio.active">0.1</item> <!-- ~200mA -->
<item name="radio.scanning">0.1</item> <!-- cellular radio scanning for signal, ~10mA -->
- <item name="gps.on">0.1</item> <!-- ~50mA -->
<!-- Current consumed by the radio at different signal strengths, when paging -->
<array name="radio.on"> <!-- Strength 0 to BINS-1 -->
<value>0.2</value> <!-- ~2mA -->
<value>0.1</value> <!-- ~1mA -->
</array>
+
+ <!-- Radio related values. For modems WITH energy reporting support in firmware, use
+ modem.controller.idle, modem.controller.tx, modem.controller.rx, modem.controller.voltage.
+ -->
+ <item name="modem.controller.idle">0</item>
+ <item name="modem.controller.rx">0</item>
+ <item name="modem.controller.tx">0</item>
+ <item name="modem.controller.voltage">0</item>
+
<!-- A list of heterogeneous CPU clusters, where the value for each cluster represents the
number of CPU cores for that cluster.
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 999d47b..d412d7c 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -136,6 +136,12 @@
<assign-permission name="android.permission.UPDATE_DEVICE_STATS" uid="audioserver" />
<assign-permission name="android.permission.UPDATE_APP_OPS_STATS" uid="audioserver" />
+ <assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="cameraserver" />
+ <assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="cameraserver" />
+ <assign-permission name="android.permission.WAKE_LOCK" uid="cameraserver" />
+ <assign-permission name="android.permission.UPDATE_DEVICE_STATS" uid="cameraserver" />
+ <assign-permission name="android.permission.UPDATE_APP_OPS_STATS" uid="cameraserver" />
+
<assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="graphics" />
<!-- This is a list of all the libraries available for application
diff --git a/location/java/android/location/GnssNmeaListener.java b/location/java/android/location/GnssNmeaListener.java
new file mode 100644
index 0000000..6c9b08a
--- /dev/null
+++ b/location/java/android/location/GnssNmeaListener.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.location;
+
+/**
+* Used for receiving NMEA sentences from the GNSS.
+* NMEA 0183 is a standard for communicating with marine electronic devices
+* and is a common method for receiving data from a GNSS, typically over a serial port.
+* See <a href="http://en.wikipedia.org/wiki/NMEA_0183">NMEA 0183</a> for more details.
+* You can implement this interface and call {@link LocationManager#addNmeaListener}
+* to receive NMEA data from the GNSS engine.
+*/
+public interface GnssNmeaListener {
+ /** Called when an NMEA message is received. */
+ void onNmeaReceived(long timestamp, String nmea);
+}
\ No newline at end of file
diff --git a/location/java/android/location/GnssStatus.java b/location/java/android/location/GnssStatus.java
new file mode 100644
index 0000000..77e8a5b
--- /dev/null
+++ b/location/java/android/location/GnssStatus.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.location;
+
+/**
+ * This class represents the current state of the GNSS engine.
+ * This class is used in conjunction with the {@link GnssStatusCallback}.
+ */
+public final class GnssStatus {
+ /** Unknown constellation type. */
+ public static final int CONSTELLATION_UNKNOWN = 0;
+ /** Constellation type constant for GPS. */
+ public static final int CONSTELLATION_GPS = 1;
+ /** Constellation type constant for SBAS. */
+ public static final int CONSTELLATION_SBAS = 2;
+ /** Constellation type constant for Glonass. */
+ public static final int CONSTELLATION_GLONASS = 3;
+ /** Constellation type constant for QZSS. */
+ public static final int CONSTELLATION_QZSS = 4;
+ /** Constellation type constant for Beidou. */
+ public static final int CONSTELLATION_BEIDOU = 5;
+ /** Constellation type constant for Galileo. */
+ public static final int CONSTELLATION_GALILEO = 6;
+
+ // these must match the definitions in gps.h
+ /** @hide */
+ public static final int GNSS_SV_FLAGS_NONE = 0;
+ /** @hide */
+ public static final int GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA = (1 << 0);
+ /** @hide */
+ public static final int GNSS_SV_FLAGS_HAS_ALMANAC_DATA = (1 << 1);
+ /** @hide */
+ public static final int GNSS_SV_FLAGS_USED_IN_FIX = (1 << 2);
+
+ /** @hide */
+ public static final int PRN_SHIFT_WIDTH = 3;
+
+ /* These package private values are modified by the LocationManager class */
+ /* package */ int[] mPrnWithFlags;
+ /* package */ float[] mSnrs;
+ /* package */ float[] mElevations;
+ /* package */ float[] mAzimuths;
+ /* package */ int[] mConstellationTypes;
+ /* package */ int mSvCount;
+
+ GnssStatus(int svCount, int[] prnWithFlags, float[] snrs, float[] elevations, float[] azimuths,
+ int[] constellationTypes) {
+ mSvCount = svCount;
+ mPrnWithFlags = prnWithFlags;
+ mSnrs = snrs;
+ mElevations = elevations;
+ mAzimuths = azimuths;
+ mConstellationTypes = constellationTypes;
+ }
+
+ /**
+ * Gets the total number of satellites in satellite list.
+ */
+ public int getNumSatellites() {
+ return mSvCount;
+ }
+
+ /**
+ * Retrieves the constellation type of the satellite at the specified position.
+ * @param satIndex the index of the satellite in the list.
+ */
+ public int getConstellationType(int satIndex) {
+ return mConstellationTypes[satIndex];
+ }
+
+ /**
+ * Retrieves the pseudo-random number of the satellite at the specified position.
+ * @param satIndex the index of the satellite in the list.
+ */
+ public int getPrn(int satIndex) {
+ return mPrnWithFlags[satIndex] >> PRN_SHIFT_WIDTH;
+ }
+
+ /**
+ * Retrieves the signal-noise ration of the satellite at the specified position.
+ * @param satIndex the index of the satellite in the list.
+ */
+ public float getSnr(int satIndex) {
+ return mSnrs[satIndex];
+ }
+
+ /**
+ * Retrieves the elevation of the satellite at the specified position.
+ * @param satIndex the index of the satellite in the list.
+ */
+ public float getElevation(int satIndex) {
+ return 0f;
+ }
+
+ /**
+ * Retrieves the azimuth the satellite at the specified position.
+ * @param satIndex the index of the satellite in the list.
+ */
+ public float getAzimuth(int satIndex) {
+ return mAzimuths[satIndex];
+ }
+
+ /**
+ * Detects whether the satellite at the specified position has ephemeris data.
+ * @param satIndex the index of the satellite in the list.
+ */
+ public boolean hasEphemeris(int satIndex) {
+ return (mPrnWithFlags[satIndex] & GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA) != 0;
+ }
+
+ /**
+ * Detects whether the satellite at the specified position has almanac data.
+ * @param satIndex the index of the satellite in the list.
+ */
+ public boolean hasAlmanac(int satIndex) {
+ return (mPrnWithFlags[satIndex] & GNSS_SV_FLAGS_HAS_ALMANAC_DATA) != 0;
+ }
+
+ /**
+ * Detects whether the satellite at the specified position is used in fix.
+ * @param satIndex the index of the satellite in the list.
+ */
+ public boolean usedInFix(int satIndex) {
+ return (mPrnWithFlags[satIndex] & GNSS_SV_FLAGS_USED_IN_FIX) != 0;
+ }
+}
diff --git a/location/java/android/location/GnssStatusCallback.java b/location/java/android/location/GnssStatusCallback.java
new file mode 100644
index 0000000..b86171b
--- /dev/null
+++ b/location/java/android/location/GnssStatusCallback.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.location;
+
+/**
+ * Used for receiving notifications when GNSS events happen.
+ */
+public abstract class GnssStatusCallback {
+ /**
+ * Called when GNSS system has started.
+ */
+ public void onStarted() {}
+
+ /**
+ * Called when GNSS system has stopped.
+ */
+ public void onStopped() {}
+
+ /**
+ * Called when the GNSS system has received its first fix since starting.
+ * @param ttff the time from start to first fix.
+ */
+ public void onFirstFix(int ttff) {}
+
+ /**
+ * Called periodically to report GNSS satellite status.
+ * @param status the current status of all satellites.
+ */
+ public void onSatelliteStatusChanged(GnssStatus status) {}
+}
\ No newline at end of file
diff --git a/location/java/android/location/GpsClock.java b/location/java/android/location/GpsClock.java
index 4135a1c..719e56f 100644
--- a/location/java/android/location/GpsClock.java
+++ b/location/java/android/location/GpsClock.java
@@ -16,36 +16,41 @@
package android.location;
-import android.annotation.SystemApi;
+import android.annotation.IntDef;
import android.os.Parcel;
import android.os.Parcelable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
* A class containing a GPS clock timestamp.
* It represents a measurement of the GPS receiver's clock.
- *
- * @hide
*/
-@SystemApi
-public class GpsClock implements Parcelable {
+public final class GpsClock implements Parcelable {
// The following enumerations must be in sync with the values declared in gps.h
+ /** The type of the GPS Clock. */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({CLOCK_TYPE_UNKNOWN, CLOCK_TYPE_LOCAL_HW_TIME, CLOCK_TYPE_GPS_TIME})
+ public @interface GpsClockType {}
+
/**
* The type of the time stored is not available or it is unknown.
*/
- public static final byte TYPE_UNKNOWN = 0;
+ public static final byte CLOCK_TYPE_UNKNOWN = 0;
/**
* The source of the time value reported by this class is the 'Local Hardware Clock'.
*/
- public static final byte TYPE_LOCAL_HW_TIME = 1;
+ public static final byte CLOCK_TYPE_LOCAL_HW_TIME = 1;
/**
* The source of the time value reported by this class is the 'GPS time' derived from
* satellites (epoch = Jan 6, 1980).
*/
- public static final byte TYPE_GPS_TIME = 2;
+ public static final byte CLOCK_TYPE_GPS_TIME = 2;
private static final short HAS_NO_FLAGS = 0;
private static final short HAS_LEAP_SECOND = (1<<0);
@@ -68,6 +73,7 @@
private double mBiasUncertaintyInNs;
private double mDriftInNsPerSec;
private double mDriftUncertaintyInNsPerSec;
+ private long mTimeOfLastHwClockDiscontinuityInNs;
GpsClock() {
initialize();
@@ -87,6 +93,7 @@
mBiasUncertaintyInNs = clock.mBiasUncertaintyInNs;
mDriftInNsPerSec = clock.mDriftInNsPerSec;
mDriftUncertaintyInNsPerSec = clock.mDriftUncertaintyInNsPerSec;
+ mTimeOfLastHwClockDiscontinuityInNs = clock.mTimeOfLastHwClockDiscontinuityInNs;
}
/**
@@ -99,6 +106,7 @@
/**
* Gets the type of time reported by {@link #getTimeInNs()}.
*/
+ @GpsClockType
public byte getType() {
return mType;
}
@@ -106,7 +114,7 @@
/**
* Sets the type of time reported.
*/
- public void setType(byte value) {
+ public void setType(@GpsClockType byte value) {
mType = value;
}
@@ -116,11 +124,11 @@
*/
private String getTypeString() {
switch (mType) {
- case TYPE_UNKNOWN:
+ case CLOCK_TYPE_UNKNOWN:
return "Unknown";
- case TYPE_GPS_TIME:
+ case CLOCK_TYPE_GPS_TIME:
return "GpsTime";
- case TYPE_LOCAL_HW_TIME:
+ case CLOCK_TYPE_LOCAL_HW_TIME:
return "LocalHwClock";
default:
return "<Invalid:" + mType + ">";
@@ -163,8 +171,8 @@
/**
* Gets the GPS receiver internal clock value in nanoseconds.
- * This can be either the 'local hardware clock' value ({@link #TYPE_LOCAL_HW_TIME}), or the
- * current GPS time derived inside GPS receiver ({@link #TYPE_GPS_TIME}).
+ * This can be either the 'local hardware clock' value ({@link #CLOCK_TYPE_LOCAL_HW_TIME}), or the
+ * current GPS time derived inside GPS receiver ({@link #CLOCK_TYPE_GPS_TIME}).
* {@link #getType()} defines the time reported.
*
* For 'local hardware clock' this value is expected to be monotonically increasing during the
@@ -223,7 +231,7 @@
}
/**
- * Returns true if {@link @getFullBiasInNs()} is available, false otherwise.
+ * Returns true if {@link #getFullBiasInNs()} is available, false otherwise.
*/
public boolean hasFullBiasInNs() {
return isFlagSet(HAS_FULL_BIAS);
@@ -233,7 +241,7 @@
* Gets the difference between hardware clock ({@link #getTimeInNs()}) inside GPS receiver and
* the true GPS time since 0000Z, January 6, 1980, in nanoseconds.
*
- * This value is available if {@link #TYPE_LOCAL_HW_TIME} is set, and GPS receiver has solved
+ * This value is available if {@link #CLOCK_TYPE_LOCAL_HW_TIME} is set, and GPS receiver has solved
* the clock for GPS time.
* {@link #getBiasUncertaintyInNs()} should be used for quality check.
*
@@ -387,6 +395,20 @@
}
/**
+ * Gets time of last hardware clock discontinuity.
+ */
+ public long getTimeOfLastHwClockDiscontinuityInNs() {
+ return mTimeOfLastHwClockDiscontinuityInNs;
+ }
+
+ /**
+ * Sets time of last hardware clock discontinuity.
+ */
+ public void setTimeOfLastHwClockDiscontinuityInNs(long timeOfLastHwClockDiscontinuityInNs) {
+ mTimeOfLastHwClockDiscontinuityInNs = timeOfLastHwClockDiscontinuityInNs;
+ }
+
+ /**
* Resets the clock's Drift Uncertainty (1-Sigma) in nanoseconds per second.
*/
public void resetDriftUncertaintyInNsPerSec() {
@@ -409,6 +431,7 @@
gpsClock.mBiasUncertaintyInNs = parcel.readDouble();
gpsClock.mDriftInNsPerSec = parcel.readDouble();
gpsClock.mDriftUncertaintyInNsPerSec = parcel.readDouble();
+ gpsClock.mTimeOfLastHwClockDiscontinuityInNs = parcel.readLong();
return gpsClock;
}
@@ -430,6 +453,7 @@
parcel.writeDouble(mBiasUncertaintyInNs);
parcel.writeDouble(mDriftInNsPerSec);
parcel.writeDouble(mDriftUncertaintyInNsPerSec);
+ parcel.writeLong(mTimeOfLastHwClockDiscontinuityInNs);
}
@Override
@@ -473,13 +497,17 @@
"DriftUncertaintyInNsPerSec",
hasDriftUncertaintyInNsPerSec() ? mDriftUncertaintyInNsPerSec : null));
+ builder.append(String.format(format, "TimeOfLastHwClockDiscontinuityInNs",
+ getType() == CLOCK_TYPE_LOCAL_HW_TIME
+ ? mTimeOfLastHwClockDiscontinuityInNs : null));
+
return builder.toString();
}
private void initialize() {
mFlags = HAS_NO_FLAGS;
resetLeapSecond();
- setType(TYPE_UNKNOWN);
+ setType(CLOCK_TYPE_UNKNOWN);
setTimeInNs(Long.MIN_VALUE);
resetTimeUncertaintyInNs();
resetFullBiasInNs();
@@ -487,6 +515,7 @@
resetBiasUncertaintyInNs();
resetDriftInNsPerSec();
resetDriftUncertaintyInNsPerSec();
+ setTimeOfLastHwClockDiscontinuityInNs(Long.MIN_VALUE);
}
private void setFlag(short flag) {
diff --git a/location/java/android/location/GpsMeasurement.java b/location/java/android/location/GpsMeasurement.java
index f13a440..366ad61 100644
--- a/location/java/android/location/GpsMeasurement.java
+++ b/location/java/android/location/GpsMeasurement.java
@@ -16,17 +16,17 @@
package android.location;
-import android.annotation.SystemApi;
+import android.annotation.IntDef;
import android.os.Parcel;
import android.os.Parcelable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
* A class representing a GPS satellite measurement, containing raw and computed information.
- *
- * @hide
*/
-@SystemApi
-public class GpsMeasurement implements Parcelable {
+public final class GpsMeasurement implements Parcelable {
private int mFlags;
private byte mPrn;
private double mTimeOffsetInNs;
@@ -59,6 +59,8 @@
private double mAzimuthInDeg;
private double mAzimuthUncertaintyInDeg;
private boolean mUsedInFix;
+ private double mPseudorangeRateCarrierInMetersPerSec;
+ private double mPseudorangeRateCarrierUncertaintyInMetersPerSec;
// The following enumerations must be in sync with the values declared in gps.h
@@ -83,6 +85,11 @@
private static final int HAS_USED_IN_FIX = (1<<17);
private static final int GPS_MEASUREMENT_HAS_UNCORRECTED_PSEUDORANGE_RATE = (1<<18);
+ /** The status of 'loss of lock'. */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({LOSS_OF_LOCK_UNKNOWN, LOSS_OF_LOCK_OK, LOSS_OF_LOCK_CYCLE_SLIP})
+ public @interface LossOfLockStatus {}
+
/**
* The indicator is not available or it is unknown.
*/
@@ -98,6 +105,12 @@
*/
public static final byte LOSS_OF_LOCK_CYCLE_SLIP = 2;
+ /** The status of multipath. */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({MULTIPATH_INDICATOR_UNKNOWN, MULTIPATH_INDICATOR_DETECTED,
+ MULTIPATH_INDICATOR_NOT_USED})
+ public @interface MultipathIndicator {}
+
/**
* The indicator is not available or it is unknown.
*/
@@ -218,6 +231,10 @@
mAzimuthInDeg = measurement.mAzimuthInDeg;
mAzimuthUncertaintyInDeg = measurement.mAzimuthUncertaintyInDeg;
mUsedInFix = measurement.mUsedInFix;
+ mPseudorangeRateCarrierInMetersPerSec =
+ measurement.mPseudorangeRateCarrierInMetersPerSec;
+ mPseudorangeRateCarrierUncertaintyInMetersPerSec =
+ measurement.mPseudorangeRateCarrierUncertaintyInMetersPerSec;
}
/**
@@ -776,6 +793,7 @@
/**
* Gets a value indicating the 'loss of lock' state of the event.
*/
+ @LossOfLockStatus
public byte getLossOfLock() {
return mLossOfLock;
}
@@ -783,7 +801,7 @@
/**
* Sets the 'loss of lock' status.
*/
- public void setLossOfLock(byte value) {
+ public void setLossOfLock(@LossOfLockStatus byte value) {
mLossOfLock = value;
}
@@ -941,6 +959,7 @@
/**
* Gets a value indicating the 'multipath' state of the event.
*/
+ @MultipathIndicator
public byte getMultipathIndicator() {
return mMultipathIndicator;
}
@@ -948,7 +967,7 @@
/**
* Sets the 'multi-path' indicator.
*/
- public void setMultipathIndicator(byte value) {
+ public void setMultipathIndicator(@MultipathIndicator byte value) {
mMultipathIndicator = value;
}
@@ -1157,6 +1176,34 @@
mUsedInFix = value;
}
+ /**
+ * Gets pseudorange rate (based on carrier phase changes) at the timestamp in m/s.
+ */
+ public double getPseudorangeRateCarrierInMetersPerSec() {
+ return mPseudorangeRateCarrierInMetersPerSec;
+ }
+
+ /**
+ * Sets pseudorange rate (based on carrier phase changes) at the timestamp in m/s.
+ */
+ public void setPseudorangeRateCarrierInMetersPerSec(double value) {
+ mPseudorangeRateCarrierInMetersPerSec = value;
+ }
+
+ /**
+ * Gets 1-Sigma uncertainty of the pseudorange rate carrier.
+ */
+ public double getPseudorangeRateCarrierUncertaintyInMetersPerSec() {
+ return mPseudorangeRateCarrierUncertaintyInMetersPerSec;
+ }
+
+ /**
+ * Sets 1-Sigma uncertainty of the pseudorange rate carrier.
+ */
+ public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double value) {
+ mPseudorangeRateCarrierUncertaintyInMetersPerSec = value;
+ }
+
public static final Creator<GpsMeasurement> CREATOR = new Creator<GpsMeasurement>() {
@Override
public GpsMeasurement createFromParcel(Parcel parcel) {
@@ -1194,6 +1241,8 @@
gpsMeasurement.mAzimuthInDeg = parcel.readDouble();
gpsMeasurement.mAzimuthUncertaintyInDeg = parcel.readDouble();
gpsMeasurement.mUsedInFix = parcel.readInt() != 0;
+ gpsMeasurement.mPseudorangeRateCarrierInMetersPerSec = parcel.readDouble();
+ gpsMeasurement.mPseudorangeRateCarrierUncertaintyInMetersPerSec = parcel.readDouble();
return gpsMeasurement;
}
@@ -1237,6 +1286,8 @@
parcel.writeDouble(mAzimuthInDeg);
parcel.writeDouble(mAzimuthUncertaintyInDeg);
parcel.writeInt(mUsedInFix ? 1 : 0);
+ parcel.writeDouble(mPseudorangeRateCarrierInMetersPerSec);
+ parcel.writeDouble(mPseudorangeRateCarrierUncertaintyInMetersPerSec);
}
@Override
@@ -1361,6 +1412,11 @@
builder.append(String.format(format, "UsedInFix", mUsedInFix));
+ builder.append(String.format(format, "PseudorangeRateCarrierInMetersPerSec",
+ mPseudorangeRateCarrierInMetersPerSec));
+ builder.append(String.format(format, "PseudorangeRateCarrierUncertaintyInMetersPerSec",
+ mPseudorangeRateCarrierUncertaintyInMetersPerSec));
+
return builder.toString();
}
@@ -1397,6 +1453,8 @@
resetAzimuthInDeg();
resetAzimuthUncertaintyInDeg();
setUsedInFix(false);
+ setPseudorangeRateCarrierInMetersPerSec(Double.MIN_VALUE);
+ setPseudorangeRateCarrierUncertaintyInMetersPerSec(Double.MIN_VALUE);
}
private void setFlag(int flag) {
diff --git a/location/java/android/location/GpsMeasurementListenerTransport.java b/location/java/android/location/GpsMeasurementCallbackTransport.java
similarity index 68%
rename from location/java/android/location/GpsMeasurementListenerTransport.java
rename to location/java/android/location/GpsMeasurementCallbackTransport.java
index 610da96..02d9026 100644
--- a/location/java/android/location/GpsMeasurementListenerTransport.java
+++ b/location/java/android/location/GpsMeasurementCallbackTransport.java
@@ -20,17 +20,17 @@
import android.os.RemoteException;
/**
- * A handler class to manage transport listeners for {@link GpsMeasurementsEvent.Listener}.
+ * A handler class to manage transport callbacks for {@link GpsMeasurementsEvent.Callback}.
*
* @hide
*/
-class GpsMeasurementListenerTransport
- extends LocalListenerHelper<GpsMeasurementsEvent.Listener> {
+class GpsMeasurementCallbackTransport
+ extends LocalListenerHelper<GpsMeasurementsEvent.Callback> {
private final ILocationManager mLocationManager;
private final IGpsMeasurementsListener mListenerTransport = new ListenerTransport();
- public GpsMeasurementListenerTransport(Context context, ILocationManager locationManager) {
+ public GpsMeasurementCallbackTransport(Context context, ILocationManager locationManager) {
super(context, "GpsMeasurementListenerTransport");
mLocationManager = locationManager;
}
@@ -50,11 +50,11 @@
private class ListenerTransport extends IGpsMeasurementsListener.Stub {
@Override
public void onGpsMeasurementsReceived(final GpsMeasurementsEvent event) {
- ListenerOperation<GpsMeasurementsEvent.Listener> operation =
- new ListenerOperation<GpsMeasurementsEvent.Listener>() {
+ ListenerOperation<GpsMeasurementsEvent.Callback> operation =
+ new ListenerOperation<GpsMeasurementsEvent.Callback>() {
@Override
- public void execute(GpsMeasurementsEvent.Listener listener) throws RemoteException {
- listener.onGpsMeasurementsReceived(event);
+ public void execute(GpsMeasurementsEvent.Callback callback) throws RemoteException {
+ callback.onGpsMeasurementsReceived(event);
}
};
foreach(operation);
@@ -62,11 +62,11 @@
@Override
public void onStatusChanged(final int status) {
- ListenerOperation<GpsMeasurementsEvent.Listener> operation =
- new ListenerOperation<GpsMeasurementsEvent.Listener>() {
+ ListenerOperation<GpsMeasurementsEvent.Callback> operation =
+ new ListenerOperation<GpsMeasurementsEvent.Callback>() {
@Override
- public void execute(GpsMeasurementsEvent.Listener listener) throws RemoteException {
- listener.onStatusChanged(status);
+ public void execute(GpsMeasurementsEvent.Callback callback) throws RemoteException {
+ callback.onStatusChanged(status);
}
};
foreach(operation);
diff --git a/location/java/android/location/GpsMeasurementsEvent.java b/location/java/android/location/GpsMeasurementsEvent.java
index 1366873..ef9edeb 100644
--- a/location/java/android/location/GpsMeasurementsEvent.java
+++ b/location/java/android/location/GpsMeasurementsEvent.java
@@ -16,11 +16,13 @@
package android.location;
+import android.annotation.IntDef;
import android.annotation.NonNull;
-import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.security.InvalidParameterException;
import java.util.Arrays;
import java.util.Collection;
@@ -28,12 +30,13 @@
/**
* A class implementing a container for data associated with a measurement event.
- * Events are delivered to registered instances of {@link Listener}.
- *
- * @hide
+ * Events are delivered to registered instances of {@link Callback}.
*/
-@SystemApi
-public class GpsMeasurementsEvent implements Parcelable {
+public final class GpsMeasurementsEvent implements Parcelable {
+ /** The status of GPS measurements event. */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_GPS_LOCATION_DISABLED})
+ public @interface GpsMeasurementsStatus {}
/**
* The system does not support tracking of GPS Measurements. This status will not change in the
@@ -58,22 +61,20 @@
/**
* Used for receiving GPS satellite measurements from the GPS engine.
* Each measurement contains raw and computed data identifying a satellite.
- * You can implement this interface and call {@link LocationManager#addGpsMeasurementListener}.
- *
- * @hide
+ * You can implement this interface and call
+ * {@link LocationManager#registerGpsMeasurementCallback}.
*/
- @SystemApi
- public interface Listener {
+ public static abstract class Callback {
/**
* Returns the latest collected GPS Measurements.
*/
- void onGpsMeasurementsReceived(GpsMeasurementsEvent eventArgs);
+ public void onGpsMeasurementsReceived(GpsMeasurementsEvent eventArgs) {}
/**
* Returns the latest status of the GPS Measurements sub-system.
*/
- void onStatusChanged(int status);
+ public void onStatusChanged(@GpsMeasurementsStatus int status) {}
}
public GpsMeasurementsEvent(GpsClock clock, GpsMeasurement[] measurements) {
diff --git a/location/java/android/location/GpsNavigationMessage.java b/location/java/android/location/GpsNavigationMessage.java
index 5c3c710..d799572 100644
--- a/location/java/android/location/GpsNavigationMessage.java
+++ b/location/java/android/location/GpsNavigationMessage.java
@@ -16,49 +16,54 @@
package android.location;
+import android.annotation.IntDef;
import android.annotation.NonNull;
-import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.security.InvalidParameterException;
/**
* A class containing a GPS satellite Navigation Message.
- *
- * @hide
*/
-@SystemApi
-public class GpsNavigationMessage implements Parcelable {
+public final class GpsNavigationMessage implements Parcelable {
private static final byte[] EMPTY_ARRAY = new byte[0];
+ /** The type of the GPS Clock. */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({MESSAGE_TYPE_UNKNOWN, MESSAGE_TYPE_L1CA, MESSAGE_TYPE_L2CNAV, MESSAGE_TYPE_L5CNAV,
+ MESSAGE_TYPE_CNAV2})
+ public @interface GpsNavigationMessageType {}
+
// The following enumerations must be in sync with the values declared in gps.h
/**
* The type of the navigation message is not available or unknown.
*/
- public static final byte TYPE_UNKNOWN = 0;
+ public static final byte MESSAGE_TYPE_UNKNOWN = 0;
/**
* The Navigation Message is of type L1 C/A.
*/
- public static final byte TYPE_L1CA = 1;
+ public static final byte MESSAGE_TYPE_L1CA = 1;
/**
* The Navigation Message is of type L1-CNAV.
*/
- public static final byte TYPE_L2CNAV = 2;
+ public static final byte MESSAGE_TYPE_L2CNAV = 2;
/**
* The Navigation Message is of type L5-CNAV.
*/
- public static final byte TYPE_L5CNAV = 3;
+ public static final byte MESSAGE_TYPE_L5CNAV = 3;
/**
* The Navigation Message is of type CNAV-2.
*/
- public static final byte TYPE_CNAV2 = 4;
+ public static final byte MESSAGE_TYPE_CNAV2 = 4;
/**
* The Navigation Message Status is 'unknown'.
@@ -111,6 +116,7 @@
/**
* Gets the type of the navigation message contained in the object.
*/
+ @GpsNavigationMessageType
public byte getType() {
return mType;
}
@@ -118,7 +124,7 @@
/**
* Sets the type of the navigation message.
*/
- public void setType(byte value) {
+ public void setType(@GpsNavigationMessageType byte value) {
mType = value;
}
@@ -128,15 +134,15 @@
*/
private String getTypeString() {
switch (mType) {
- case TYPE_UNKNOWN:
+ case MESSAGE_TYPE_UNKNOWN:
return "Unknown";
- case TYPE_L1CA:
+ case MESSAGE_TYPE_L1CA:
return "L1 C/A";
- case TYPE_L2CNAV:
+ case MESSAGE_TYPE_L2CNAV:
return "L2-CNAV";
- case TYPE_L5CNAV:
+ case MESSAGE_TYPE_L5CNAV:
return "L5-CNAV";
- case TYPE_CNAV2:
+ case MESSAGE_TYPE_CNAV2:
return "CNAV-2";
default:
return "<Invalid:" + mType + ">";
@@ -314,7 +320,7 @@
}
private void initialize() {
- mType = TYPE_UNKNOWN;
+ mType = MESSAGE_TYPE_UNKNOWN;
mPrn = 0;
mMessageId = -1;
mSubmessageId = -1;
diff --git a/location/java/android/location/GpsNavigationMessageListenerTransport.java b/location/java/android/location/GpsNavigationMessageCallbackTransport.java
similarity index 73%
rename from location/java/android/location/GpsNavigationMessageListenerTransport.java
rename to location/java/android/location/GpsNavigationMessageCallbackTransport.java
index f6ba407..155d96d 100644
--- a/location/java/android/location/GpsNavigationMessageListenerTransport.java
+++ b/location/java/android/location/GpsNavigationMessageCallbackTransport.java
@@ -20,20 +20,20 @@
import android.os.RemoteException;
/**
- * A handler class to manage transport listeners for {@link GpsNavigationMessageEvent.Listener}.
+ * A handler class to manage transport callback for {@link GpsNavigationMessageEvent.Callback}.
*
* @hide
*/
-class GpsNavigationMessageListenerTransport
- extends LocalListenerHelper<GpsNavigationMessageEvent.Listener> {
+class GpsNavigationMessageCallbackTransport
+ extends LocalListenerHelper<GpsNavigationMessageEvent.Callback> {
private final ILocationManager mLocationManager;
private final IGpsNavigationMessageListener mListenerTransport = new ListenerTransport();
- public GpsNavigationMessageListenerTransport(
+ public GpsNavigationMessageCallbackTransport(
Context context,
ILocationManager locationManager) {
- super(context, "GpsNavigationMessageListenerTransport");
+ super(context, "GpsNavigationMessageCallbackTransport");
mLocationManager = locationManager;
}
@@ -52,12 +52,12 @@
private class ListenerTransport extends IGpsNavigationMessageListener.Stub {
@Override
public void onGpsNavigationMessageReceived(final GpsNavigationMessageEvent event) {
- ListenerOperation<GpsNavigationMessageEvent.Listener> operation =
- new ListenerOperation<GpsNavigationMessageEvent.Listener>() {
+ ListenerOperation<GpsNavigationMessageEvent.Callback> operation =
+ new ListenerOperation<GpsNavigationMessageEvent.Callback>() {
@Override
- public void execute(GpsNavigationMessageEvent.Listener listener)
+ public void execute(GpsNavigationMessageEvent.Callback callback)
throws RemoteException {
- listener.onGpsNavigationMessageReceived(event);
+ callback.onGpsNavigationMessageReceived(event);
}
};
foreach(operation);
@@ -65,12 +65,12 @@
@Override
public void onStatusChanged(final int status) {
- ListenerOperation<GpsNavigationMessageEvent.Listener> operation =
- new ListenerOperation<GpsNavigationMessageEvent.Listener>() {
+ ListenerOperation<GpsNavigationMessageEvent.Callback> operation =
+ new ListenerOperation<GpsNavigationMessageEvent.Callback>() {
@Override
- public void execute(GpsNavigationMessageEvent.Listener listener)
+ public void execute(GpsNavigationMessageEvent.Callback callback)
throws RemoteException {
- listener.onStatusChanged(status);
+ callback.onStatusChanged(status);
}
};
foreach(operation);
diff --git a/location/java/android/location/GpsNavigationMessageEvent.java b/location/java/android/location/GpsNavigationMessageEvent.java
index bd6921c..b16a485 100644
--- a/location/java/android/location/GpsNavigationMessageEvent.java
+++ b/location/java/android/location/GpsNavigationMessageEvent.java
@@ -16,60 +16,60 @@
package android.location;
+import android.annotation.IntDef;
import android.annotation.NonNull;
-import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.security.InvalidParameterException;
/**
* A class implementing a container for data associated with a navigation message event.
- * Events are delivered to registered instances of {@link Listener}.
- *
- * @hide
+ * Events are delivered to registered instances of {@link Callback}.
*/
-@SystemApi
-public class GpsNavigationMessageEvent implements Parcelable {
+public final class GpsNavigationMessageEvent implements Parcelable {
+ /** The status of GPS measurements event. */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_GPS_LOCATION_DISABLED})
+ public @interface GpsNavigationMessageStatus {}
/**
* The system does not support tracking of GPS Navigation Messages. This status will not change
* in the future.
*/
- public static int STATUS_NOT_SUPPORTED = 0;
+ public static final int STATUS_NOT_SUPPORTED = 0;
/**
* GPS Navigation Messages are successfully being tracked, it will receive updates once they are
* available.
*/
- public static int STATUS_READY = 1;
+ public static final int STATUS_READY = 1;
/**
* GPS provider or Location is disabled, updated will not be received until they are enabled.
*/
- public static int STATUS_GPS_LOCATION_DISABLED = 2;
+ public static final int STATUS_GPS_LOCATION_DISABLED = 2;
private final GpsNavigationMessage mNavigationMessage;
/**
* Used for receiving GPS satellite Navigation Messages from the GPS engine.
* You can implement this interface and call
- * {@link LocationManager#addGpsNavigationMessageListener}.
- *
- * @hide
+ * {@link LocationManager#registerGpsNavigationMessageCallback}.
*/
- @SystemApi
- public interface Listener {
+ public static abstract class Callback {
/**
* Returns the latest collected GPS Navigation Message.
*/
- void onGpsNavigationMessageReceived(GpsNavigationMessageEvent event);
+ public void onGpsNavigationMessageReceived(GpsNavigationMessageEvent event) {}
/**
* Returns the latest status of the GPS Navigation Messages sub-system.
*/
- void onStatusChanged(int status);
+ public void onStatusChanged(@GpsNavigationMessageStatus int status) {}
}
public GpsNavigationMessageEvent(GpsNavigationMessage message) {
diff --git a/location/java/android/location/GpsStatus.java b/location/java/android/location/GpsStatus.java
index 323f326..8d2f781 100644
--- a/location/java/android/location/GpsStatus.java
+++ b/location/java/android/location/GpsStatus.java
@@ -34,17 +34,15 @@
private final SparseArray<GpsSatellite> mSatellites = new SparseArray<>();
private final class SatelliteIterator implements Iterator<GpsSatellite> {
-
- private final SparseArray<GpsSatellite> mSatellites;
private final int mSatellitesCount;
private int mIndex = 0;
- SatelliteIterator(SparseArray<GpsSatellite> satellites) {
- mSatellites = satellites;
- mSatellitesCount = satellites.size();
+ SatelliteIterator() {
+ mSatellitesCount = mSatellites.size();
}
+ @Override
public boolean hasNext() {
for (; mIndex < mSatellitesCount; ++mIndex) {
GpsSatellite satellite = mSatellites.valueAt(mIndex);
@@ -55,6 +53,7 @@
return false;
}
+ @Override
public GpsSatellite next() {
while (mIndex < mSatellitesCount) {
GpsSatellite satellite = mSatellites.valueAt(mIndex);
@@ -66,14 +65,16 @@
throw new NoSuchElementException();
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
}
private Iterable<GpsSatellite> mSatelliteList = new Iterable<GpsSatellite>() {
+ @Override
public Iterator<GpsSatellite> iterator() {
- return new SatelliteIterator(mSatellites);
+ return new SatelliteIterator();
}
};
@@ -137,18 +138,15 @@
// For API-compat a public ctor() is not available
GpsStatus() {}
- /**
- * Used internally within {@link LocationManager} to copy GPS status
- * data from the Location Manager Service to its cached GpsStatus instance.
- * Is synchronized to ensure that GPS status updates are atomic.
- */
- synchronized void setStatus(int svCount, int[] prns, float[] snrs,
- float[] elevations, float[] azimuths, int ephemerisMask,
- int almanacMask, int usedInFixMask) {
+ private void setStatus(int svCount, int[] prnWithFlags, float[] snrs, float[] elevations,
+ float[] azimuths, int[] constellationTypes) {
clearSatellites();
for (int i = 0; i < svCount; i++) {
- int prn = prns[i];
- int prnShift = (1 << (prn - 1));
+ // Skip all non-GPS satellites.
+ if (constellationTypes[i] != GnssStatus.CONSTELLATION_GPS) {
+ continue;
+ }
+ int prn = prnWithFlags[i] >> GnssStatus.PRN_SHIFT_WIDTH;
if (prn > 0 && prn <= NUM_SATELLITES) {
GpsSatellite satellite = mSatellites.get(prn);
if (satellite == null) {
@@ -160,53 +158,26 @@
satellite.mSnr = snrs[i];
satellite.mElevation = elevations[i];
satellite.mAzimuth = azimuths[i];
- satellite.mHasEphemeris = ((ephemerisMask & prnShift) != 0);
- satellite.mHasAlmanac = ((almanacMask & prnShift) != 0);
- satellite.mUsedInFix = ((usedInFixMask & prnShift) != 0);
+ satellite.mHasEphemeris =
+ (prnWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA) != 0;
+ satellite.mHasAlmanac =
+ (prnWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_HAS_ALMANAC_DATA) != 0;
+ satellite.mUsedInFix =
+ (prnWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) != 0;
}
}
}
/**
- * Used by {@link LocationManager#getGpsStatus} to copy LocationManager's
- * cached GpsStatus instance to the client's copy.
+ * Copies GPS satellites information from GnssStatus object.
* Since this method is only used within {@link LocationManager#getGpsStatus},
* it does not need to be synchronized.
+ * @hide
*/
- void setStatus(GpsStatus status) {
- mTimeToFirstFix = status.getTimeToFirstFix();
- clearSatellites();
-
- SparseArray<GpsSatellite> otherSatellites = status.mSatellites;
- int otherSatellitesCount = otherSatellites.size();
- int satelliteIndex = 0;
- // merge both sparse arrays, note that we have already invalidated the elements in the
- // receiver array
- for (int i = 0; i < otherSatellitesCount; ++i) {
- GpsSatellite otherSatellite = otherSatellites.valueAt(i);
- int otherSatellitePrn = otherSatellite.getPrn();
-
- int satellitesCount = mSatellites.size();
- while (satelliteIndex < satellitesCount
- && mSatellites.valueAt(satelliteIndex).getPrn() < otherSatellitePrn) {
- ++satelliteIndex;
- }
-
- if (satelliteIndex < mSatellites.size()) {
- GpsSatellite satellite = mSatellites.valueAt(satelliteIndex);
- if (satellite.getPrn() == otherSatellitePrn) {
- satellite.setStatus(otherSatellite);
- } else {
- satellite = new GpsSatellite(otherSatellitePrn);
- satellite.setStatus(otherSatellite);
- mSatellites.put(otherSatellitePrn, satellite);
- }
- } else {
- GpsSatellite satellite = new GpsSatellite(otherSatellitePrn);
- satellite.setStatus(otherSatellite);
- mSatellites.append(otherSatellitePrn, satellite);
- }
- }
+ void setStatus(GnssStatus status, int timeToFirstFix) {
+ mTimeToFirstFix = timeToFirstFix;
+ setStatus(status.mSvCount, status.mPrnWithFlags, status.mSnrs, status.mElevations,
+ status.mAzimuths, status.mConstellationTypes);
}
void setTimeToFirstFix(int ttff) {
diff --git a/location/java/android/location/IGpsStatusListener.aidl b/location/java/android/location/IGnssStatusListener.aidl
similarity index 73%
rename from location/java/android/location/IGpsStatusListener.aidl
rename to location/java/android/location/IGnssStatusListener.aidl
index 62b1c6b..d1c6a85 100644
--- a/location/java/android/location/IGpsStatusListener.aidl
+++ b/location/java/android/location/IGnssStatusListener.aidl
@@ -21,13 +21,12 @@
/**
* {@hide}
*/
-oneway interface IGpsStatusListener
+oneway interface IGnssStatusListener
{
- void onGpsStarted();
- void onGpsStopped();
+ void onGnssStarted();
+ void onGnssStopped();
void onFirstFix(int ttff);
- void onSvStatusChanged(int svCount, in int[] prns, in float[] snrs,
- in float[] elevations, in float[] azimuths,
- int ephemerisMask, int almanacMask, int usedInFixMask);
+ void onSvStatusChanged(int svCount, in int[] prnWithFlags, in float[] snrs,
+ in float[] elevations, in float[] azimuths, in int[] constellationTypes);
void onNmeaReceived(long timestamp, String nmea);
}
diff --git a/location/java/android/location/IGpsStatusProvider.aidl b/location/java/android/location/IGnssStatusProvider.aidl
similarity index 70%
rename from location/java/android/location/IGpsStatusProvider.aidl
rename to location/java/android/location/IGnssStatusProvider.aidl
index cf277c8..006b5d3 100644
--- a/location/java/android/location/IGpsStatusProvider.aidl
+++ b/location/java/android/location/IGnssStatusProvider.aidl
@@ -16,14 +16,14 @@
package android.location;
-import android.location.IGpsStatusListener;
+import android.location.IGnssStatusListener;
/**
- * An interface for location providers that provide GPS status information.
+ * An interface for location providers that provide GNSS status information.
*
* {@hide}
*/
-interface IGpsStatusProvider {
- void addGpsStatusListener(IGpsStatusListener listener);
- void removeGpsStatusListener(IGpsStatusListener listener);
+interface IGnssStatusProvider {
+ void registerGnssStatusCallback(IGnssStatusListener callback);
+ void unregisterGnssStatusCallback(IGnssStatusListener callback);
}
diff --git a/location/java/android/location/ILocationManager.aidl b/location/java/android/location/ILocationManager.aidl
index f3d755c..49d841f 100644
--- a/location/java/android/location/ILocationManager.aidl
+++ b/location/java/android/location/ILocationManager.aidl
@@ -21,9 +21,9 @@
import android.location.Criteria;
import android.location.GeocoderParams;
import android.location.Geofence;
+import android.location.IGnssStatusListener;
import android.location.IGpsMeasurementsListener;
import android.location.IGpsNavigationMessageListener;
-import android.location.IGpsStatusListener;
import android.location.ILocationListener;
import android.location.Location;
import android.location.LocationRequest;
@@ -48,8 +48,8 @@
Location getLastLocation(in LocationRequest request, String packageName);
- boolean addGpsStatusListener(IGpsStatusListener listener, String packageName);
- void removeGpsStatusListener(IGpsStatusListener listener);
+ boolean registerGnssStatusCallback(IGnssStatusListener callback, String packageName);
+ void unregisterGnssStatusCallback(IGnssStatusListener callback);
boolean geocoderIsPresent();
String getFromLocation(double latitude, double longitude, int maxResults,
@@ -69,6 +69,8 @@
in String packageName);
void removeGpsNavigationMessageListener(in IGpsNavigationMessageListener listener);
+ int getGpsYearOfHardware();
+
// --- deprecated ---
List<String> getAllProviders();
List<String> getProviders(in Criteria criteria, boolean enabledOnly);
diff --git a/location/java/android/location/LocalListenerHelper.java b/location/java/android/location/LocalListenerHelper.java
index 458c451..d7d2c513 100644
--- a/location/java/android/location/LocalListenerHelper.java
+++ b/location/java/android/location/LocalListenerHelper.java
@@ -20,12 +20,14 @@
import android.annotation.NonNull;
import android.content.Context;
+import android.os.Handler;
import android.os.RemoteException;
import android.util.Log;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
/**
* A base handler class to manage transport and local listeners.
@@ -33,7 +35,7 @@
* @hide
*/
abstract class LocalListenerHelper<TListener> {
- private final HashSet<TListener> mListeners = new HashSet<>();
+ private final HashMap<TListener, Handler> mListeners = new HashMap<>();
private final String mTag;
private final Context mContext;
@@ -44,7 +46,7 @@
mTag = name;
}
- public boolean add(@NonNull TListener listener) {
+ public boolean add(@NonNull TListener listener, Handler handler) {
Preconditions.checkNotNull(listener);
synchronized (mListeners) {
// we need to register with the service first, because we need to find out if the
@@ -62,17 +64,19 @@
return false;
}
}
- if (mListeners.contains(listener)) {
+ if (mListeners.containsKey(listener)) {
return true;
}
- return mListeners.add(listener);
+ mListeners.put(listener, handler);
+ return true;
}
}
public void remove(@NonNull TListener listener) {
Preconditions.checkNotNull(listener);
synchronized (mListeners) {
- boolean removed = mListeners.remove(listener);
+ boolean removed = mListeners.containsKey(listener);
+ mListeners.remove(listener);
boolean isLastRemoved = removed && mListeners.isEmpty();
if (isLastRemoved) {
try {
@@ -95,17 +99,30 @@
return mContext;
}
- protected void foreach(ListenerOperation<TListener> operation) {
- Collection<TListener> listeners;
- synchronized (mListeners) {
- listeners = new ArrayList<>(mListeners);
+ private void executeOperation(ListenerOperation<TListener> operation, TListener listener) {
+ try {
+ operation.execute(listener);
+ } catch (RemoteException e) {
+ Log.e(mTag, "Error in monitored listener.", e);
+ // don't return, give a fair chance to all listeners to receive the event
}
- for (TListener listener : listeners) {
- try {
- operation.execute(listener);
- } catch (RemoteException e) {
- Log.e(mTag, "Error in monitored listener.", e);
- // don't return, give a fair chance to all listeners to receive the event
+ }
+
+ protected void foreach(final ListenerOperation<TListener> operation) {
+ Collection<Map.Entry<TListener, Handler>> listeners;
+ synchronized (mListeners) {
+ listeners = new ArrayList<>(mListeners.entrySet());
+ }
+ for (final Map.Entry<TListener, Handler> listener : listeners) {
+ if (listener.getValue() == null) {
+ executeOperation(operation, listener.getKey());
+ } else {
+ listener.getValue().post(new Runnable() {
+ @Override
+ public void run() {
+ executeOperation(operation, listener.getKey());
+ }
+ });
}
}
}
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index 2c19324..5447bb1 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -20,6 +20,7 @@
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
+import android.annotation.TestApi;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
@@ -63,13 +64,18 @@
private final Context mContext;
private final ILocationManager mService;
- private final GpsMeasurementListenerTransport mGpsMeasurementListenerTransport;
- private final GpsNavigationMessageListenerTransport mGpsNavigationMessageListenerTransport;
- private final HashMap<GpsStatus.Listener, GpsStatusListenerTransport> mGpsStatusListeners =
- new HashMap<GpsStatus.Listener, GpsStatusListenerTransport>();
- private final HashMap<GpsStatus.NmeaListener, GpsStatusListenerTransport> mNmeaListeners =
- new HashMap<GpsStatus.NmeaListener, GpsStatusListenerTransport>();
- private final GpsStatus mGpsStatus = new GpsStatus();
+ private final GpsMeasurementCallbackTransport mGpsMeasurementCallbackTransport;
+ private final GpsNavigationMessageCallbackTransport mGpsNavigationMessageCallbackTransport;
+ private final HashMap<GpsStatus.Listener, GnssStatusListenerTransport> mGpsStatusListeners =
+ new HashMap<>();
+ private final HashMap<GpsStatus.NmeaListener, GnssStatusListenerTransport> mGpsNmeaListeners =
+ new HashMap<>();
+ private final HashMap<GnssStatusCallback, GnssStatusListenerTransport> mGnssStatusListeners =
+ new HashMap<>();
+ private final HashMap<GnssNmeaListener, GnssStatusListenerTransport> mGnssNmeaListeners =
+ new HashMap<>();
+ private GnssStatus mGnssStatus;
+ private int mTimeToFirstFix;
/**
* Name of the network location provider.
@@ -315,9 +321,9 @@
public LocationManager(Context context, ILocationManager service) {
mService = service;
mContext = context;
- mGpsMeasurementListenerTransport = new GpsMeasurementListenerTransport(mContext, mService);
- mGpsNavigationMessageListenerTransport =
- new GpsNavigationMessageListenerTransport(mContext, mService);
+ mGpsMeasurementCallbackTransport = new GpsMeasurementCallbackTransport(mContext, mService);
+ mGpsNavigationMessageCallbackTransport =
+ new GpsNavigationMessageCallbackTransport(mContext, mService);
}
private LocationProvider createProvider(String name, ProviderProperties properties) {
@@ -1389,11 +1395,51 @@
// --- GPS-specific support ---
- // This class is used to send GPS status events to the client's main thread.
- private class GpsStatusListenerTransport extends IGpsStatusListener.Stub {
+ // This class is used to send Gnss status events to the client's specific thread.
+ private class GnssStatusListenerTransport extends IGnssStatusListener.Stub {
- private final GpsStatus.Listener mListener;
- private final GpsStatus.NmeaListener mNmeaListener;
+ private final GpsStatus.Listener mGpsListener;
+ private final GpsStatus.NmeaListener mGpsNmeaListener;
+ private final GnssStatusCallback mGnssCallback;
+ private final GnssNmeaListener mGnssNmeaListener;
+
+ private class GnssHandler extends Handler {
+ public GnssHandler(Handler handler) {
+ super(handler != null ? handler.getLooper() : Looper.myLooper());
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case NMEA_RECEIVED:
+ synchronized (mNmeaBuffer) {
+ int length = mNmeaBuffer.size();
+ for (int i = 0; i < length; i++) {
+ Nmea nmea = mNmeaBuffer.get(i);
+ mGnssNmeaListener.onNmeaReceived(nmea.mTimestamp, nmea.mNmea);
+ }
+ mNmeaBuffer.clear();
+ }
+ break;
+ case GpsStatus.GPS_EVENT_STARTED:
+ mGnssCallback.onStarted();
+ break;
+ case GpsStatus.GPS_EVENT_STOPPED:
+ mGnssCallback.onStopped();
+ break;
+ case GpsStatus.GPS_EVENT_FIRST_FIX:
+ mGnssCallback.onFirstFix(mTimeToFirstFix);
+ break;
+ case GpsStatus.GPS_EVENT_SATELLITE_STATUS:
+ mGnssCallback.onSatelliteStatusChanged(mGnssStatus);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ private final Handler mGnssHandler;
// This must not equal any of the GpsStatus event IDs
private static final int NMEA_RECEIVED = 1000;
@@ -1407,97 +1453,141 @@
mNmea = nmea;
}
}
- private ArrayList<Nmea> mNmeaBuffer;
+ private final ArrayList<Nmea> mNmeaBuffer;
- GpsStatusListenerTransport(GpsStatus.Listener listener) {
- mListener = listener;
- mNmeaListener = null;
+ GnssStatusListenerTransport(GpsStatus.Listener listener) {
+ this(listener, null);
}
- GpsStatusListenerTransport(GpsStatus.NmeaListener listener) {
- mNmeaListener = listener;
- mListener = null;
+ GnssStatusListenerTransport(GpsStatus.Listener listener, Handler handler) {
+ mGpsListener = listener;
+ mGnssHandler = new GnssHandler(handler);
+ mGpsNmeaListener = null;
+ mNmeaBuffer = null;
+ mGnssCallback = new GnssStatusCallback() {
+ @Override
+ public void onStarted() {
+ mGpsListener.onGpsStatusChanged(GpsStatus.GPS_EVENT_STARTED);
+ }
+
+ @Override
+ public void onStopped() {
+ mGpsListener.onGpsStatusChanged(GpsStatus.GPS_EVENT_STOPPED);
+ }
+
+ @Override
+ public void onFirstFix(int ttff) {
+ mGpsListener.onGpsStatusChanged(GpsStatus.GPS_EVENT_FIRST_FIX);
+ }
+
+ @Override
+ public void onSatelliteStatusChanged(GnssStatus status) {
+ mGpsListener.onGpsStatusChanged(GpsStatus.GPS_EVENT_SATELLITE_STATUS);
+ }
+ };
+ mGnssNmeaListener = null;
+ }
+
+ GnssStatusListenerTransport(GpsStatus.NmeaListener listener) {
+ this(listener, null);
+ }
+
+ GnssStatusListenerTransport(GpsStatus.NmeaListener listener, Handler handler) {
+ mGpsListener = null;
+ mGnssHandler = new GnssHandler(handler);
+ mGpsNmeaListener = listener;
+ mNmeaBuffer = new ArrayList<Nmea>();
+ mGnssCallback = null;
+ mGnssNmeaListener = new GnssNmeaListener() {
+ @Override
+ public void onNmeaReceived(long timestamp, String nmea) {
+ mGpsNmeaListener.onNmeaReceived(timestamp, nmea);
+ }
+ };
+ }
+
+ GnssStatusListenerTransport(GnssStatusCallback callback) {
+ this(callback, null);
+ }
+
+ GnssStatusListenerTransport(GnssStatusCallback callback, Handler handler) {
+ mGnssCallback = callback;
+ mGnssHandler = new GnssHandler(handler);
+ mGnssNmeaListener = null;
+ mNmeaBuffer = null;
+ mGpsListener = null;
+ mGpsNmeaListener = null;
+ }
+
+ GnssStatusListenerTransport(GnssNmeaListener listener) {
+ this(listener, null);
+ }
+
+ GnssStatusListenerTransport(GnssNmeaListener listener, Handler handler) {
+ mGnssCallback = null;
+ mGnssHandler = new GnssHandler(handler);
+ mGnssNmeaListener = listener;
+ mGpsListener = null;
+ mGpsNmeaListener = null;
mNmeaBuffer = new ArrayList<Nmea>();
}
@Override
- public void onGpsStarted() {
- if (mListener != null) {
+ public void onGnssStarted() {
+ if (mGpsListener != null) {
Message msg = Message.obtain();
msg.what = GpsStatus.GPS_EVENT_STARTED;
- mGpsHandler.sendMessage(msg);
+ mGnssHandler.sendMessage(msg);
}
}
@Override
- public void onGpsStopped() {
- if (mListener != null) {
+ public void onGnssStopped() {
+ if (mGpsListener != null) {
Message msg = Message.obtain();
msg.what = GpsStatus.GPS_EVENT_STOPPED;
- mGpsHandler.sendMessage(msg);
+ mGnssHandler.sendMessage(msg);
}
}
@Override
public void onFirstFix(int ttff) {
- if (mListener != null) {
- mGpsStatus.setTimeToFirstFix(ttff);
+ if (mGpsListener != null) {
+ mTimeToFirstFix = ttff;
Message msg = Message.obtain();
msg.what = GpsStatus.GPS_EVENT_FIRST_FIX;
- mGpsHandler.sendMessage(msg);
+ mGnssHandler.sendMessage(msg);
}
}
@Override
- public void onSvStatusChanged(int svCount, int[] prns, float[] snrs,
- float[] elevations, float[] azimuths, int ephemerisMask,
- int almanacMask, int usedInFixMask) {
- if (mListener != null) {
- mGpsStatus.setStatus(svCount, prns, snrs, elevations, azimuths,
- ephemerisMask, almanacMask, usedInFixMask);
+ public void onSvStatusChanged(int svCount, int[] prnWithFlags,
+ float[] snrs, float[] elevations, float[] azimuths, int[] constellationTypes) {
+ if (mGnssCallback != null) {
+ mGnssStatus = new GnssStatus(svCount, prnWithFlags, snrs, elevations, azimuths,
+ constellationTypes);
Message msg = Message.obtain();
msg.what = GpsStatus.GPS_EVENT_SATELLITE_STATUS;
// remove any SV status messages already in the queue
- mGpsHandler.removeMessages(GpsStatus.GPS_EVENT_SATELLITE_STATUS);
- mGpsHandler.sendMessage(msg);
+ mGnssHandler.removeMessages(GpsStatus.GPS_EVENT_SATELLITE_STATUS);
+ mGnssHandler.sendMessage(msg);
}
}
@Override
public void onNmeaReceived(long timestamp, String nmea) {
- if (mNmeaListener != null) {
+ if (mGnssNmeaListener != null) {
synchronized (mNmeaBuffer) {
mNmeaBuffer.add(new Nmea(timestamp, nmea));
}
Message msg = Message.obtain();
msg.what = NMEA_RECEIVED;
// remove any NMEA_RECEIVED messages already in the queue
- mGpsHandler.removeMessages(NMEA_RECEIVED);
- mGpsHandler.sendMessage(msg);
+ mGnssHandler.removeMessages(NMEA_RECEIVED);
+ mGnssHandler.sendMessage(msg);
}
}
-
- private final Handler mGpsHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- if (msg.what == NMEA_RECEIVED) {
- synchronized (mNmeaBuffer) {
- int length = mNmeaBuffer.size();
- for (int i = 0; i < length; i++) {
- Nmea nmea = mNmeaBuffer.get(i);
- mNmeaListener.onNmeaReceived(nmea.mTimestamp, nmea.mNmea);
- }
- mNmeaBuffer.clear();
- }
- } else {
- // synchronize on mGpsStatus to ensure the data is copied atomically.
- synchronized(mGpsStatus) {
- mListener.onGpsStatusChanged(msg.what);
- }
- }
- }
- };
}
/**
@@ -1508,7 +1598,9 @@
* @return true if the listener was successfully added
*
* @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present
+ * @deprecated use {@link #registerGnssStatusCallback(GnssStatusCallback)} instead.
*/
+ @Deprecated
@RequiresPermission(ACCESS_FINE_LOCATION)
public boolean addGpsStatusListener(GpsStatus.Listener listener) {
boolean result;
@@ -1518,8 +1610,8 @@
return true;
}
try {
- GpsStatusListenerTransport transport = new GpsStatusListenerTransport(listener);
- result = mService.addGpsStatusListener(transport, mContext.getPackageName());
+ GnssStatusListenerTransport transport = new GnssStatusListenerTransport(listener);
+ result = mService.registerGnssStatusCallback(transport, mContext.getPackageName());
if (result) {
mGpsStatusListeners.put(listener, transport);
}
@@ -1536,17 +1628,81 @@
*
* @param listener GPS status listener object to remove
*/
+ @Deprecated
public void removeGpsStatusListener(GpsStatus.Listener listener) {
try {
- GpsStatusListenerTransport transport = mGpsStatusListeners.remove(listener);
+ GnssStatusListenerTransport transport = mGpsStatusListeners.remove(listener);
if (transport != null) {
- mService.removeGpsStatusListener(transport);
+ mService.unregisterGnssStatusCallback(transport);
}
} catch (RemoteException e) {
Log.e(TAG, "RemoteException in unregisterGpsStatusListener: ", e);
}
}
+
+ /**
+ * Registers a GNSS status listener.
+ *
+ * @param callback GNSS status listener object to register
+ *
+ * @return true if the listener was successfully added
+ *
+ * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present
+ */
+ @RequiresPermission(ACCESS_FINE_LOCATION)
+ public boolean registerGnssStatusCallback(GnssStatusCallback callback) {
+ return registerGnssStatusCallback(callback, null);
+ }
+
+ /**
+ * Registers a GNSS status listener.
+ *
+ * @param callback GNSS status listener object to register
+ * @param handler the handler that the callback runs on.
+ *
+ * @return true if the listener was successfully added
+ *
+ * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present
+ */
+ @RequiresPermission(ACCESS_FINE_LOCATION)
+ public boolean registerGnssStatusCallback(GnssStatusCallback callback, Handler handler) {
+ boolean result;
+ if (mGnssStatusListeners.get(callback) != null) {
+ // listener is already registered
+ return true;
+ }
+ try {
+ GnssStatusListenerTransport transport =
+ new GnssStatusListenerTransport(callback, handler);
+ result = mService.registerGnssStatusCallback(transport, mContext.getPackageName());
+ if (result) {
+ mGnssStatusListeners.put(callback, transport);
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "RemoteException in registerGnssStatusCallback: ", e);
+ result = false;
+ }
+
+ return result;
+ }
+
+ /**
+ * Removes a GNSS status listener.
+ *
+ * @param callback GNSS status listener object to remove
+ */
+ public void unregisterGnssStatusCallback(GnssStatusCallback callback) {
+ try {
+ GnssStatusListenerTransport transport = mGnssStatusListeners.remove(callback);
+ if (transport != null) {
+ mService.unregisterGnssStatusCallback(transport);
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "RemoteException in unregisterGnssStatusCallback: ", e);
+ }
+ }
+
/**
* Adds an NMEA listener.
*
@@ -1555,20 +1711,22 @@
* @return true if the listener was successfully added
*
* @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present
+ * @deprecated use {@link #addNmeaListener(GnssNmeaListener)} instead.
*/
+ @Deprecated
@RequiresPermission(ACCESS_FINE_LOCATION)
public boolean addNmeaListener(GpsStatus.NmeaListener listener) {
boolean result;
- if (mNmeaListeners.get(listener) != null) {
+ if (mGpsNmeaListeners.get(listener) != null) {
// listener is already registered
return true;
}
try {
- GpsStatusListenerTransport transport = new GpsStatusListenerTransport(listener);
- result = mService.addGpsStatusListener(transport, mContext.getPackageName());
+ GnssStatusListenerTransport transport = new GnssStatusListenerTransport(listener);
+ result = mService.registerGnssStatusCallback(transport, mContext.getPackageName());
if (result) {
- mNmeaListeners.put(listener, transport);
+ mGpsNmeaListeners.put(listener, transport);
}
} catch (RemoteException e) {
Log.e(TAG, "RemoteException in registerGpsStatusListener: ", e);
@@ -1583,11 +1741,12 @@
*
* @param listener a {@link GpsStatus.NmeaListener} object to remove
*/
+ @Deprecated
public void removeNmeaListener(GpsStatus.NmeaListener listener) {
try {
- GpsStatusListenerTransport transport = mNmeaListeners.remove(listener);
+ GnssStatusListenerTransport transport = mGpsNmeaListeners.remove(listener);
if (transport != null) {
- mService.removeGpsStatusListener(transport);
+ mService.unregisterGnssStatusCallback(transport);
}
} catch (RemoteException e) {
Log.e(TAG, "RemoteException in unregisterGpsStatusListener: ", e);
@@ -1595,54 +1754,133 @@
}
/**
- * Adds a GPS Measurement listener.
+ * Adds an NMEA listener.
*
- * @param listener a {@link GpsMeasurementsEvent.Listener} object to register.
- * @return {@code true} if the listener was added successfully, {@code false} otherwise.
+ * @param listener a {@link GnssNmeaListener} object to register
*
- * @hide
+ * @return true if the listener was successfully added
+ *
+ * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present
*/
- @SystemApi
- public boolean addGpsMeasurementListener(GpsMeasurementsEvent.Listener listener) {
- return mGpsMeasurementListenerTransport.add(listener);
+ @RequiresPermission(ACCESS_FINE_LOCATION)
+ public boolean addNmeaListener(GnssNmeaListener listener) {
+ return addNmeaListener(listener, null);
}
/**
- * Removes a GPS Measurement listener.
+ * Adds an NMEA listener.
*
- * @param listener a {@link GpsMeasurementsEvent.Listener} object to remove.
+ * @param listener a {@link GnssNmeaListener} object to register
+ * @param handler the handler that the listener runs on.
*
- * @hide
+ * @return true if the listener was successfully added
+ *
+ * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present
*/
- @SystemApi
- public void removeGpsMeasurementListener(GpsMeasurementsEvent.Listener listener) {
- mGpsMeasurementListenerTransport.remove(listener);
+ @RequiresPermission(ACCESS_FINE_LOCATION)
+ public boolean addNmeaListener(GnssNmeaListener listener, Handler handler) {
+ boolean result;
+
+ if (mGpsNmeaListeners.get(listener) != null) {
+ // listener is already registered
+ return true;
+ }
+ try {
+ GnssStatusListenerTransport transport =
+ new GnssStatusListenerTransport(listener, handler);
+ result = mService.registerGnssStatusCallback(transport, mContext.getPackageName());
+ if (result) {
+ mGnssNmeaListeners.put(listener, transport);
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "RemoteException in registerGnssStatusCallback: ", e);
+ result = false;
+ }
+
+ return result;
}
/**
- * Adds a GPS Navigation Message listener.
+ * Removes an NMEA listener.
*
- * @param listener a {@link GpsNavigationMessageEvent.Listener} object to register.
- * @return {@code true} if the listener was added successfully, {@code false} otherwise.
- *
- * @hide
+ * @param listener a {@link GnssNmeaListener} object to remove
*/
- @SystemApi
- public boolean addGpsNavigationMessageListener(GpsNavigationMessageEvent.Listener listener) {
- return mGpsNavigationMessageListenerTransport.add(listener);
+ public void removeNmeaListener(GnssNmeaListener listener) {
+ try {
+ GnssStatusListenerTransport transport = mGnssNmeaListeners.remove(listener);
+ if (transport != null) {
+ mService.unregisterGnssStatusCallback(transport);
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "RemoteException in unregisterGnssStatusCallback: ", e);
+ }
}
/**
- * Removes a GPS Navigation Message listener.
+ * Registers a GPS Measurement callback.
*
- * @param listener a {@link GpsNavigationMessageEvent.Listener} object to remove.
- *
- * @hide
+ * @param callback a {@link GpsMeasurementsEvent.Callback} object to register.
+ * @return {@code true} if the callback was added successfully, {@code false} otherwise.
*/
- @SystemApi
- public void removeGpsNavigationMessageListener(
- GpsNavigationMessageEvent.Listener listener) {
- mGpsNavigationMessageListenerTransport.remove(listener);
+ @RequiresPermission(ACCESS_FINE_LOCATION)
+ public boolean registerGpsMeasurementCallback(GpsMeasurementsEvent.Callback callback) {
+ return registerGpsMeasurementCallback(callback, null);
+ }
+
+ /**
+ * Registers a GPS Measurement callback.
+ *
+ * @param callback a {@link GpsMeasurementsEvent.Callback} object to register.
+ * @param handler the handler that the callback runs on.
+ * @return {@code true} if the callback was added successfully, {@code false} otherwise.
+ */
+ @RequiresPermission(ACCESS_FINE_LOCATION)
+ public boolean registerGpsMeasurementCallback(GpsMeasurementsEvent.Callback callback,
+ Handler handler) {
+ return mGpsMeasurementCallbackTransport.add(callback, handler);
+ }
+
+ /**
+ * Unregisters a GPS Measurement callback.
+ *
+ * @param callback a {@link GpsMeasurementsEvent.Callback} object to remove.
+ */
+ public void unregisterGpsMeasurementCallback(GpsMeasurementsEvent.Callback callback) {
+ mGpsMeasurementCallbackTransport.remove(callback);
+ }
+
+ /**
+ * Registers a GPS Navigation Message callback.
+ *
+ * @param callback a {@link GpsNavigationMessageEvent.Callback} object to register.
+ * @return {@code true} if the callback was added successfully, {@code false} otherwise.
+ */
+ public boolean registerGpsNavigationMessageCallback(
+ GpsNavigationMessageEvent.Callback callback) {
+ return registerGpsNavigationMessageCallback(callback, null);
+ }
+
+ /**
+ * Registers a GPS Navigation Message callback.
+ *
+ * @param callback a {@link GpsNavigationMessageEvent.Callback} object to register.
+ * @param handler the handler that the callback runs on.
+ * @return {@code true} if the callback was added successfully, {@code false} otherwise.
+ */
+ @RequiresPermission(ACCESS_FINE_LOCATION)
+ public boolean registerGpsNavigationMessageCallback(
+ GpsNavigationMessageEvent.Callback callback, Handler handler) {
+ return mGpsNavigationMessageCallbackTransport.add(callback, handler);
+ }
+
+ /**
+ * Unregisters a GPS Navigation Message callback.
+ *
+ * @param callback a {@link GpsNavigationMessageEvent.Callback} object to remove.
+ */
+ public void unregisterGpsNavigationMessageCallback(
+ GpsNavigationMessageEvent.Callback callback) {
+ mGpsNavigationMessageCallbackTransport.remove(callback);
}
/**
@@ -1656,15 +1894,36 @@
* @param status object containing GPS status details, or null.
* @return status object containing updated GPS status.
*/
+ @Deprecated
+ @RequiresPermission(ACCESS_FINE_LOCATION)
public GpsStatus getGpsStatus(GpsStatus status) {
if (status == null) {
status = new GpsStatus();
}
- status.setStatus(mGpsStatus);
+ // When mGnssStatus is null, that means that this method is called outside
+ // onGpsStatusChanged(). Return an empty status to maintain backwards compatibility.
+ if (mGnssStatus != null) {
+ status.setStatus(mGnssStatus, mTimeToFirstFix);
+ }
return status;
}
/**
+ * Returns the system information of the GPS hardware.
+ * May return 0 if GPS hardware is earlier than 2016.
+ * @hide
+ */
+ @TestApi
+ public int getGpsYearOfHardware() {
+ try {
+ return mService.getGpsYearOfHardware();
+ } catch (RemoteException e) {
+ Log.e(TAG, "RemoteException in getGpsSystemInfo: ", e);
+ return 0;
+ }
+ }
+
+ /**
* Sends additional commands to a location provider.
* Can be used to support provider specific extensions to the Location Manager API
*
diff --git a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
index 260f380..93e86af 100644
--- a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
+++ b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
@@ -62,7 +62,7 @@
public static final String NI_INTENT_KEY_TIMEOUT = "timeout";
public static final String NI_INTENT_KEY_DEFAULT_RESPONSE = "default_resp";
- // the extra command to send NI response to GpsLocationProvider
+ // the extra command to send NI response to GnssLocationProvider
public static final String NI_RESPONSE_EXTRA_CMD = "send_ni_response";
// the extra command parameter names in the Bundle
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java
index efae628..c194711 100644
--- a/media/java/android/media/AudioAttributes.java
+++ b/media/java/android/media/AudioAttributes.java
@@ -224,7 +224,6 @@
public final static int FLAG_BYPASS_MUTE = 0x1 << 7;
/**
- * @hide
* Flag requesting a low latency path.
* When using this flag, the sample rate must match the native sample rate
* of the device. Effects processing is also unavailable.
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index 4319840..3007d86 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -1100,7 +1100,6 @@
* @return error code or success, see {@link #SUCCESS}, {@link #ERROR_BAD_VALUE},
* {@link #ERROR_INVALID_OPERATION}
* @throws IllegalStateException
- * @hide
*/
public int setBufferSizeInFrames(int bufferSizeInFrames) {
if (mDataLoadMode == MODE_STATIC || mState == STATE_UNINITIALIZED) {
@@ -1130,7 +1129,6 @@
* {@link AudioManager#PROPERTY_OUTPUT_FRAMES_PER_BUFFER}.
* @return maximum size in frames of the <code>AudioTrack</code> buffer.
* @throws IllegalStateException
- * @hide
*/
public int getBufferCapacityInFrames() {
return native_get_buffer_capacity_frames();
@@ -1204,7 +1202,6 @@
* This is a continuously advancing counter. It can wrap around to zero
* if there are too many underruns. If there were, for example, 68 underruns per
* second then the counter would wrap in 2 years.
- * @hide
*/
public int getUnderrunCount() {
return native_get_underrun_count();
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java
index 930d8b8..d06da97 100644
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -563,6 +563,66 @@
/** @hide */
public static final String KEY_IS_TIMED_TEXT = "is-timed-text";
+ // The following color aspect values must be in sync with the ones in HardwareAPI.h.
+ /*
+ * An optional key describing the color primaries, white point and
+ * luminance factors for video content.
+ *
+ * The associated value is an integer: 0 if unspecified, or one of the
+ * COLOR_STANDARD_ values.
+ */
+ public static final String KEY_COLOR_STANDARD = "color-standard";
+
+ /** BT.709 color chromacity coordinates with KR = 0.2126, KB = 0.0722. */
+ public static final int COLOR_STANDARD_BT709 = 1;
+
+ /** BT.601 625 color chromacity coordinates with KR = 0.299, KB = 0.114. */
+ public static final int COLOR_STANDARD_BT601_PAL = 2;
+
+ /** BT.601 525 color chromacity coordinates with KR = 0.299, KB = 0.114. */
+ public static final int COLOR_STANDARD_BT601_NTSC = 4;
+
+ /** BT.2020 color chromacity coordinates with KR = 0.2627, KB = 0.0593. */
+ public static final int COLOR_STANDARD_BT2020 = 6;
+
+ /**
+ * An optional key describing the opto-electronic transfer function used
+ * for the video content.
+ *
+ * The associated value is an integer: 0 if unspecified, or one of the
+ * COLOR_TRANSFER_ values.
+ */
+ public static final String KEY_COLOR_TRANSFER = "color-transfer";
+
+ /** Linear transfer characteristic curve. */
+ public static final int COLOR_TRANSFER_LINEAR = 1;
+
+ /** SMPTE 170M transfer characteristic curve used by BT.601/BT.709/BT.2020. This is the curve
+ * used by most non-HDR video content. */
+ public static final int COLOR_TRANSFER_SDR_VIDEO = 3;
+
+ /** SMPTE ST 2084 transfer function. This is used by some HDR video content. */
+ public static final int COLOR_TRANSFER_ST2084 = 6;
+
+ /** ARIB STD-B67 hybrid-log-gamma transfer function. This is used by some HDR video content. */
+ public static final int COLOR_TRANSFER_HLG = 7;
+
+ /**
+ * An optional key describing the range of the component values of the video content.
+ *
+ * The associated value is an integer: 0 if unspecified, or one of the
+ * COLOR_RANGE_ values.
+ */
+ public static final String KEY_COLOR_RANGE = "color-range";
+
+ /** Limited range. Y component values range from 16 to 235 for 8-bit content.
+ * Cr, Cy values range from 16 to 240 for 8-bit content.
+ * This is the default for video content. */
+ public static final int COLOR_RANGE_LIMITED = 2;
+
+ /** Full range. Y, Cr and Cb component values range from 0 to 255 for 8-bit content. */
+ public static final int COLOR_RANGE_FULL = 1;
+
/* package private */ MediaFormat(Map<String, Object> map) {
mMap = map;
}
diff --git a/media/jni/android_media_ExifInterface.cpp b/media/jni/android_media_ExifInterface.cpp
index 42deab4..ba38569 100644
--- a/media/jni/android_media_ExifInterface.cpp
+++ b/media/jni/android_media_ExifInterface.cpp
@@ -238,7 +238,7 @@
map.add(
String8("GPSTimeStamp"),
String8::format(
- "%2u:%2u:%2u",
+ "%02u:%02u:%02u",
image_data.gps.time_stamp[0].numerator
/ image_data.gps.time_stamp[0].denominator,
image_data.gps.time_stamp[1].numerator
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index ad8b0d1..5ffc435 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -17,11 +17,13 @@
package com.android.documentsui;
import static com.android.documentsui.Shared.DEBUG;
+import static com.android.documentsui.State.MODE_GRID;
import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_DOWN;
import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE;
import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_SIDE;
import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_UP;
import static com.android.internal.util.Preconditions.checkArgument;
+import static com.android.internal.util.Preconditions.checkState;
import android.app.Activity;
import android.app.Fragment;
@@ -51,8 +53,8 @@
import android.widget.TextView;
import com.android.documentsui.RecentsProvider.ResumeColumns;
-import com.android.documentsui.SearchManager;
import com.android.documentsui.SearchManager.SearchManagerListener;
+import com.android.documentsui.State.ViewMode;
import com.android.documentsui.dirlist.DirectoryFragment;
import com.android.documentsui.model.DocumentInfo;
import com.android.documentsui.model.DocumentStack;
@@ -204,6 +206,8 @@
void onStackRestored(boolean restored, boolean external) {}
void onRootPicked(RootInfo root) {
+ mState.derivedMode = LocalPreferences.getViewMode(this, root, MODE_GRID);
+
// Clear entire backstack and start in new root
mState.onRootChanged(root);
mSearchManager.update(root);
@@ -260,11 +264,11 @@
return true;
case R.id.menu_grid:
- setUserMode(State.MODE_GRID);
+ setViewMode(State.MODE_GRID);
return true;
case R.id.menu_list:
- setUserMode(State.MODE_LIST);
+ setViewMode(State.MODE_LIST);
return true;
case R.id.menu_paste_from_clipboard:
@@ -419,24 +423,27 @@
invalidateOptionsMenu();
}
- public void onStateChanged() {
- invalidateOptionsMenu();
- }
-
/**
* Set state sort order based on explicit user action.
*/
void setUserSortOrder(int sortOrder) {
mState.userSortOrder = sortOrder;
- DirectoryFragment.get(getFragmentManager()).onUserSortOrderChanged();
+ DirectoryFragment.get(getFragmentManager()).onSortOrderChanged();
}
/**
- * Set state mode based on explicit user action.
+ * Set mode based on explicit user action.
*/
- void setUserMode(int mode) {
- mState.userMode = mode;
- DirectoryFragment.get(getFragmentManager()).onUserModeChanged();
+ void setViewMode(@ViewMode int mode) {
+ checkState(mState.stack.root != null);
+ LocalPreferences.setViewMode(this, mState.stack.root, mode);
+ mState.derivedMode = mode;
+
+ // view icon needs to be updated, but we *could* do it
+ // in onOptionsItemSelected, and not do the full invalidation
+ // But! That's a larger refactoring we'll save for another day.
+ invalidateOptionsMenu();
+ DirectoryFragment.get(getFragmentManager()).onViewModeChanged();
}
public void setPending(boolean pending) {
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java
index 6719b23..b0542b9 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java
@@ -16,11 +16,11 @@
package com.android.documentsui;
+import static com.android.documentsui.Shared.DEBUG;
import static com.android.documentsui.Shared.TAG;
import static com.android.documentsui.State.SORT_ORDER_DISPLAY_NAME;
import static com.android.documentsui.State.SORT_ORDER_LAST_MODIFIED;
import static com.android.documentsui.State.SORT_ORDER_SIZE;
-import static com.android.documentsui.model.DocumentInfo.getCursorInt;
import android.content.AsyncTaskLoader;
import android.content.ContentProviderClient;
@@ -35,7 +35,6 @@
import android.provider.DocumentsContract.Document;
import android.util.Log;
-import com.android.documentsui.RecentsProvider.StateColumns;
import com.android.documentsui.dirlist.DirectoryFragment;
import com.android.documentsui.model.DocumentInfo;
import com.android.documentsui.model.RootInfo;
@@ -52,10 +51,10 @@
private final int mType;
private final RootInfo mRoot;
- private DocumentInfo mDoc;
private final Uri mUri;
private final int mUserSortOrder;
+ private DocumentInfo mDoc;
private CancellationSignal mSignal;
private DirectoryResult mResult;
@@ -64,9 +63,9 @@
super(context, ProviderExecutor.forAuthority(root.authority));
mType = type;
mRoot = root;
- mDoc = doc;
mUri = uri;
mUserSortOrder = userSortOrder;
+ mDoc = doc;
}
@Override
@@ -83,8 +82,6 @@
final DirectoryResult result = new DirectoryResult();
- int userMode = State.MODE_UNKNOWN;
-
// Use default document when searching
if (mType == DirectoryFragment.TYPE_SEARCH) {
final Uri docUri = DocumentsContract.buildDocumentUri(
@@ -98,25 +95,6 @@
}
}
- // Pick up any custom modes requested by user
- Cursor cursor = null;
- try {
- final Uri stateUri = RecentsProvider.buildState(
- mRoot.authority, mRoot.rootId, mDoc.documentId);
- cursor = resolver.query(stateUri, null, null, null, null);
- if (cursor.moveToFirst()) {
- userMode = getCursorInt(cursor, StateColumns.MODE);
- }
- } finally {
- IoUtils.closeQuietly(cursor);
- }
-
- if (userMode != State.MODE_UNKNOWN) {
- result.mode = userMode;
- } else {
- result.mode = State.MODE_GRID;
- }
-
if (mUserSortOrder != State.SORT_ORDER_UNKNOWN) {
result.sortOrder = mUserSortOrder;
} else {
@@ -132,13 +110,13 @@
result.sortOrder = State.SORT_ORDER_UNKNOWN;
}
- Log.d(TAG, "userMode=" + userMode + ", userSortOrder=" + mUserSortOrder + " --> mode="
- + result.mode + ", sortOrder=" + result.sortOrder);
+ if (DEBUG)
+ Log.d(TAG, "userSortOrder=" + mUserSortOrder + ", sortOrder=" + result.sortOrder);
ContentProviderClient client = null;
+ Cursor cursor = null;
try {
client = DocumentsApplication.acquireUnstableProviderOrThrow(resolver, authority);
-
cursor = client.query(
mUri, null, null, null, getQuerySortOrder(result.sortOrder), mSignal);
if (cursor == null) {
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java
index e7e4f73..22e438a 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java
@@ -29,7 +29,6 @@
public Cursor cursor;
public Exception exception;
- public int mode = MODE_UNKNOWN;
public int sortOrder = SORT_ORDER_UNKNOWN;
@Override
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
index 6dcd472..c3395ae 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
@@ -346,11 +346,13 @@
} else {
DirectoryFragment.showRecentsOpen(fm, anim);
- // Start recents in grid when requesting visual things
- final boolean visualMimes = MimePredicate.mimeMatches(
+ // In recents we pick layout mode based on the mimetype,
+ // picking GRID for visual types. We intentionally don't
+ // consult a user's saved preferences here since they are
+ // set per root (not per root and per mimetype).
+ boolean visualMimes = MimePredicate.mimeMatches(
MimePredicate.VISUAL_MIMES, mState.acceptMimes);
- mState.userMode = visualMimes ? State.MODE_GRID : State.MODE_LIST;
- mState.derivedMode = mState.userMode;
+ mState.derivedMode = visualMimes ? State.MODE_GRID : State.MODE_LIST;
}
} else {
if (mSearchManager.isSearching()) {
diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
index 5abe7f6..89a6912 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
@@ -296,12 +296,6 @@
if (cwd == null) {
DirectoryFragment.showRecentsOpen(fm, anim);
-
- // Start recents in grid when requesting visual things
- final boolean visualMimes = MimePredicate.mimeMatches(
- MimePredicate.VISUAL_MIMES, mState.acceptMimes);
- mState.userMode = visualMimes ? State.MODE_GRID : State.MODE_LIST;
- mState.derivedMode = mState.userMode;
} else {
if (mState.currentSearch != null) {
// Ongoing search
diff --git a/packages/DocumentsUI/src/com/android/documentsui/LocalPreferences.java b/packages/DocumentsUI/src/com/android/documentsui/LocalPreferences.java
index 113e9d7..4bffc49 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/LocalPreferences.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/LocalPreferences.java
@@ -16,12 +16,19 @@
package com.android.documentsui;
+import static com.android.documentsui.State.MODE_UNKNOWN;
+import static com.android.internal.util.Preconditions.checkArgument;
+
import android.content.Context;
import android.preference.PreferenceManager;
+import com.android.documentsui.State.ViewMode;
+import com.android.documentsui.model.RootInfo;
+
public class LocalPreferences {
private static final String KEY_ADVANCED_DEVICES = "advancedDevices";
private static final String KEY_FILE_SIZE = "fileSize";
+ private static final String ROOT_VIEW_MODE_PREFIX = "rootViewMode-";
public static boolean getDisplayAdvancedDevices(Context context) {
boolean defaultAdvanced = context.getResources()
@@ -35,6 +42,12 @@
.getBoolean(KEY_FILE_SIZE, false);
}
+ public static @ViewMode int getViewMode(
+ Context context, RootInfo root, @ViewMode int fallback) {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .getInt(createKey(root), fallback);
+ }
+
public static void setDisplayAdvancedDevices(Context context, boolean display) {
PreferenceManager.getDefaultSharedPreferences(context).edit()
.putBoolean(KEY_ADVANCED_DEVICES, display).apply();
@@ -44,4 +57,14 @@
PreferenceManager.getDefaultSharedPreferences(context).edit()
.putBoolean(KEY_FILE_SIZE, display).apply();
}
+
+ public static void setViewMode(Context context, RootInfo root, @ViewMode int viewMode) {
+ checkArgument(viewMode != MODE_UNKNOWN);
+ PreferenceManager.getDefaultSharedPreferences(context).edit()
+ .putInt(createKey(root), viewMode).apply();
+ }
+
+ private static String createKey(RootInfo root) {
+ return ROOT_VIEW_MODE_PREFIX + root.authority + root.rootId;
+ }
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java b/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java
index 82eb732..92ffb93 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java
@@ -85,6 +85,8 @@
public static final String AUTHORITY = "authority";
public static final String ROOT_ID = Root.COLUMN_ROOT_ID;
public static final String DOCUMENT_ID = Document.COLUMN_DOCUMENT_ID;
+
+ @Deprecated // mode is tracked in local preferences now...by root only
public static final String MODE = "mode";
public static final String SORT_ORDER = "sortOrder";
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/State.java b/packages/DocumentsUI/src/com/android/documentsui/State.java
index 2f0224f..28f7432 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/State.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/State.java
@@ -16,6 +16,7 @@
package com.android.documentsui;
+import android.annotation.IntDef;
import android.content.Intent;
import android.os.Parcel;
import android.os.Parcelable;
@@ -26,18 +27,43 @@
import com.android.documentsui.model.DurableUtils;
import com.android.documentsui.model.RootInfo;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
public class State implements android.os.Parcelable {
+
+ public static final int ACTION_OPEN = 1;
+ public static final int ACTION_CREATE = 2;
+ public static final int ACTION_GET_CONTENT = 3;
+ public static final int ACTION_OPEN_TREE = 4;
+ public static final int ACTION_MANAGE = 5;
+ public static final int ACTION_BROWSE = 6;
+ public static final int ACTION_PICK_COPY_DESTINATION = 8;
+
+ @IntDef(flag = true, value = {
+ MODE_UNKNOWN,
+ MODE_LIST,
+ MODE_GRID
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface ViewMode {}
+ public static final int MODE_UNKNOWN = 0;
+ public static final int MODE_LIST = 1;
+ public static final int MODE_GRID = 2;
+
+ public static final int SORT_ORDER_UNKNOWN = 0;
+ public static final int SORT_ORDER_DISPLAY_NAME = 1;
+ public static final int SORT_ORDER_LAST_MODIFIED = 2;
+ public static final int SORT_ORDER_SIZE = 3;
+
public int action;
public String[] acceptMimes;
- /** Explicit user choice */
- public int userMode = MODE_UNKNOWN;
- /** Derived after loader */
- public int derivedMode = MODE_GRID;
+ /** Derived from local preferences */
+ public @ViewMode int derivedMode = MODE_GRID;
/** Explicit user choice */
public int userSortOrder = SORT_ORDER_UNKNOWN;
@@ -58,6 +84,8 @@
/** Current user navigation stack; empty implies recents. */
public DocumentStack stack = new DocumentStack();
+ private boolean mStackTouched;
+
/** Currently active search, overriding any stack. */
public String currentSearch;
@@ -70,25 +98,6 @@
/** Name of the package that started DocsUI */
public List<String> excludedAuthorities = new ArrayList<>();
- public static final int ACTION_OPEN = 1;
- public static final int ACTION_CREATE = 2;
- public static final int ACTION_GET_CONTENT = 3;
- public static final int ACTION_OPEN_TREE = 4;
- public static final int ACTION_MANAGE = 5;
- public static final int ACTION_BROWSE = 6;
- public static final int ACTION_PICK_COPY_DESTINATION = 8;
-
- public static final int MODE_UNKNOWN = 0;
- public static final int MODE_LIST = 1;
- public static final int MODE_GRID = 2;
-
- public static final int SORT_ORDER_UNKNOWN = 0;
- public static final int SORT_ORDER_DISPLAY_NAME = 1;
- public static final int SORT_ORDER_LAST_MODIFIED = 2;
- public static final int SORT_ORDER_SIZE = 3;
-
- private boolean mStackTouched;
-
public void initAcceptMimes(Intent intent) {
if (intent.hasExtra(Intent.EXTRA_MIME_TYPES)) {
acceptMimes = intent.getStringArrayExtra(Intent.EXTRA_MIME_TYPES);
@@ -131,7 +140,6 @@
@Override
public void writeToParcel(Parcel out, int flags) {
out.writeInt(action);
- out.writeInt(userMode);
out.writeStringArray(acceptMimes);
out.writeInt(userSortOrder);
out.writeInt(allowMultiple ? 1 : 0);
@@ -155,7 +163,6 @@
public State createFromParcel(Parcel in) {
final State state = new State();
state.action = in.readInt();
- state.userMode = in.readInt();
state.acceptMimes = in.readStringArray();
state.userSortOrder = in.readInt();
state.allowMultiple = in.readInt() != 0;
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 74fa8d0..f57aa4b 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -20,7 +20,6 @@
import static com.android.documentsui.State.ACTION_MANAGE;
import static com.android.documentsui.State.MODE_GRID;
import static com.android.documentsui.State.MODE_LIST;
-import static com.android.documentsui.State.MODE_UNKNOWN;
import static com.android.documentsui.State.SORT_ORDER_UNKNOWN;
import static com.android.documentsui.model.DocumentInfo.getCursorInt;
import static com.android.documentsui.model.DocumentInfo.getCursorString;
@@ -37,7 +36,6 @@
import android.app.LoaderManager.LoaderCallbacks;
import android.content.ClipData;
import android.content.ContentResolver;
-import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.content.Loader;
@@ -91,9 +89,6 @@
import com.android.documentsui.MimePredicate;
import com.android.documentsui.R;
import com.android.documentsui.RecentLoader;
-import com.android.documentsui.RecentsProvider;
-import com.android.documentsui.RecentsProvider.StateColumns;
-import com.android.documentsui.dirlist.RenameDocumentFragment;
import com.android.documentsui.RootsCache;
import com.android.documentsui.Shared;
import com.android.documentsui.Snackbars;
@@ -155,7 +150,6 @@
private int mType = TYPE_NORMAL;
private String mStateKey;
- private int mLastMode = MODE_UNKNOWN;
private int mLastSortOrder = SORT_ORDER_UNKNOWN;
private boolean mLastShowSize;
private DocumentsAdapter mAdapter;
@@ -240,7 +234,7 @@
final RootInfo root = getArguments().getParcelable(EXTRA_ROOT);
final DocumentInfo doc = getArguments().getParcelable(EXTRA_DOC);
- mIconHelper = new IconHelper(context, state.derivedMode);
+ mIconHelper = new IconHelper(context, MODE_GRID);
mAdapter = new SectionBreakDocumentsAdapterWrapper(
this, new ModelBackedDocumentsAdapter(this, mIconHelper));
@@ -323,12 +317,6 @@
if (!isAdded()) return;
mModel.update(result);
-
- // Push latest state up to UI
- // TODO: if mode change was racing with us, don't overwrite it
- if (result.mode != MODE_UNKNOWN) {
- state.derivedMode = result.mode;
- }
state.derivedSortOrder = result.sortOrder;
updateDisplayState();
@@ -361,8 +349,6 @@
// Kick off loader at least once
getLoaderManager().restartLoader(LOADER_ID, null, mCallbacks);
-
- updateDisplayState();
}
@Override
@@ -425,61 +411,25 @@
state.dirState.put(mStateKey, container);
}
- @Override
- public void onResume() {
- super.onResume();
- updateDisplayState();
- }
-
public void onDisplayStateChanged() {
updateDisplayState();
}
- public void onUserSortOrderChanged() {
- // Sort order change always triggers reload; we'll trigger state change
- // on the flip side.
+ public void onSortOrderChanged() {
+ // Sort order is implemented as a sorting wrapper around directory
+ // results. So when sort order changes, we force a reload of the directory.
getLoaderManager().restartLoader(LOADER_ID, null, mCallbacks);
}
- public void onUserModeChanged() {
- final ContentResolver resolver = getActivity().getContentResolver();
- final State state = getDisplayState();
-
- final RootInfo root = getArguments().getParcelable(EXTRA_ROOT);
- final DocumentInfo doc = getArguments().getParcelable(EXTRA_DOC);
-
- if (root != null && doc != null) {
- final Uri stateUri = RecentsProvider.buildState(
- root.authority, root.rootId, doc.documentId);
- final ContentValues values = new ContentValues();
- values.put(StateColumns.MODE, state.userMode);
-
- new AsyncTask<Void, Void, Void>() {
- @Override
- protected Void doInBackground(Void... params) {
- resolver.insert(stateUri, values);
- return null;
- }
- }.execute();
- }
-
- // Mode change is just visual change; no need to kick loader, and
- // deliver change event immediately.
- state.derivedMode = state.userMode;
- ((BaseActivity) getActivity()).onStateChanged();
-
+ public void onViewModeChanged() {
+ // Mode change is just visual change; no need to kick loader.
updateDisplayState();
}
private void updateDisplayState() {
- final State state = getDisplayState();
-
- if (mLastMode == state.derivedMode && mLastShowSize == state.showSize) return;
- mLastMode = state.derivedMode;
+ State state = getDisplayState();
mLastShowSize = state.showSize;
-
updateLayout(state.derivedMode);
-
mRecView.setAdapter(mAdapter);
}
@@ -506,7 +456,6 @@
}
layout = mListLayout;
break;
- case MODE_UNKNOWN:
default:
throw new IllegalArgumentException("Unsupported layout mode: " + mode);
}
@@ -516,7 +465,7 @@
// setting layout manager automatically invalidates existing ViewHolders.
mRecView.setLayoutManager(layout);
mSelectionManager.handleLayoutChanged(); // RecyclerView doesn't do this for us
- mIconHelper.setMode(mode);
+ mIconHelper.setViewMode(mode);
}
private int calculateColumnCount() {
@@ -539,7 +488,6 @@
case MODE_LIST:
return getResources().getDimensionPixelSize(
R.dimen.list_container_padding);
- case MODE_UNKNOWN:
default:
throw new IllegalArgumentException("Unsupported layout mode: " + mode);
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java
index 0314077..c97c446 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java
@@ -42,6 +42,8 @@
import com.android.documentsui.ProviderExecutor;
import com.android.documentsui.ProviderExecutor.Preemptable;
import com.android.documentsui.R;
+import com.android.documentsui.State;
+import com.android.documentsui.State.ViewMode;
import com.android.documentsui.ThumbnailCache;
/**
@@ -64,7 +66,7 @@
*/
public IconHelper(Context context, int mode) {
mContext = context;
- setMode(mode);
+ setViewMode(mode);
mCache = DocumentsApplication.getThumbnailsCache(context, mThumbSize);
}
@@ -82,7 +84,7 @@
* Sets the current display mode. This affects the thumbnail sizes that are loaded.
* @param mode See {@link State.MODE_LIST} and {@link State.MODE_GRID}.
*/
- public void setMode(int mode) {
+ public void setViewMode(@ViewMode int mode) {
// TODO: Instead of exposing setMode, make the mode final, and make separate instances for
// grid/list.
int thumbSize;
@@ -94,7 +96,6 @@
thumbSize = mContext.getResources().getDimensionPixelSize(
R.dimen.list_item_thumbnail_size);
break;
- case MODE_UNKNOWN:
default:
throw new IllegalArgumentException("Unsupported layout mode: " + mode);
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
index 68756a3..880da9c0 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
@@ -19,7 +19,6 @@
import static com.android.documentsui.Shared.DEBUG;
import static com.android.documentsui.State.MODE_GRID;
import static com.android.documentsui.State.MODE_LIST;
-import static com.android.documentsui.State.MODE_UNKNOWN;
import static com.android.documentsui.model.DocumentInfo.getCursorInt;
import static com.android.documentsui.model.DocumentInfo.getCursorString;
@@ -92,7 +91,6 @@
case MODE_LIST:
holder = new ListDocumentHolder(mEnv.getContext(), parent, mIconHelper);
break;
- case MODE_UNKNOWN:
default:
throw new IllegalStateException("Unsupported layout mode.");
}
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 21abb90..52b7b7d 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -155,6 +155,10 @@
<!-- TV picture-in-picture -->
<uses-permission android:name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE" />
+ <!-- ChooserActivity -->
+ <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
+ <uses-permission android:name="android.permission.BIND_CHOOSER_TARGET_SERVICE" />
+
<application
android:name=".SystemUIApplication"
android:persistent="true"
@@ -438,5 +442,20 @@
<action android:name="com.android.systemui.action.CLEAR_TUNER" />
</intent-filter>
</receiver>
+
+ <activity android:name=".chooser.ChooserActivity"
+ android:theme="@*android:style/Theme.DeviceDefault.Resolver"
+ android:finishOnCloseSystemDialogs="true"
+ android:excludeFromRecents="true"
+ android:documentLaunchMode="never"
+ android:relinquishTaskIdentity="true"
+ android:process=":chooser">
+ <intent-filter>
+ <action android:name="android.intent.action.CHOOSER" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.VOICE" />
+ </intent-filter>
+ </activity>
+
</application>
</manifest>
diff --git a/packages/SystemUI/res/values/arrays.xml b/packages/SystemUI/res/values/arrays.xml
index bf0cba2..32025e0 100644
--- a/packages/SystemUI/res/values/arrays.xml
+++ b/packages/SystemUI/res/values/arrays.xml
@@ -51,4 +51,16 @@
<item>0</item><item>3</item>
<item>3</item><item>3</item>
</array>
+
+ <!-- Used in ResolverTargetActionsDialogFragment -->
+ <string-array name="resolver_target_actions_pin">
+ <item>@string/pin_target</item>
+ <item>@string/app_info</item>
+ </string-array>
+
+ <string-array name="resolver_target_actions_unpin">
+ <item>@string/unpin_target</item>
+ <item>@string/app_info</item>
+ </string-array>
+
</resources>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 3391974..3efa52f 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -1340,4 +1340,9 @@
<!-- Accessibility description for data saver being off [CHAR LIMIT=NONE] -->
<string name="accessibility_data_saver_off">Data Saver is off</string>
+ <!-- Resolver target actions strings -->
+ <string name="pin_target">Pin</string>
+ <string name="unpin_target">Unpin</string>
+ <string name="app_info">App info</string>
+
</resources>
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java
similarity index 95%
rename from core/java/com/android/internal/app/ChooserActivity.java
rename to packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java
index 2733391..a8bc36e 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.internal.app;
+package com.android.systemui.chooser;
import android.animation.ObjectAnimator;
import android.annotation.NonNull;
@@ -25,6 +25,7 @@
import android.content.IntentSender;
import android.content.IntentSender.SendIntentException;
import android.content.ServiceConnection;
+import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.pm.LabeledIntent;
import android.content.pm.PackageManager;
@@ -35,6 +36,7 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.os.Bundle;
+import android.os.Environment;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
@@ -65,9 +67,12 @@
import android.widget.BaseAdapter;
import android.widget.ListView;
import com.android.internal.R;
+import com.android.internal.app.IntentForwarderActivity;
+import com.android.internal.app.ResolverActivity;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
+import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -91,6 +96,11 @@
private ChooserListAdapter mChooserListAdapter;
private ChooserRowAdapter mChooserRowAdapter;
+ private SharedPreferences mPinnedSharedPrefs;
+ private static final float PINNED_TARGET_SCORE_BOOST = 1000.f;
+ private static final String PINNED_SHARED_PREFS_NAME = "chooser_pin_settings";
+ private static final String TARGET_DETAILS_FRAGMENT_TAG = "targetDetailsFragment";
+
private final List<ChooserTargetServiceConnection> mServiceConnections = new ArrayList<>();
private static final int CHOOSER_TARGET_SERVICE_RESULT = 1;
@@ -207,12 +217,18 @@
mRefinementIntentSender = intent.getParcelableExtra(
Intent.EXTRA_CHOOSER_REFINEMENT_INTENT_SENDER);
setSafeForwardingMode(true);
+
+ mPinnedSharedPrefs = getPinnedSharedPrefs(this);
super.onCreate(savedInstanceState, target, title, defaultTitleRes, initialIntents,
null, false);
MetricsLogger.action(this, MetricsEvent.ACTION_ACTIVITY_CHOOSER_SHOWN);
}
+ static SharedPreferences getPinnedSharedPrefs(Context context) {
+ return context.getSharedPreferences(PINNED_SHARED_PREFS_NAME, MODE_PRIVATE);
+ }
+
@Override
protected void onDestroy() {
super.onDestroy();
@@ -243,7 +259,7 @@
}
@Override
- void onActivityStarted(TargetInfo cti) {
+ public void onActivityStarted(TargetInfo cti) {
if (mChosenComponentSender != null) {
final ComponentName target = cti.getResolvedComponentName();
if (target != null) {
@@ -259,7 +275,7 @@
}
@Override
- void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter,
+ public void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter,
boolean alwaysUseOption) {
final ListView listView = adapterView instanceof ListView ? (ListView) adapterView : null;
mChooserListAdapter = (ChooserListAdapter) adapter;
@@ -272,17 +288,17 @@
}
@Override
- int getLayoutResource() {
+ public int getLayoutResource() {
return R.layout.chooser_grid;
}
@Override
- boolean shouldGetActivityMetadata() {
+ public boolean shouldGetActivityMetadata() {
return true;
}
@Override
- boolean shouldAutoLaunchSingleChoice(TargetInfo target) {
+ public boolean shouldAutoLaunchSingleChoice(TargetInfo target) {
final Intent intent = target.getResolvedIntent();
final ResolveInfo resolve = target.getResolveInfo();
@@ -299,6 +315,16 @@
return false;
}
+ @Override
+ public void showTargetDetails(ResolveInfo ri) {
+ ComponentName name = ri.activityInfo.getComponentName();
+ boolean pinned = mPinnedSharedPrefs.getBoolean(name.flattenToString(), false);
+ ResolverTargetActionsDialogFragment f =
+ new ResolverTargetActionsDialogFragment(ri.loadLabel(getPackageManager()),
+ name, pinned);
+ f.show(getFragmentManager(), TARGET_DETAILS_FRAGMENT_TAG);
+ }
+
private void modifyTargetIntent(Intent in) {
final String action = in.getAction();
if (Intent.ACTION_SEND.equals(action) ||
@@ -340,7 +366,7 @@
}
@Override
- void startSelected(int which, boolean always, boolean filtered) {
+ public void startSelected(int which, boolean always, boolean filtered) {
super.startSelected(which, always, filtered);
if (mChooserListAdapter != null) {
@@ -471,7 +497,7 @@
mChooserHandler.removeMessages(CHOOSER_TARGET_SERVICE_WATCHDOG_TIMEOUT);
}
- void onSetupVoiceInteraction() {
+ public void onSetupVoiceInteraction() {
// Do nothing. We'll send the voice stuff ourselves.
}
@@ -543,7 +569,7 @@
}
@Override
- ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents,
+ public ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents,
Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid,
boolean filterLastUsed) {
final ChooserListAdapter adapter = new ChooserListAdapter(context, payloadIntents,
@@ -711,6 +737,11 @@
}
return results;
}
+
+ @Override
+ public boolean isPinned() {
+ return mSourceInfo != null ? mSourceInfo.isPinned() : false;
+ }
}
public class ChooserListAdapter extends ResolveListAdapter {
@@ -777,6 +808,20 @@
}
@Override
+ public boolean isComponentPinned(ComponentName name) {
+ return mPinnedSharedPrefs.getBoolean(name.flattenToString(), false);
+ }
+
+ @Override
+ public float getScore(DisplayResolveInfo target) {
+ float score = super.getScore(target);
+ if (target.isPinned()) {
+ score += PINNED_TARGET_SCORE_BOOST;
+ }
+ return score;
+ }
+
+ @Override
public View onCreateView(ViewGroup parent) {
return mInflater.inflate(
com.android.internal.R.layout.resolve_grid_item, parent, false);
@@ -1121,7 +1166,7 @@
v.setOnLongClickListener(new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
- showAppDetails(
+ showTargetDetails(
mChooserListAdapter.resolveInfoForPosition(
holder.itemIndices[column], true));
return true;
diff --git a/packages/SystemUI/src/com/android/systemui/chooser/ResolverTargetActionsDialogFragment.java b/packages/SystemUI/src/com/android/systemui/chooser/ResolverTargetActionsDialogFragment.java
new file mode 100644
index 0000000..839aa45
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/chooser/ResolverTargetActionsDialogFragment.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package com.android.systemui.chooser;
+
+import android.app.AlertDialog.Builder;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.ComponentName;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.Settings;
+
+import com.android.systemui.R;
+
+/**
+ * Shows a dialog with actions to take on a chooser target
+ */
+public class ResolverTargetActionsDialogFragment extends DialogFragment
+ implements DialogInterface.OnClickListener {
+ private static final String NAME_KEY = "componentName";
+ private static final String PINNED_KEY = "pinned";
+ private static final String TITLE_KEY = "title";
+
+ // Sync with R.array.resolver_target_actions_* resources
+ private static final int TOGGLE_PIN_INDEX = 0;
+ private static final int APP_INFO_INDEX = 1;
+
+ public ResolverTargetActionsDialogFragment() {
+ }
+
+ public ResolverTargetActionsDialogFragment(CharSequence title, ComponentName name,
+ boolean pinned) {
+ Bundle args = new Bundle();
+ args.putCharSequence(TITLE_KEY, title);
+ args.putParcelable(NAME_KEY, name);
+ args.putBoolean(PINNED_KEY, pinned);
+ setArguments(args);
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ final Bundle args = getArguments();
+ final int itemRes = args.getBoolean(PINNED_KEY, false)
+ ? R.array.resolver_target_actions_unpin
+ : R.array.resolver_target_actions_pin;
+ return new Builder(getContext())
+ .setCancelable(true)
+ .setItems(itemRes, this)
+ .setTitle(args.getCharSequence(TITLE_KEY))
+ .create();
+ }
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ final Bundle args = getArguments();
+ ComponentName name = args.getParcelable(NAME_KEY);
+ switch (which) {
+ case TOGGLE_PIN_INDEX:
+ SharedPreferences sp = ChooserActivity.getPinnedSharedPrefs(getContext());
+ final String key = name.flattenToString();
+ boolean currentVal = sp.getBoolean(name.flattenToString(), false);
+ if (currentVal) {
+ sp.edit().remove(key).apply();
+ } else {
+ sp.edit().putBoolean(key, true).apply();
+ }
+
+ // Force the chooser to requery and resort things
+ getActivity().recreate();
+ break;
+ case APP_INFO_INDEX:
+ Intent in = new Intent().setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+ .setData(Uri.fromParts("package", name.getPackageName(), null))
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+ startActivity(in);
+ break;
+ }
+ dismiss();
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java
index 4f33d82..fd3c96e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java
@@ -174,6 +174,7 @@
float halfW = getWidth() / 2f;
float halfH = getHeight() / 2f;
float halfSW = Math.min(halfH, halfW);
+ updateDrawableIfDisabled();
if (mBitmap != null && mScale > 0) {
int saveCount = canvas.getSaveCount();
canvas.save();
@@ -249,22 +250,25 @@
return;
}
mIsDisabled = disabled;
+ invalidate();
+ }
+
+ private void updateDrawableIfDisabled() {
int disabledColor = getContext().getColor(R.color.qs_tile_disabled_color);
PorterDuffColorFilter filter = new PorterDuffColorFilter(disabledColor,
PorterDuff.Mode.SRC_ATOP);
if (mBitmap != null) {
- if (disabled) {
+ if (mIsDisabled) {
mBitmapPaint.setColorFilter(filter);
} else {
mBitmapPaint.setColorFilter(null);
}
} else if (mDrawable != null) {
- if (disabled) {
+ if (mIsDisabled) {
mDrawable.setColorFilter(filter);
} else {
mDrawable.setColorFilter(null);
}
}
- invalidate();
}
}
diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index 4bda87e..8c78a3a 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -2074,7 +2074,6 @@
}
/**
- * @hide
* Gets or creates a ByteBuffer that contains the raw data of the current Allocation.
* If the Allocation is created with USAGE_IO_INPUT, the returned ByteBuffer
* would contain the up-to-date data as READ ONLY.
@@ -2109,7 +2108,6 @@
}
/**
- * @hide
* Creates a new Allocation Array with the given {@link
* android.renderscript.Type}, and usage flags.
* Note: If the input allocation is of usage: USAGE_IO_INPUT,
@@ -2211,7 +2209,6 @@
}
/**
- * @hide
* Gets the stride of the Allocation.
* For a 2D or 3D Allocation, the raw data maybe padded so that each row of
* the Allocation has certain alignment. The size of each row including such
@@ -2229,7 +2226,6 @@
}
/**
- * @hide
* Get the timestamp for the most recent buffer held by this Allocation.
* The timestamp is guaranteed to be unique and monotonically increasing.
* Default value: -1. The timestamp will be updated after each {@link
diff --git a/services/core/java/com/android/server/AppOpsService.java b/services/core/java/com/android/server/AppOpsService.java
index e6e69b1..a4455e9 100644
--- a/services/core/java/com/android/server/AppOpsService.java
+++ b/services/core/java/com/android/server/AppOpsService.java
@@ -1181,6 +1181,9 @@
} else if ("audioserver".equals(packageName)) {
pkgUid = Process.AUDIOSERVER_UID;
isPrivileged = false;
+ } else if ("cameraserver".equals(packageName)) {
+ pkgUid = Process.CAMERASERVER_UID;
+ isPrivileged = false;
}
}
} catch (RemoteException e) {
diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java
index 9405d8e0..c55c5b6 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -24,10 +24,10 @@
import com.android.server.location.ActivityRecognitionProxy;
import com.android.server.location.FlpHardwareProvider;
import com.android.server.location.FusedProxy;
+import com.android.server.location.GnssLocationProvider;
import com.android.server.location.GeocoderProxy;
import com.android.server.location.GeofenceManager;
import com.android.server.location.GeofenceProxy;
-import com.android.server.location.GpsLocationProvider;
import com.android.server.location.GpsMeasurementsProvider;
import com.android.server.location.GpsNavigationMessageProvider;
import com.android.server.location.LocationBlacklist;
@@ -61,11 +61,11 @@
import android.location.Criteria;
import android.location.GeocoderParams;
import android.location.Geofence;
+import android.location.IGnssStatusListener;
+import android.location.IGnssStatusProvider;
import android.location.IGpsGeofenceHardware;
import android.location.IGpsMeasurementsListener;
import android.location.IGpsNavigationMessageListener;
-import android.location.IGpsStatusListener;
-import android.location.IGpsStatusProvider;
import android.location.ILocationListener;
import android.location.ILocationManager;
import android.location.INetInitiatedListener;
@@ -157,7 +157,7 @@
private PowerManager mPowerManager;
private UserManager mUserManager;
private GeocoderProxy mGeocodeProvider;
- private IGpsStatusProvider mGpsStatusProvider;
+ private IGnssStatusProvider mGnssStatusProvider;
private INetInitiatedListener mNetInitiatedListener;
private LocationWorkerHandler mLocationHandler;
private PassiveProvider mPassiveProvider; // track passive provider for special cases
@@ -214,6 +214,8 @@
private int mCurrentUserId = UserHandle.USER_SYSTEM;
private int[] mCurrentUserProfiles = new int[] { UserHandle.USER_SYSTEM };
+ private GnssLocationProvider.GpsSystemInfoProvider mGpsSystemInfoProvider;
+
public LocationManagerService(Context context) {
super();
mContext = context;
@@ -456,17 +458,18 @@
mEnabledProviders.add(passiveProvider.getName());
mPassiveProvider = passiveProvider;
- if (GpsLocationProvider.isSupported()) {
+ if (GnssLocationProvider.isSupported()) {
// Create a gps location provider
- GpsLocationProvider gpsProvider = new GpsLocationProvider(mContext, this,
+ GnssLocationProvider gnssProvider = new GnssLocationProvider(mContext, this,
mLocationHandler.getLooper());
- mGpsStatusProvider = gpsProvider.getGpsStatusProvider();
- mNetInitiatedListener = gpsProvider.getNetInitiatedListener();
- addProviderLocked(gpsProvider);
- mRealProviders.put(LocationManager.GPS_PROVIDER, gpsProvider);
- mGpsMeasurementsProvider = gpsProvider.getGpsMeasurementsProvider();
- mGpsNavigationMessageProvider = gpsProvider.getGpsNavigationMessageProvider();
- mGpsGeofenceProxy = gpsProvider.getGpsGeofenceProxy();
+ mGpsSystemInfoProvider = gnssProvider.getGpsSystemInfoProvider();
+ mGnssStatusProvider = gnssProvider.getGnssStatusProvider();
+ mNetInitiatedListener = gnssProvider.getNetInitiatedListener();
+ addProviderLocked(gnssProvider);
+ mRealProviders.put(LocationManager.GPS_PROVIDER, gnssProvider);
+ mGpsMeasurementsProvider = gnssProvider.getGpsMeasurementsProvider();
+ mGpsNavigationMessageProvider = gnssProvider.getGpsNavigationMessageProvider();
+ mGpsGeofenceProxy = gnssProvider.getGpsGeofenceProxy();
}
/*
@@ -986,6 +989,18 @@
}
}
+ /**
+ * Returns the system information of the GPS hardware.
+ */
+ @Override
+ public int getGpsYearOfHardware() {
+ if (mGpsNavigationMessageProvider != null) {
+ return mGpsSystemInfoProvider.getGpsYearOfHardware();
+ } else {
+ return 0;
+ }
+ }
+
private void addProviderLocked(LocationProviderInterface provider) {
mProviders.add(provider);
mProvidersByName.put(provider.getName(), provider);
@@ -1867,7 +1882,7 @@
@Override
- public boolean addGpsStatusListener(IGpsStatusListener listener, String packageName) {
+ public boolean registerGnssStatusCallback(IGnssStatusListener callback, String packageName) {
int allowedResolutionLevel = getCallerAllowedResolutionLevel();
checkResolutionLevelIsSufficientForProviderUse(allowedResolutionLevel,
LocationManager.GPS_PROVIDER);
@@ -1883,26 +1898,26 @@
Binder.restoreCallingIdentity(ident);
}
- if (mGpsStatusProvider == null) {
+ if (mGnssStatusProvider == null) {
return false;
}
try {
- mGpsStatusProvider.addGpsStatusListener(listener);
+ mGnssStatusProvider.registerGnssStatusCallback(callback);
} catch (RemoteException e) {
- Slog.e(TAG, "mGpsStatusProvider.addGpsStatusListener failed", e);
+ Slog.e(TAG, "mGpsStatusProvider.registerGnssStatusCallback failed", e);
return false;
}
return true;
}
@Override
- public void removeGpsStatusListener(IGpsStatusListener listener) {
+ public void unregisterGnssStatusCallback(IGnssStatusListener callback) {
synchronized (mLock) {
try {
- mGpsStatusProvider.removeGpsStatusListener(listener);
+ mGnssStatusProvider.unregisterGnssStatusCallback(callback);
} catch (Exception e) {
- Slog.e(TAG, "mGpsStatusProvider.removeGpsStatusListener failed", e);
+ Slog.e(TAG, "mGpsStatusProvider.unregisterGnssStatusCallback failed", e);
}
}
}
diff --git a/services/core/java/com/android/server/SensorNotificationService.java b/services/core/java/com/android/server/SensorNotificationService.java
new file mode 100644
index 0000000..0610464
--- /dev/null
+++ b/services/core/java/com/android/server/SensorNotificationService.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.SystemClock;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Slog;
+
+public class SensorNotificationService extends SystemService implements SensorEventListener {
+ //TODO: set DBG to false or remove Slog before release
+ private static final boolean DBG = true;
+ private static final String TAG = "SensorNotificationService";
+ private Context mContext;
+
+ private SensorManager mSensorManager;
+ private Sensor mMetaSensor;
+
+ public SensorNotificationService(Context context) {
+ super(context);
+ mContext = context;
+ }
+
+ public void onStart() {
+ LocalServices.addService(SensorNotificationService.class, this);
+ }
+
+ public void onBootPhase(int phase) {
+ if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) {
+ // start
+ mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);
+ mMetaSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_DYNAMIC_SENSOR_META);
+ if (mMetaSensor == null) {
+ if (DBG) Slog.d(TAG, "Cannot obtain dynamic meta sensor, not supported.");
+ } else {
+ mSensorManager.registerListener(this, mMetaSensor,
+ SensorManager.SENSOR_DELAY_FASTEST);
+ }
+ }
+ }
+
+ private void broadcastDynamicSensorChanged() {
+ Intent i = new Intent(Intent.ACTION_DYNAMIC_SENSOR_CHANGED);
+ i.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); // avoid waking up manifest receivers
+ mContext.sendBroadcastAsUser(i, UserHandle.ALL);
+ if (DBG) Slog.d(TAG, "DYNS sent dynamic sensor broadcast");
+ }
+
+ @Override
+ public void onSensorChanged(SensorEvent event) {
+ if (event.sensor == mMetaSensor) {
+ broadcastDynamicSensorChanged();
+ }
+ }
+
+ @Override
+ public void onAccuracyChanged(Sensor sensor, int accuracy) {
+
+ }
+}
+
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index 0f7dff27..97ef10b 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -40,6 +40,7 @@
import android.os.UserHandle;
import android.os.WorkSource;
import android.telephony.DataConnectionRealTimeInfo;
+import android.telephony.ModemActivityInfo;
import android.telephony.SignalStrength;
import android.telephony.TelephonyManager;
import android.util.IntArray;
@@ -51,6 +52,7 @@
import com.android.internal.os.BatteryStatsHelper;
import com.android.internal.os.BatteryStatsImpl;
import com.android.internal.os.PowerProfile;
+import com.android.internal.telephony.ITelephony;
import com.android.server.FgThread;
import com.android.server.LocalServices;
@@ -1329,6 +1331,24 @@
return null;
}
+ @GuardedBy("mExternalStatsLock")
+ private ModemActivityInfo pullModemActivityInfoLocked() {
+ ITelephony tm = ITelephony.Stub.asInterface(ServiceManager.getService(
+ Context.TELEPHONY_SERVICE));
+ try {
+ if (tm != null) {
+ ModemActivityInfo info = tm.getModemActivityInfo();
+ if (info == null || info.isValid()) {
+ return info;
+ }
+ Slog.wtf(TAG, "Modem activity info is invalid: " + info);
+ }
+ } catch (RemoteException e) {
+ // Nothing to do.
+ }
+ return null;
+ }
+
/**
* Fetches data from external sources (WiFi controller, bluetooth chipset) and updates
* batterystats with that information.
@@ -1358,6 +1378,11 @@
wifiEnergyInfo = pullWifiEnergyInfoLocked();
}
+ ModemActivityInfo modemActivityInfo = null;
+ if ((updateFlags & UPDATE_RADIO) != 0) {
+ modemActivityInfo = pullModemActivityInfoLocked();
+ }
+
BluetoothActivityEnergyInfo bluetoothEnergyInfo = null;
if ((updateFlags & UPDATE_BT) != 0) {
// We only pull bluetooth stats when we have to, as we are not distributing its
@@ -1379,7 +1404,7 @@
}
if ((updateFlags & UPDATE_RADIO) != 0) {
- mStats.updateMobileRadioStateLocked(elapsedRealtime);
+ mStats.updateMobileRadioStateLocked(elapsedRealtime, modemActivityInfo);
}
if ((updateFlags & UPDATE_WIFI) != 0) {
diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
similarity index 96%
rename from services/core/java/com/android/server/location/GpsLocationProvider.java
rename to services/core/java/com/android/server/location/GnssLocationProvider.java
index 88ab2c6..9798e56 100644
--- a/services/core/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -35,11 +35,12 @@
import android.hardware.location.GeofenceHardwareImpl;
import android.location.Criteria;
import android.location.FusedBatchOptions;
+import android.location.GnssStatus;
+import android.location.IGnssStatusListener;
+import android.location.IGnssStatusProvider;
import android.location.GpsMeasurementsEvent;
import android.location.GpsNavigationMessageEvent;
import android.location.IGpsGeofenceHardware;
-import android.location.IGpsStatusListener;
-import android.location.IGpsStatusProvider;
import android.location.ILocationManager;
import android.location.INetInitiatedListener;
import android.location.Location;
@@ -100,9 +101,9 @@
*
* {@hide}
*/
-public class GpsLocationProvider implements LocationProviderInterface {
+public class GnssLocationProvider implements LocationProviderInterface {
- private static final String TAG = "GpsLocationProvider";
+ private static final String TAG = "GnssLocationProvider";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
@@ -366,7 +367,7 @@
private final ILocationManager mILocationManager;
private Location mLocation = new Location(LocationManager.GPS_PROVIDER);
private Bundle mLocationExtras = new Bundle();
- private final GpsStatusListenerHelper mListenerHelper;
+ private final GnssStatusListenerHelper mListenerHelper;
private final GpsMeasurementsProvider mGpsMeasurementsProvider;
private final GpsNavigationMessageProvider mGpsNavigationMessageProvider;
@@ -382,7 +383,7 @@
private final GpsNetInitiatedHandler mNIHandler;
// Wakelocks
- private final static String WAKELOCK_KEY = "GpsLocationProvider";
+ private final static String WAKELOCK_KEY = "GnssLocationProvider";
private final PowerManager.WakeLock mWakeLock;
// Alarms
@@ -405,20 +406,22 @@
private GeofenceHardwareImpl mGeofenceHardwareImpl;
- private final IGpsStatusProvider mGpsStatusProvider = new IGpsStatusProvider.Stub() {
+ private int mYearOfHardware = 0;
+
+ private final IGnssStatusProvider mGnssStatusProvider = new IGnssStatusProvider.Stub() {
@Override
- public void addGpsStatusListener(IGpsStatusListener listener) {
- mListenerHelper.addListener(listener);
+ public void registerGnssStatusCallback(IGnssStatusListener callback) {
+ mListenerHelper.addListener(callback);
}
@Override
- public void removeGpsStatusListener(IGpsStatusListener listener) {
- mListenerHelper.removeListener(listener);
+ public void unregisterGnssStatusCallback(IGnssStatusListener callback) {
+ mListenerHelper.removeListener(callback);
}
};
- public IGpsStatusProvider getGpsStatusProvider() {
- return mGpsStatusProvider;
+ public IGnssStatusProvider getGnssStatusProvider() {
+ return mGnssStatusProvider;
}
public IGpsGeofenceHardware getGpsGeofenceProxy() {
@@ -655,7 +658,7 @@
return true;
}
- public GpsLocationProvider(Context context, ILocationManager ilocationManager,
+ public GnssLocationProvider(Context context, ILocationManager ilocationManager,
Looper looper) {
mContext = context;
mNtpTime = NtpTrustedTime.getInstance(context);
@@ -698,7 +701,7 @@
mNetInitiatedListener,
mSuplEsEnabled);
- mListenerHelper = new GpsStatusListenerHelper(mHandler) {
+ mListenerHelper = new GnssStatusListenerHelper(mHandler) {
@Override
protected boolean isAvailableInPlatform() {
return isSupported();
@@ -1554,34 +1557,40 @@
* called from native code to update SV info
*/
private void reportSvStatus() {
- int svCount = native_read_sv_status(mSvs, mSnrs, mSvElevations, mSvAzimuths, mSvMasks);
+ int svCount = native_read_sv_status(mPrnWithFlags, mSnrs, mSvElevations, mSvAzimuths,
+ mConstellationTypes);
mListenerHelper.onSvStatusChanged(
svCount,
- mSvs,
+ mPrnWithFlags,
mSnrs,
mSvElevations,
mSvAzimuths,
- mSvMasks[EPHEMERIS_MASK],
- mSvMasks[ALMANAC_MASK],
- mSvMasks[USED_FOR_FIX_MASK]);
+ mConstellationTypes);
if (VERBOSE) {
- Log.v(TAG, "SV count: " + svCount +
- " ephemerisMask: " + Integer.toHexString(mSvMasks[EPHEMERIS_MASK]) +
- " almanacMask: " + Integer.toHexString(mSvMasks[ALMANAC_MASK]));
- for (int i = 0; i < svCount; i++) {
- Log.v(TAG, "sv: " + mSvs[i] +
+ Log.v(TAG, "SV count: " + svCount);
+ }
+ // Calculate number of sets used in fix.
+ int usedInFixCount = 0;
+ for (int i = 0; i < svCount; i++) {
+ if ((mPrnWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) != 0) {
+ ++usedInFixCount;
+ }
+ if (VERBOSE) {
+ Log.v(TAG, "prn: " + (mPrnWithFlags[i] >> GnssStatus.PRN_SHIFT_WIDTH) +
" snr: " + mSnrs[i]/10 +
" elev: " + mSvElevations[i] +
" azimuth: " + mSvAzimuths[i] +
- ((mSvMasks[EPHEMERIS_MASK] & (1 << (mSvs[i] - 1))) == 0 ? " " : " E") +
- ((mSvMasks[ALMANAC_MASK] & (1 << (mSvs[i] - 1))) == 0 ? " " : " A") +
- ((mSvMasks[USED_FOR_FIX_MASK] & (1 << (mSvs[i] - 1))) == 0 ? "" : "U"));
+ ((mPrnWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA) == 0
+ ? " " : " E") +
+ ((mPrnWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_HAS_ALMANAC_DATA) == 0
+ ? " " : " A") +
+ ((mPrnWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) == 0
+ ? "" : "U"));
}
}
-
// return number of sets used in fix instead of total
- updateStatus(mStatus, Integer.bitCount(mSvMasks[USED_FOR_FIX_MASK]));
+ updateStatus(mStatus, usedInFixCount);
if (mNavigating && mStatus == LocationProvider.AVAILABLE && mLastFixTime > 0 &&
System.currentTimeMillis() - mLastFixTime > RECENT_FIX_TIMEOUT) {
@@ -1675,6 +1684,33 @@
}
/**
+ * Called from native code to inform us the hardware information.
+ */
+ private void setGpsYearOfHardware(int yearOfHardware) {
+ if (DEBUG) Log.d(TAG, "setGpsYearOfHardware called with " + yearOfHardware);
+ mYearOfHardware = yearOfHardware;
+ }
+
+ public interface GpsSystemInfoProvider {
+ /**
+ * Returns the year of GPS hardware.
+ */
+ int getGpsYearOfHardware();
+ }
+
+ /**
+ * @hide
+ */
+ public GpsSystemInfoProvider getGpsSystemInfoProvider() {
+ return new GpsSystemInfoProvider() {
+ @Override
+ public int getGpsYearOfHardware() {
+ return mYearOfHardware;
+ }
+ };
+ }
+
+ /**
* called from native code to request XTRA data
*/
private void xtraDownloadRequest() {
@@ -2067,7 +2103,7 @@
}
/**
- * This method is bound to {@link #GpsLocationProvider(Context, ILocationManager, Looper)}.
+ * This method is bound to {@link #GnssLocationProvider(Context, ILocationManager, Looper)}.
* It is in charge of loading properties and registering for events that will be posted to
* this handler.
*/
@@ -2362,17 +2398,14 @@
}
// for GPS SV statistics
- private static final int MAX_SVS = 32;
- private static final int EPHEMERIS_MASK = 0;
- private static final int ALMANAC_MASK = 1;
- private static final int USED_FOR_FIX_MASK = 2;
+ private static final int MAX_SVS = 512;
// preallocated arrays, to avoid memory allocation in reportStatus()
- private int mSvs[] = new int[MAX_SVS];
+ private int mPrnWithFlags[] = new int[MAX_SVS];
private float mSnrs[] = new float[MAX_SVS];
private float mSvElevations[] = new float[MAX_SVS];
private float mSvAzimuths[] = new float[MAX_SVS];
- private int mSvMasks[] = new int[3];
+ private int mConstellationTypes[] = new int[MAX_SVS];
private int mSvCount;
// preallocated to avoid memory allocation in reportNmea()
private byte[] mNmeaBuffer = new byte[120];
@@ -2392,8 +2425,8 @@
private native void native_delete_aiding_data(int flags);
// returns number of SVs
// mask[0] is ephemeris mask and mask[1] is almanac mask
- private native int native_read_sv_status(int[] svs, float[] snrs,
- float[] elevations, float[] azimuths, int[] masks);
+ private native int native_read_sv_status(int[] prnWithFlags, float[] snrs, float[] elevations,
+ float[] azimuths, int[] constellationTypes);
private native int native_read_nmea(byte[] buffer, int bufferSize);
private native void native_inject_location(double latitude, double longitude, float accuracy);
diff --git a/services/core/java/com/android/server/location/GpsStatusListenerHelper.java b/services/core/java/com/android/server/location/GnssStatusListenerHelper.java
similarity index 63%
rename from services/core/java/com/android/server/location/GpsStatusListenerHelper.java
rename to services/core/java/com/android/server/location/GnssStatusListenerHelper.java
index 53ff6c2..9840c61 100644
--- a/services/core/java/com/android/server/location/GpsStatusListenerHelper.java
+++ b/services/core/java/com/android/server/location/GnssStatusListenerHelper.java
@@ -16,17 +16,17 @@
package com.android.server.location;
-import android.location.IGpsStatusListener;
+import android.location.IGnssStatusListener;
import android.os.Handler;
import android.os.RemoteException;
/**
- * Implementation of a handler for {@link IGpsStatusListener}.
+ * Implementation of a handler for {@link IGnssStatusListener}.
*/
-abstract class GpsStatusListenerHelper extends RemoteListenerHelper<IGpsStatusListener> {
- protected GpsStatusListenerHelper(Handler handler) {
- super(handler, "GpsStatusListenerHelper");
- setSupported(GpsLocationProvider.isSupported());
+abstract class GnssStatusListenerHelper extends RemoteListenerHelper<IGnssStatusListener> {
+ protected GnssStatusListenerHelper(Handler handler) {
+ super(handler, "GnssStatusListenerHelper");
+ setSupported(GnssLocationProvider.isSupported());
}
@Override
@@ -38,7 +38,7 @@
protected void unregisterFromService() {}
@Override
- protected ListenerOperation<IGpsStatusListener> getHandlerOperation(int result) {
+ protected ListenerOperation<IGnssStatusListener> getHandlerOperation(int result) {
return null;
}
@@ -47,15 +47,15 @@
if (isNavigating) {
operation = new Operation() {
@Override
- public void execute(IGpsStatusListener listener) throws RemoteException {
- listener.onGpsStarted();
+ public void execute(IGnssStatusListener listener) throws RemoteException {
+ listener.onGnssStarted();
}
};
} else {
operation = new Operation() {
@Override
- public void execute(IGpsStatusListener listener) throws RemoteException {
- listener.onGpsStopped();
+ public void execute(IGnssStatusListener listener) throws RemoteException {
+ listener.onGnssStopped();
}
};
}
@@ -65,7 +65,7 @@
public void onFirstFix(final int timeToFirstFix) {
Operation operation = new Operation() {
@Override
- public void execute(IGpsStatusListener listener) throws RemoteException {
+ public void execute(IGnssStatusListener listener) throws RemoteException {
listener.onFirstFix(timeToFirstFix);
}
};
@@ -74,25 +74,21 @@
public void onSvStatusChanged(
final int svCount,
- final int[] prns,
+ final int[] prnWithFlags,
final float[] snrs,
final float[] elevations,
final float[] azimuths,
- final int ephemerisMask,
- final int almanacMask,
- final int usedInFixMask) {
+ final int[] constellationTypes) {
Operation operation = new Operation() {
@Override
- public void execute(IGpsStatusListener listener) throws RemoteException {
+ public void execute(IGnssStatusListener listener) throws RemoteException {
listener.onSvStatusChanged(
svCount,
- prns,
+ prnWithFlags,
snrs,
elevations,
azimuths,
- ephemerisMask,
- almanacMask,
- usedInFixMask);
+ constellationTypes);
}
};
foreach(operation);
@@ -101,12 +97,12 @@
public void onNmeaReceived(final long timestamp, final String nmea) {
Operation operation = new Operation() {
@Override
- public void execute(IGpsStatusListener listener) throws RemoteException {
+ public void execute(IGnssStatusListener listener) throws RemoteException {
listener.onNmeaReceived(timestamp, nmea);
}
};
foreach(operation);
}
- private interface Operation extends ListenerOperation<IGpsStatusListener> {}
+ private interface Operation extends ListenerOperation<IGnssStatusListener> {}
}
diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk
index 98d8d08..d1b8648 100644
--- a/services/core/jni/Android.mk
+++ b/services/core/jni/Android.mk
@@ -22,7 +22,7 @@
$(LOCAL_REL_DIR)/com_android_server_input_InputManagerService.cpp \
$(LOCAL_REL_DIR)/com_android_server_input_InputWindowHandle.cpp \
$(LOCAL_REL_DIR)/com_android_server_lights_LightsService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_location_GpsLocationProvider.cpp \
+ $(LOCAL_REL_DIR)/com_android_server_location_GnssLocationProvider.cpp \
$(LOCAL_REL_DIR)/com_android_server_location_FlpHardwareProvider.cpp \
$(LOCAL_REL_DIR)/com_android_server_power_PowerManagerService.cpp \
$(LOCAL_REL_DIR)/com_android_server_SerialService.cpp \
diff --git a/services/core/jni/com_android_server_location_GpsLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
similarity index 79%
rename from services/core/jni/com_android_server_location_GpsLocationProvider.cpp
rename to services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index b8d4196..0c85a15 100644
--- a/services/core/jni/com_android_server_location_GpsLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#define LOG_TAG "GpsLocationProvider"
+#define LOG_TAG "GnssLocationProvider"
#define LOG_NDEBUG 0
#include "JNIHelp.h"
#include "jni.h"
#include "hardware/hardware.h"
-#include "hardware/gps.h"
+#include "hardware/gps_internal.h"
#include "hardware_legacy/power.h"
#include "utils/Log.h"
#include "utils/misc.h"
@@ -42,6 +42,7 @@
static jmethodID method_reportAGpsStatus;
static jmethodID method_reportNmea;
static jmethodID method_setEngineCapabilities;
+static jmethodID method_setGpsYearOfHardware;
static jmethodID method_xtraDownloadRequest;
static jmethodID method_reportNiNotification;
static jmethodID method_requestRefLocation;
@@ -67,8 +68,14 @@
static const GpsNavigationMessageInterface* sGpsNavigationMessageInterface = NULL;
static const GnssConfigurationInterface* sGnssConfigurationInterface = NULL;
+#define MAX_SATELLITE_COUNT 512
+#define MAX_GPS_SATELLITE_COUNT 512
+
+#define PRN_SHIFT_WIDTH 3
+
// temporary storage for GPS callbacks
-static GpsSvStatus sGpsSvStatus;
+static GnssSvInfo sGnssSvList[MAX_SATELLITE_COUNT];
+static size_t sGnssSvListSize;
static const char* sNmeaString;
static int sNmeaStringLength;
@@ -105,7 +112,57 @@
static void sv_status_callback(GpsSvStatus* sv_status)
{
JNIEnv* env = AndroidRuntime::getJNIEnv();
- memcpy(&sGpsSvStatus, sv_status, sizeof(sGpsSvStatus));
+ size_t status_size = sv_status->size;
+ // Some drive doesn't set the size field correctly. Assume GpsSvStatus_v1 if
+ // it doesn't provide a valid size.
+ if (status_size == 0) {
+ status_size = sizeof(GpsSvStatus_v1);
+ }
+ if (status_size == sizeof(GpsSvStatus)) {
+ sGnssSvListSize = sv_status->gnss_sv_list_size;
+ // Cramp the list size
+ if (sGnssSvListSize > MAX_SATELLITE_COUNT) {
+ sGnssSvListSize = MAX_SATELLITE_COUNT;
+ }
+ // Copy GNSS SV info into sGnssSvList, if any.
+ if (sGnssSvListSize > 0 && sv_status->gnss_sv_list) {
+ memcpy(sGnssSvList, sv_status->gnss_sv_list, sizeof(GnssSvInfo) * sGnssSvListSize);
+ }
+ } else if (status_size == sizeof(GpsSvStatus_v1)) {
+ sGnssSvListSize = sv_status->num_svs;
+ // Cramp the list size
+ if (sGnssSvListSize > MAX_GPS_SATELLITE_COUNT) {
+ sGnssSvListSize = MAX_GPS_SATELLITE_COUNT;
+ }
+ uint32_t ephemeris_mask = sv_status->ephemeris_mask;
+ uint32_t almanac_mask = sv_status->almanac_mask;
+ uint32_t used_in_fix_mask = sv_status->used_in_fix_mask;
+ for (size_t i = 0; i < sGnssSvListSize; i++) {
+ GnssSvInfo& info = sGnssSvList[i];
+ info.constellation = GNSS_CONSTELLATION_GPS;
+ info.prn = sv_status->sv_list[i].prn;
+ info.snr = sv_status->sv_list[i].snr;
+ info.elevation = sv_status->sv_list[i].elevation;
+ info.azimuth = sv_status->sv_list[i].azimuth;
+ info.flags = GNSS_SV_FLAGS_NONE;
+ if (info.prn > 0 && info.prn <= 32) {
+ int32_t this_prn_mask = (1 << (info.prn - 1));
+ if ((ephemeris_mask & this_prn_mask) != 0) {
+ info.flags |= GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA;
+ }
+ if ((almanac_mask & this_prn_mask) != 0) {
+ info.flags |= GNSS_SV_FLAGS_HAS_ALMANAC_DATA;
+ }
+ if ((used_in_fix_mask & this_prn_mask) != 0) {
+ info.flags |= GNSS_SV_FLAGS_USED_IN_FIX;
+ }
+ }
+ }
+ } else {
+ sGnssSvListSize = 0;
+ ALOGE("Invalid size of GpsSvStatus found: %zd.", status_size);
+ return;
+ }
env->CallVoidMethod(mCallbacksObj, method_reportSvStatus);
checkAndClearExceptionFromCallback(env, __FUNCTION__);
}
@@ -121,6 +178,14 @@
checkAndClearExceptionFromCallback(env, __FUNCTION__);
}
+static void set_system_info_callback(const GpsSystemInfo* info) {
+ ALOGD("set_system_info_callback: year_of_hw=%d\n", info->year_of_hw);
+ JNIEnv* env = AndroidRuntime::getJNIEnv();
+ env->CallVoidMethod(mCallbacksObj, method_setGpsYearOfHardware,
+ info->year_of_hw);
+ checkAndClearExceptionFromCallback(env, __FUNCTION__);
+}
+
static void set_capabilities_callback(uint32_t capabilities)
{
ALOGD("set_capabilities_callback: %du\n", capabilities);
@@ -162,6 +227,7 @@
release_wakelock_callback,
create_thread_callback,
request_utc_time_callback,
+ set_system_info_callback,
};
static void xtra_download_request_callback()
@@ -213,7 +279,7 @@
bool isSupported = false;
size_t status_size = agps_status->size;
- if (status_size == sizeof(AGpsStatus_v3)) {
+ if (status_size == sizeof(AGpsStatus)) {
ALOGV("AGpsStatus is V3: %zd", status_size);
switch (agps_status->addr.ss_family)
{
@@ -439,7 +505,7 @@
create_thread_callback,
};
-static void android_location_GpsLocationProvider_class_init_native(JNIEnv* env, jclass clazz) {
+static void android_location_GnssLocationProvider_class_init_native(JNIEnv* env, jclass clazz) {
int err;
hw_module_t* module;
@@ -449,6 +515,7 @@
method_reportAGpsStatus = env->GetMethodID(clazz, "reportAGpsStatus", "(II[B)V");
method_reportNmea = env->GetMethodID(clazz, "reportNmea", "(J)V");
method_setEngineCapabilities = env->GetMethodID(clazz, "setEngineCapabilities", "(I)V");
+ method_setGpsYearOfHardware = env->GetMethodID(clazz, "setGpsYearOfHardware", "(I)V");
method_xtraDownloadRequest = env->GetMethodID(clazz, "xtraDownloadRequest", "()V");
method_reportNiNotification = env->GetMethodID(clazz, "reportNiNotification",
"(IIIIILjava/lang/String;Ljava/lang/String;IILjava/lang/String;)V");
@@ -509,13 +576,13 @@
}
}
-static jboolean android_location_GpsLocationProvider_is_supported(
+static jboolean android_location_GnssLocationProvider_is_supported(
JNIEnv* /* env */, jclass /* clazz */)
{
return (sGpsInterface != NULL) ? JNI_TRUE : JNI_FALSE;
}
-static jboolean android_location_GpsLocationProvider_is_agps_ril_supported(
+static jboolean android_location_GnssLocationProvider_is_agps_ril_supported(
JNIEnv* /* env */, jclass /* clazz */)
{
return (sAGpsRilInterface != NULL) ? JNI_TRUE : JNI_FALSE;
@@ -527,7 +594,7 @@
return (sGnssConfigurationInterface != NULL) ? JNI_TRUE : JNI_FALSE;
}
-static jboolean android_location_GpsLocationProvider_init(JNIEnv* env, jobject obj)
+static jboolean android_location_GnssLocationProvider_init(JNIEnv* env, jobject obj)
{
// this must be set before calling into the HAL library
if (!mCallbacksObj)
@@ -553,13 +620,13 @@
return JNI_TRUE;
}
-static void android_location_GpsLocationProvider_cleanup(JNIEnv* /* env */, jobject /* obj */)
+static void android_location_GnssLocationProvider_cleanup(JNIEnv* /* env */, jobject /* obj */)
{
if (sGpsInterface)
sGpsInterface->cleanup();
}
-static jboolean android_location_GpsLocationProvider_set_position_mode(JNIEnv* /* env */,
+static jboolean android_location_GnssLocationProvider_set_position_mode(JNIEnv* /* env */,
jobject /* obj */, jint mode, jint recurrence, jint min_interval, jint preferred_accuracy,
jint preferred_time)
{
@@ -575,7 +642,7 @@
return JNI_FALSE;
}
-static jboolean android_location_GpsLocationProvider_start(JNIEnv* /* env */, jobject /* obj */)
+static jboolean android_location_GnssLocationProvider_start(JNIEnv* /* env */, jobject /* obj */)
{
if (sGpsInterface) {
if (sGpsInterface->start() == 0) {
@@ -588,7 +655,7 @@
return JNI_FALSE;
}
-static jboolean android_location_GpsLocationProvider_stop(JNIEnv* /* env */, jobject /* obj */)
+static jboolean android_location_GnssLocationProvider_stop(JNIEnv* /* env */, jobject /* obj */)
{
if (sGpsInterface) {
if (sGpsInterface->stop() == 0) {
@@ -601,7 +668,7 @@
return JNI_FALSE;
}
-static void android_location_GpsLocationProvider_delete_aiding_data(JNIEnv* /* env */,
+static void android_location_GnssLocationProvider_delete_aiding_data(JNIEnv* /* env */,
jobject /* obj */,
jint flags)
{
@@ -609,38 +676,36 @@
sGpsInterface->delete_aiding_data(flags);
}
-static jint android_location_GpsLocationProvider_read_sv_status(JNIEnv* env, jobject /* obj */,
- jintArray prnArray, jfloatArray snrArray, jfloatArray elevArray, jfloatArray azumArray,
- jintArray maskArray)
+static jint android_location_GnssLocationProvider_read_sv_status(JNIEnv* env, jobject /* obj */,
+ jintArray prnWithFlagArray, jfloatArray snrArray, jfloatArray elevArray,
+ jfloatArray azumArray, jintArray constellationTypeArray)
{
// this should only be called from within a call to reportSvStatus
-
- jint* prns = env->GetIntArrayElements(prnArray, 0);
+ jint* prnWithFlags = env->GetIntArrayElements(prnWithFlagArray, 0);
jfloat* snrs = env->GetFloatArrayElements(snrArray, 0);
jfloat* elev = env->GetFloatArrayElements(elevArray, 0);
jfloat* azim = env->GetFloatArrayElements(azumArray, 0);
- jint* mask = env->GetIntArrayElements(maskArray, 0);
+ jint* constellationTypes = env->GetIntArrayElements(constellationTypeArray, 0);
- int num_svs = sGpsSvStatus.num_svs;
- for (int i = 0; i < num_svs; i++) {
- prns[i] = sGpsSvStatus.sv_list[i].prn;
- snrs[i] = sGpsSvStatus.sv_list[i].snr;
- elev[i] = sGpsSvStatus.sv_list[i].elevation;
- azim[i] = sGpsSvStatus.sv_list[i].azimuth;
+ // GNSS SV info.
+ for (size_t i = 0; i < sGnssSvListSize; ++i) {
+ const GnssSvInfo& info = sGnssSvList[i];
+ constellationTypes[i] = info.constellation;
+ prnWithFlags[i] = (info.prn << PRN_SHIFT_WIDTH) | info.flags;
+ snrs[i] = info.snr;
+ elev[i] = info.elevation;
+ azim[i] = info.azimuth;
}
- mask[0] = sGpsSvStatus.ephemeris_mask;
- mask[1] = sGpsSvStatus.almanac_mask;
- mask[2] = sGpsSvStatus.used_in_fix_mask;
- env->ReleaseIntArrayElements(prnArray, prns, 0);
+ env->ReleaseIntArrayElements(prnWithFlagArray, prnWithFlags, 0);
env->ReleaseFloatArrayElements(snrArray, snrs, 0);
env->ReleaseFloatArrayElements(elevArray, elev, 0);
env->ReleaseFloatArrayElements(azumArray, azim, 0);
- env->ReleaseIntArrayElements(maskArray, mask, 0);
- return (jint) num_svs;
+ env->ReleaseIntArrayElements(constellationTypeArray, constellationTypes, 0);
+ return (jint) sGnssSvListSize;
}
-static void android_location_GpsLocationProvider_agps_set_reference_location_cellid(
+static void android_location_GnssLocationProvider_agps_set_reference_location_cellid(
JNIEnv* /* env */, jobject /* obj */, jint type, jint mcc, jint mnc, jint lac, jint cid)
{
AGpsRefLocation location;
@@ -667,7 +732,7 @@
sAGpsRilInterface->set_ref_location(&location, sizeof(location));
}
-static void android_location_GpsLocationProvider_agps_send_ni_message(JNIEnv* env,
+static void android_location_GnssLocationProvider_agps_send_ni_message(JNIEnv* env,
jobject /* obj */, jbyteArray ni_msg, jint size)
{
size_t sz;
@@ -684,7 +749,7 @@
env->ReleaseByteArrayElements(ni_msg,b,0);
}
-static void android_location_GpsLocationProvider_agps_set_id(JNIEnv *env, jobject /* obj */,
+static void android_location_GnssLocationProvider_agps_set_id(JNIEnv *env, jobject /* obj */,
jint type, jstring setid_string)
{
if (!sAGpsRilInterface) {
@@ -697,7 +762,7 @@
env->ReleaseStringUTFChars(setid_string, setid);
}
-static jint android_location_GpsLocationProvider_read_nmea(JNIEnv* env, jobject /* obj */,
+static jint android_location_GnssLocationProvider_read_nmea(JNIEnv* env, jobject /* obj */,
jbyteArray nmeaArray, jint buffer_size)
{
// this should only be called from within a call to reportNmea
@@ -710,27 +775,27 @@
return (jint) length;
}
-static void android_location_GpsLocationProvider_inject_time(JNIEnv* /* env */, jobject /* obj */,
+static void android_location_GnssLocationProvider_inject_time(JNIEnv* /* env */, jobject /* obj */,
jlong time, jlong timeReference, jint uncertainty)
{
if (sGpsInterface)
sGpsInterface->inject_time(time, timeReference, uncertainty);
}
-static void android_location_GpsLocationProvider_inject_location(JNIEnv* /* env */,
+static void android_location_GnssLocationProvider_inject_location(JNIEnv* /* env */,
jobject /* obj */, jdouble latitude, jdouble longitude, jfloat accuracy)
{
if (sGpsInterface)
sGpsInterface->inject_location(latitude, longitude, accuracy);
}
-static jboolean android_location_GpsLocationProvider_supports_xtra(
+static jboolean android_location_GnssLocationProvider_supports_xtra(
JNIEnv* /* env */, jobject /* obj */)
{
return (sGpsXtraInterface != NULL) ? JNI_TRUE : JNI_FALSE;
}
-static void android_location_GpsLocationProvider_inject_xtra_data(JNIEnv* env, jobject /* obj */,
+static void android_location_GnssLocationProvider_inject_xtra_data(JNIEnv* env, jobject /* obj */,
jbyteArray data, jint length)
{
if (!sGpsXtraInterface) {
@@ -743,7 +808,7 @@
env->ReleasePrimitiveArrayCritical(data, bytes, JNI_ABORT);
}
-static void android_location_GpsLocationProvider_agps_data_conn_open(
+static void android_location_GnssLocationProvider_agps_data_conn_open(
JNIEnv* env, jobject /* obj */, jstring apn, jint apnIpType)
{
if (!sAGpsInterface) {
@@ -758,7 +823,7 @@
const char *apnStr = env->GetStringUTFChars(apn, NULL);
size_t interface_size = sAGpsInterface->size;
- if (interface_size == sizeof(AGpsInterface_v2)) {
+ if (interface_size == sizeof(AGpsInterface)) {
sAGpsInterface->data_conn_open_with_apn_ip_type(apnStr, apnIpType);
} else if (interface_size == sizeof(AGpsInterface_v1)) {
sAGpsInterface->data_conn_open(apnStr);
@@ -769,7 +834,7 @@
env->ReleaseStringUTFChars(apn, apnStr);
}
-static void android_location_GpsLocationProvider_agps_data_conn_closed(JNIEnv* /* env */,
+static void android_location_GnssLocationProvider_agps_data_conn_closed(JNIEnv* /* env */,
jobject /* obj */)
{
if (!sAGpsInterface) {
@@ -779,7 +844,7 @@
sAGpsInterface->data_conn_closed();
}
-static void android_location_GpsLocationProvider_agps_data_conn_failed(JNIEnv* /* env */,
+static void android_location_GnssLocationProvider_agps_data_conn_failed(JNIEnv* /* env */,
jobject /* obj */)
{
if (!sAGpsInterface) {
@@ -789,7 +854,7 @@
sAGpsInterface->data_conn_failed();
}
-static void android_location_GpsLocationProvider_set_agps_server(JNIEnv* env, jobject /* obj */,
+static void android_location_GnssLocationProvider_set_agps_server(JNIEnv* env, jobject /* obj */,
jint type, jstring hostname, jint port)
{
if (!sAGpsInterface) {
@@ -801,7 +866,7 @@
env->ReleaseStringUTFChars(hostname, c_hostname);
}
-static void android_location_GpsLocationProvider_send_ni_response(JNIEnv* /* env */,
+static void android_location_GnssLocationProvider_send_ni_response(JNIEnv* /* env */,
jobject /* obj */, jint notifId, jint response)
{
if (!sGpsNiInterface) {
@@ -812,7 +877,7 @@
sGpsNiInterface->respond(notifId, response);
}
-static jstring android_location_GpsLocationProvider_get_internal_state(JNIEnv* env,
+static jstring android_location_GnssLocationProvider_get_internal_state(JNIEnv* env,
jobject /* obj */) {
jstring result = NULL;
if (sGpsDebugInterface) {
@@ -826,7 +891,7 @@
return result;
}
-static void android_location_GpsLocationProvider_update_network_state(JNIEnv* env, jobject /* obj */,
+static void android_location_GnssLocationProvider_update_network_state(JNIEnv* env, jobject /* obj */,
jboolean connected, jint type, jboolean roaming, jboolean available, jstring extraInfo, jstring apn)
{
@@ -849,13 +914,13 @@
}
}
-static jboolean android_location_GpsLocationProvider_is_geofence_supported(
+static jboolean android_location_GnssLocationProvider_is_geofence_supported(
JNIEnv* /* env */, jobject /* obj */)
{
return (sGpsGeofencingInterface != NULL) ? JNI_TRUE : JNI_FALSE;
}
-static jboolean android_location_GpsLocationProvider_add_geofence(JNIEnv* /* env */,
+static jboolean android_location_GnssLocationProvider_add_geofence(JNIEnv* /* env */,
jobject /* obj */, jint geofence_id, jdouble latitude, jdouble longitude, jdouble radius,
jint last_transition, jint monitor_transition, jint notification_responsiveness,
jint unknown_timer) {
@@ -870,7 +935,7 @@
return JNI_FALSE;
}
-static jboolean android_location_GpsLocationProvider_remove_geofence(JNIEnv* /* env */,
+static jboolean android_location_GnssLocationProvider_remove_geofence(JNIEnv* /* env */,
jobject /* obj */, jint geofence_id) {
if (sGpsGeofencingInterface != NULL) {
sGpsGeofencingInterface->remove_geofence_area(geofence_id);
@@ -881,7 +946,7 @@
return JNI_FALSE;
}
-static jboolean android_location_GpsLocationProvider_pause_geofence(JNIEnv* /* env */,
+static jboolean android_location_GnssLocationProvider_pause_geofence(JNIEnv* /* env */,
jobject /* obj */, jint geofence_id) {
if (sGpsGeofencingInterface != NULL) {
sGpsGeofencingInterface->pause_geofence(geofence_id);
@@ -892,7 +957,7 @@
return JNI_FALSE;
}
-static jboolean android_location_GpsLocationProvider_resume_geofence(JNIEnv* /* env */,
+static jboolean android_location_GnssLocationProvider_resume_geofence(JNIEnv* /* env */,
jobject /* obj */, jint geofence_id, jint monitor_transition) {
if (sGpsGeofencingInterface != NULL) {
sGpsGeofencingInterface->resume_geofence(geofence_id, monitor_transition);
@@ -903,10 +968,12 @@
return JNI_FALSE;
}
-static jobject translate_gps_clock(JNIEnv* env, GpsClock* clock) {
+static jobject translate_gps_clock(JNIEnv* env, void* data, size_t size) {
const char* doubleSignature = "(D)V";
const char* longSignature = "(J)V";
+ GpsClock* clock = reinterpret_cast<GpsClock*>(data);
+
jclass gpsClockClass = env->FindClass("android/location/GpsClock");
jmethodID gpsClockCtor = env->GetMethodID(gpsClockClass, "<init>", "()V");
@@ -958,11 +1025,23 @@
env->CallVoidMethod(gpsClockObject, setterMethod, clock->drift_uncertainty_nsps);
}
+ if (flags & GPS_CLOCK_TYPE_LOCAL_HW_TIME) {
+ if (size == sizeof(GpsClock)) {
+ jmethodID setterMethod =
+ env->GetMethodID(gpsClockClass,
+ "setTimeOfLastHwClockDiscontinuityInNs",
+ longSignature);
+ env->CallVoidMethod(gpsClockObject,
+ setterMethod,
+ clock->time_of_last_hw_clock_discontinuity_ns);
+ }
+ }
+
env->DeleteLocalRef(gpsClockClass);
return gpsClockObject;
}
-static jobject translate_gps_measurement(JNIEnv* env, GpsMeasurement* measurement) {
+static jobject translate_gps_measurement(JNIEnv* env, void* data, size_t size) {
const char* byteSignature = "(B)V";
const char* shortSignature = "(S)V";
const char* intSignature = "(I)V";
@@ -972,6 +1051,7 @@
jclass gpsMeasurementClass = env->FindClass("android/location/GpsMeasurement");
jmethodID gpsMeasurementCtor = env->GetMethodID(gpsMeasurementClass, "<init>", "()V");
+ GpsMeasurement* measurement = reinterpret_cast<GpsMeasurement*>(data);
jobject gpsMeasurementObject = env->NewObject(gpsMeasurementClass, gpsMeasurementCtor);
GpsMeasurementFlags flags = measurement->flags;
@@ -1205,12 +1285,38 @@
usedInFixSetterMethod,
(flags & GPS_MEASUREMENT_HAS_USED_IN_FIX) && measurement->used_in_fix);
+ if (size == sizeof(GpsMeasurement)) {
+ jmethodID setterMethod =
+ env->GetMethodID(gpsMeasurementClass,
+ "setPseudorangeRateCarrierInMetersPerSec",
+ doubleSignature);
+ env->CallVoidMethod(
+ gpsMeasurementObject,
+ setterMethod,
+ measurement->pseudorange_rate_carrier_mps);
+
+ setterMethod =
+ env->GetMethodID(gpsMeasurementClass,
+ "setPseudorangeRateCarrierUncertaintyInMetersPerSec",
+ doubleSignature);
+ env->CallVoidMethod(
+ gpsMeasurementObject,
+ setterMethod,
+ measurement->pseudorange_rate_carrier_uncertainty_mps);
+ }
+
env->DeleteLocalRef(gpsMeasurementClass);
return gpsMeasurementObject;
}
-static jobjectArray translate_gps_measurements(JNIEnv* env, GpsData* data) {
- size_t measurementCount = data->measurement_count;
+/**
+ * <T> can only be GpsData or GpsData_v1. Must rewrite this function if more
+ * types are introduced in the future releases.
+ */
+template<class T>
+static jobjectArray translate_gps_measurements(JNIEnv* env, void* data) {
+ T* gps_data = reinterpret_cast<T*>(data);
+ size_t measurementCount = gps_data->measurement_count;
if (measurementCount == 0) {
return NULL;
}
@@ -1221,9 +1327,11 @@
gpsMeasurementClass,
NULL /* initialElement */);
- GpsMeasurement* gpsMeasurements = data->measurements;
for (uint16_t i = 0; i < measurementCount; ++i) {
- jobject gpsMeasurement = translate_gps_measurement(env, &gpsMeasurements[i]);
+ jobject gpsMeasurement = translate_gps_measurement(
+ env,
+ &(gps_data->measurements[i]),
+ sizeof(gps_data->measurements[0]));
env->SetObjectArrayElement(gpsMeasurementArray, i, gpsMeasurement);
env->DeleteLocalRef(gpsMeasurement);
}
@@ -1238,33 +1346,39 @@
ALOGE("Invalid data provided to gps_measurement_callback");
return;
}
-
- if (data->size == sizeof(GpsData)) {
- jobject gpsClock = translate_gps_clock(env, &data->clock);
- jobjectArray measurementArray = translate_gps_measurements(env, data);
-
- jclass gpsMeasurementsEventClass = env->FindClass("android/location/GpsMeasurementsEvent");
- jmethodID gpsMeasurementsEventCtor = env->GetMethodID(
- gpsMeasurementsEventClass,
- "<init>",
- "(Landroid/location/GpsClock;[Landroid/location/GpsMeasurement;)V");
-
- jobject gpsMeasurementsEvent = env->NewObject(
- gpsMeasurementsEventClass,
- gpsMeasurementsEventCtor,
- gpsClock,
- measurementArray);
-
- env->CallVoidMethod(mCallbacksObj, method_reportMeasurementData, gpsMeasurementsEvent);
- checkAndClearExceptionFromCallback(env, __FUNCTION__);
-
- env->DeleteLocalRef(gpsClock);
- env->DeleteLocalRef(measurementArray);
- env->DeleteLocalRef(gpsMeasurementsEventClass);
- env->DeleteLocalRef(gpsMeasurementsEvent);
- } else {
+ if (data->size != sizeof(GpsData) && data->size != sizeof(GpsData_v1)) {
ALOGE("Invalid GpsData size found in gps_measurement_callback, size=%zd", data->size);
+ return;
}
+
+ jobject gpsClock;
+ jobjectArray measurementArray;
+ if (data->size == sizeof(GpsData)) {
+ gpsClock = translate_gps_clock(env, &data->clock, sizeof(GpsClock));
+ measurementArray = translate_gps_measurements<GpsData>(env, data);
+ } else {
+ gpsClock = translate_gps_clock(env, &data->clock, sizeof(GpsClock_v1));
+ measurementArray = translate_gps_measurements<GpsData_v1>(env, data);
+ }
+ jclass gpsMeasurementsEventClass = env->FindClass("android/location/GpsMeasurementsEvent");
+ jmethodID gpsMeasurementsEventCtor = env->GetMethodID(
+ gpsMeasurementsEventClass,
+ "<init>",
+ "(Landroid/location/GpsClock;[Landroid/location/GpsMeasurement;)V");
+
+ jobject gpsMeasurementsEvent = env->NewObject(
+ gpsMeasurementsEventClass,
+ gpsMeasurementsEventCtor,
+ gpsClock,
+ measurementArray);
+
+ env->CallVoidMethod(mCallbacksObj, method_reportMeasurementData, gpsMeasurementsEvent);
+ checkAndClearExceptionFromCallback(env, __FUNCTION__);
+
+ env->DeleteLocalRef(gpsClock);
+ env->DeleteLocalRef(measurementArray);
+ env->DeleteLocalRef(gpsMeasurementsEventClass);
+ env->DeleteLocalRef(gpsMeasurementsEvent);
}
GpsMeasurementCallbacks sGpsMeasurementCallbacks = {
@@ -1272,7 +1386,7 @@
measurement_callback,
};
-static jboolean android_location_GpsLocationProvider_is_measurement_supported(
+static jboolean android_location_GnssLocationProvider_is_measurement_supported(
JNIEnv* env,
jclass clazz) {
if (sGpsMeasurementInterface != NULL) {
@@ -1281,7 +1395,7 @@
return JNI_FALSE;
}
-static jboolean android_location_GpsLocationProvider_start_measurement_collection(
+static jboolean android_location_GnssLocationProvider_start_measurement_collection(
JNIEnv* env,
jobject obj) {
if (sGpsMeasurementInterface == NULL) {
@@ -1298,7 +1412,7 @@
return JNI_TRUE;
}
-static jboolean android_location_GpsLocationProvider_stop_measurement_collection(
+static jboolean android_location_GnssLocationProvider_stop_measurement_collection(
JNIEnv* env,
jobject obj) {
if (sGpsMeasurementInterface == NULL) {
@@ -1382,7 +1496,7 @@
navigation_message_callback,
};
-static jboolean android_location_GpsLocationProvider_is_navigation_message_supported(
+static jboolean android_location_GnssLocationProvider_is_navigation_message_supported(
JNIEnv* env,
jclass clazz) {
if(sGpsNavigationMessageInterface != NULL) {
@@ -1391,7 +1505,7 @@
return JNI_FALSE;
}
-static jboolean android_location_GpsLocationProvider_start_navigation_message_collection(
+static jboolean android_location_GnssLocationProvider_start_navigation_message_collection(
JNIEnv* env,
jobject obj) {
if (sGpsNavigationMessageInterface == NULL) {
@@ -1408,7 +1522,7 @@
return JNI_TRUE;
}
-static jboolean android_location_GpsLocationProvider_stop_navigation_message_collection(
+static jboolean android_location_GnssLocationProvider_stop_navigation_message_collection(
JNIEnv* env,
jobject obj) {
if (sGpsNavigationMessageInterface == NULL) {
@@ -1420,7 +1534,7 @@
return JNI_TRUE;
}
-static void android_location_GpsLocationProvider_configuration_update(JNIEnv* env, jobject obj,
+static void android_location_GnssLocationProvider_configuration_update(JNIEnv* env, jobject obj,
jstring config_content)
{
if (!sGnssConfigurationInterface) {
@@ -1436,105 +1550,105 @@
static const JNINativeMethod sMethods[] = {
/* name, signature, funcPtr */
- {"class_init_native", "()V", (void *)android_location_GpsLocationProvider_class_init_native},
- {"native_is_supported", "()Z", (void*)android_location_GpsLocationProvider_is_supported},
+ {"class_init_native", "()V", (void *)android_location_GnssLocationProvider_class_init_native},
+ {"native_is_supported", "()Z", (void*)android_location_GnssLocationProvider_is_supported},
{"native_is_agps_ril_supported", "()Z",
- (void*)android_location_GpsLocationProvider_is_agps_ril_supported},
+ (void*)android_location_GnssLocationProvider_is_agps_ril_supported},
{"native_is_gnss_configuration_supported", "()Z",
(void*)android_location_gpsLocationProvider_is_gnss_configuration_supported},
- {"native_init", "()Z", (void*)android_location_GpsLocationProvider_init},
- {"native_cleanup", "()V", (void*)android_location_GpsLocationProvider_cleanup},
+ {"native_init", "()Z", (void*)android_location_GnssLocationProvider_init},
+ {"native_cleanup", "()V", (void*)android_location_GnssLocationProvider_cleanup},
{"native_set_position_mode",
"(IIIII)Z",
- (void*)android_location_GpsLocationProvider_set_position_mode},
- {"native_start", "()Z", (void*)android_location_GpsLocationProvider_start},
- {"native_stop", "()Z", (void*)android_location_GpsLocationProvider_stop},
+ (void*)android_location_GnssLocationProvider_set_position_mode},
+ {"native_start", "()Z", (void*)android_location_GnssLocationProvider_start},
+ {"native_stop", "()Z", (void*)android_location_GnssLocationProvider_stop},
{"native_delete_aiding_data",
"(I)V",
- (void*)android_location_GpsLocationProvider_delete_aiding_data},
+ (void*)android_location_GnssLocationProvider_delete_aiding_data},
{"native_read_sv_status",
"([I[F[F[F[I)I",
- (void*)android_location_GpsLocationProvider_read_sv_status},
- {"native_read_nmea", "([BI)I", (void*)android_location_GpsLocationProvider_read_nmea},
- {"native_inject_time", "(JJI)V", (void*)android_location_GpsLocationProvider_inject_time},
+ (void*)android_location_GnssLocationProvider_read_sv_status},
+ {"native_read_nmea", "([BI)I", (void*)android_location_GnssLocationProvider_read_nmea},
+ {"native_inject_time", "(JJI)V", (void*)android_location_GnssLocationProvider_inject_time},
{"native_inject_location",
"(DDF)V",
- (void*)android_location_GpsLocationProvider_inject_location},
- {"native_supports_xtra", "()Z", (void*)android_location_GpsLocationProvider_supports_xtra},
+ (void*)android_location_GnssLocationProvider_inject_location},
+ {"native_supports_xtra", "()Z", (void*)android_location_GnssLocationProvider_supports_xtra},
{"native_inject_xtra_data",
"([BI)V",
- (void*)android_location_GpsLocationProvider_inject_xtra_data},
+ (void*)android_location_GnssLocationProvider_inject_xtra_data},
{"native_agps_data_conn_open",
"(Ljava/lang/String;I)V",
- (void*)android_location_GpsLocationProvider_agps_data_conn_open},
+ (void*)android_location_GnssLocationProvider_agps_data_conn_open},
{"native_agps_data_conn_closed",
"()V",
- (void*)android_location_GpsLocationProvider_agps_data_conn_closed},
+ (void*)android_location_GnssLocationProvider_agps_data_conn_closed},
{"native_agps_data_conn_failed",
"()V",
- (void*)android_location_GpsLocationProvider_agps_data_conn_failed},
+ (void*)android_location_GnssLocationProvider_agps_data_conn_failed},
{"native_agps_set_id",
"(ILjava/lang/String;)V",
- (void*)android_location_GpsLocationProvider_agps_set_id},
+ (void*)android_location_GnssLocationProvider_agps_set_id},
{"native_agps_set_ref_location_cellid",
"(IIIII)V",
- (void*)android_location_GpsLocationProvider_agps_set_reference_location_cellid},
+ (void*)android_location_GnssLocationProvider_agps_set_reference_location_cellid},
{"native_set_agps_server",
"(ILjava/lang/String;I)V",
- (void*)android_location_GpsLocationProvider_set_agps_server},
+ (void*)android_location_GnssLocationProvider_set_agps_server},
{"native_send_ni_response",
"(II)V",
- (void*)android_location_GpsLocationProvider_send_ni_response},
+ (void*)android_location_GnssLocationProvider_send_ni_response},
{"native_agps_ni_message",
"([BI)V",
- (void *)android_location_GpsLocationProvider_agps_send_ni_message},
+ (void *)android_location_GnssLocationProvider_agps_send_ni_message},
{"native_get_internal_state",
"()Ljava/lang/String;",
- (void*)android_location_GpsLocationProvider_get_internal_state},
+ (void*)android_location_GnssLocationProvider_get_internal_state},
{"native_update_network_state",
"(ZIZZLjava/lang/String;Ljava/lang/String;)V",
- (void*)android_location_GpsLocationProvider_update_network_state },
+ (void*)android_location_GnssLocationProvider_update_network_state },
{"native_is_geofence_supported",
"()Z",
- (void*) android_location_GpsLocationProvider_is_geofence_supported},
+ (void*) android_location_GnssLocationProvider_is_geofence_supported},
{"native_add_geofence",
"(IDDDIIII)Z",
- (void *)android_location_GpsLocationProvider_add_geofence},
+ (void *)android_location_GnssLocationProvider_add_geofence},
{"native_remove_geofence",
"(I)Z",
- (void *)android_location_GpsLocationProvider_remove_geofence},
- {"native_pause_geofence", "(I)Z", (void *)android_location_GpsLocationProvider_pause_geofence},
+ (void *)android_location_GnssLocationProvider_remove_geofence},
+ {"native_pause_geofence", "(I)Z", (void *)android_location_GnssLocationProvider_pause_geofence},
{"native_resume_geofence",
"(II)Z",
- (void *)android_location_GpsLocationProvider_resume_geofence},
+ (void *)android_location_GnssLocationProvider_resume_geofence},
{"native_is_measurement_supported",
"()Z",
- (void*) android_location_GpsLocationProvider_is_measurement_supported},
+ (void*) android_location_GnssLocationProvider_is_measurement_supported},
{"native_start_measurement_collection",
"()Z",
- (void*) android_location_GpsLocationProvider_start_measurement_collection},
+ (void*) android_location_GnssLocationProvider_start_measurement_collection},
{"native_stop_measurement_collection",
"()Z",
- (void*) android_location_GpsLocationProvider_stop_measurement_collection},
+ (void*) android_location_GnssLocationProvider_stop_measurement_collection},
{"native_is_navigation_message_supported",
"()Z",
- (void*) android_location_GpsLocationProvider_is_navigation_message_supported},
+ (void*) android_location_GnssLocationProvider_is_navigation_message_supported},
{"native_start_navigation_message_collection",
"()Z",
- (void*) android_location_GpsLocationProvider_start_navigation_message_collection},
+ (void*) android_location_GnssLocationProvider_start_navigation_message_collection},
{"native_stop_navigation_message_collection",
"()Z",
- (void*) android_location_GpsLocationProvider_stop_navigation_message_collection},
+ (void*) android_location_GnssLocationProvider_stop_navigation_message_collection},
{"native_configuration_update",
"(Ljava/lang/String;)V",
- (void*)android_location_GpsLocationProvider_configuration_update},
+ (void*)android_location_GnssLocationProvider_configuration_update},
};
-int register_android_server_location_GpsLocationProvider(JNIEnv* env)
+int register_android_server_location_GnssLocationProvider(JNIEnv* env)
{
return jniRegisterNativeMethods(
env,
- "com/android/server/location/GpsLocationProvider",
+ "com/android/server/location/GnssLocationProvider",
sMethods,
NELEM(sMethods));
}
diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp
index 1f3fde6..a7010bc 100644
--- a/services/core/jni/onload.cpp
+++ b/services/core/jni/onload.cpp
@@ -36,7 +36,7 @@
int register_android_server_UsbMidiDevice(JNIEnv* env);
int register_android_server_UsbHostManager(JNIEnv* env);
int register_android_server_VibratorService(JNIEnv* env);
-int register_android_server_location_GpsLocationProvider(JNIEnv* env);
+int register_android_server_location_GnssLocationProvider(JNIEnv* env);
int register_android_server_location_FlpHardwareProvider(JNIEnv* env);
int register_android_server_connectivity_Vpn(JNIEnv* env);
int register_android_server_hdmi_HdmiCecController(JNIEnv* env);
@@ -71,7 +71,7 @@
register_android_server_UsbHostManager(env);
register_android_server_VibratorService(env);
register_android_server_SystemServer(env);
- register_android_server_location_GpsLocationProvider(env);
+ register_android_server_location_GnssLocationProvider(env);
register_android_server_location_FlpHardwareProvider(env);
register_android_server_connectivity_Vpn(env);
register_android_server_AssetAtlasService(env);
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 4bda7d9..b94e6d6 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -1983,7 +1983,7 @@
final ResolveInfo ri = infos.get(0);
if (!permission.BIND_DEVICE_ADMIN.equals(ri.activityInfo.permission)) {
- final String message = "DeviceAdminReceiver " + adminName + " must be protected with"
+ final String message = "DeviceAdminReceiver " + adminName + " must be protected with "
+ permission.BIND_DEVICE_ADMIN;
Slog.w(LOG_TAG, message);
if (throwForMissiongPermission &&
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 361c251..9f320e4 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -979,6 +979,7 @@
Slog.i(TAG, "Gesture Launcher Service");
mSystemServiceManager.startService(GestureLauncherService.class);
}
+ mSystemServiceManager.startService(SensorNotificationService.class);
}
traceBeginAndSlog("StartDiskStatsService");
diff --git a/telecomm/java/android/telecom/CallScreeningService.java b/telecomm/java/android/telecom/CallScreeningService.java
index 1b6e162..f62b170 100644
--- a/telecomm/java/android/telecom/CallScreeningService.java
+++ b/telecomm/java/android/telecom/CallScreeningService.java
@@ -89,7 +89,7 @@
/*
* Information about how to respond to an incoming call.
*/
- public class CallResponse {
+ public static class CallResponse {
private final boolean mShouldDisallowCall;
private final boolean mShouldRejectCall;
private final boolean mShouldSkipCallLog;
@@ -140,7 +140,7 @@
return mShouldSkipNotification;
}
- public class Builder {
+ public static class Builder {
private boolean mShouldDisallowCall;
private boolean mShouldRejectCall;
private boolean mShouldSkipCallLog;
diff --git a/telephony/java/android/telephony/ModemActivityInfo.java b/telephony/java/android/telephony/ModemActivityInfo.java
index ea96e7c..c65e8ba 100644
--- a/telephony/java/android/telephony/ModemActivityInfo.java
+++ b/telephony/java/android/telephony/ModemActivityInfo.java
@@ -58,6 +58,7 @@
return "ModemActivityInfo{"
+ " mTimestamp=" + mTimestamp
+ " mSleepTimeMs=" + mSleepTimeMs
+ + " mIdleTimeMs=" + mIdleTimeMs
+ " mTxTimeMs[]=" + Arrays.toString(mTxTimeMs)
+ " mRxTimeMs=" + mRxTimeMs
+ " mEnergyUsed=" + mEnergyUsed
@@ -153,7 +154,7 @@
for (int i = 0; i < TX_POWER_LEVELS; i++) {
totalTxTimeMs += txTime[i];
}
- return ((getIdleTimeMillis() != 0) || (totalTxTimeMs != 0)
- || (getSleepTimeMillis() != 0) || (getIdleTimeMillis() != 0));
+ return ((getIdleTimeMillis() >= 0) && (totalTxTimeMs >= 0)
+ && (getSleepTimeMillis() >= 0) && (getIdleTimeMillis() >= 0));
}
}
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index b089387..962a600 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -1857,9 +1857,6 @@
// to the list.
number = extractNetworkPortionAlt(number);
- Rlog.d(LOG_TAG, "subId:" + subId + ", defaultCountryIso:" +
- ((defaultCountryIso == null) ? "NULL" : defaultCountryIso));
-
String emergencyNumbers = "";
int slotId = SubscriptionManager.getSlotId(subId);
@@ -1869,7 +1866,8 @@
emergencyNumbers = SystemProperties.get(ecclist, "");
- Rlog.d(LOG_TAG, "slotId:" + slotId + ", emergencyNumbers: " + emergencyNumbers);
+ Rlog.d(LOG_TAG, "slotId:" + slotId + " subId:" + subId + " country:"
+ + defaultCountryIso + " emergencyNumbers: " + emergencyNumbers);
if (TextUtils.isEmpty(emergencyNumbers)) {
// then read-only ecclist property since old RIL only uses this
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index c680999..ad007c6 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -37,6 +37,7 @@
static final String LOG_TAG = "PHONE";
static final boolean DBG = true;
+ static final boolean VDBG = false; // STOPSHIP if true
/**
* Normal operation condition, the phone is registered
@@ -829,7 +830,7 @@
/** @hide */
public void setDataRegState(int state) {
mDataRegState = state;
- if (DBG) Rlog.d(LOG_TAG, "[ServiceState] setDataRegState=" + mDataRegState);
+ if (VDBG) Rlog.d(LOG_TAG, "[ServiceState] setDataRegState=" + mDataRegState);
}
public void setRoaming(boolean roaming) {
@@ -1017,7 +1018,8 @@
/** @hide */
public void setRilDataRadioTechnology(int rt) {
this.mRilDataRadioTechnology = rt;
- if (DBG) Rlog.d(LOG_TAG, "[ServiceState] setDataRadioTechnology=" + mRilDataRadioTechnology);
+ if (VDBG) Rlog.d(LOG_TAG, "[ServiceState] setRilDataRadioTechnology=" +
+ mRilDataRadioTechnology);
}
/** @hide */
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index 3c4c04b..7d5645e 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -336,6 +336,8 @@
int RIL_REQUEST_PULL_LCEDATA = 134;
int RIL_REQUEST_GET_ACTIVITY_INFO = 135;
+ int RIL_RESPONSE_ACKNOWLEDGEMENT = 800;
+
int RIL_UNSOL_RESPONSE_BASE = 1000;
int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000;
int RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED = 1001;
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 274e985..4c22460 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -704,24 +704,6 @@
*/
public int numUserTriggeredJoinAttempts;
- /**
- * @hide
- * Connect choices
- *
- * remember the keys identifying the known WifiConfiguration over which this configuration
- * was preferred by user or a "WiFi Network Management app", that is,
- * a WifiManager.CONNECT_NETWORK or SELECT_NETWORK was received while this configuration
- * was visible to the user:
- * configKey is : "SSID"-WEP-WPA_PSK-WPA_EAP
- *
- * The integer represents the configuration's RSSI at that time (useful?)
- *
- * The overall auto-join algorithm make use of past connect choice so as to sort configuration,
- * the exact algorithm still fluctuating as of 5/7/2014
- *
- */
- public HashMap<String, Integer> connectChoices;
-
/** @hide
* Boost given to RSSI on a home network for the purpose of calculating the score
* This adds stickiness to home networks, as defined by:
@@ -831,6 +813,16 @@
*/
public static final long INVALID_NETWORK_SELECTION_DISABLE_TIMESTAMP = -1L;
+ /**
+ * This constant indicates the current configuration has connect choice set
+ */
+ private static final int CONNECT_CHOICE_EXISTS = 1;
+
+ /**
+ * This constant indicates the current configuration does not have connect choice set
+ */
+ private static final int CONNECT_CHOICE_NOT_EXISTS = -1;
+
// fields for QualityNetwork Selection
/**
* Network selection status, should be in one of three status: enable, temporaily disabled
@@ -854,7 +846,128 @@
private int[] mNetworkSeclectionDisableCounter = new int[NETWORK_SELECTION_DISABLED_MAX];
/**
- * return current Quality network selection status in String (for debug purpose)
+ * Connect Choice over this configuration
+ *
+ * When current wifi configuration is visible to the user but user explicitly choose to
+ * connect to another network X, the another networks X's configure key will be stored here.
+ * We will consider user has a preference of X over this network. And in the future,
+ * network selection will always give X a higher preference over this configuration.
+ * configKey is : "SSID"-WEP-WPA_PSK-WPA_EAP
+ */
+ private String mConnectChoice;
+
+ /**
+ * The system timestamp when we records the connectChoice. This value is obtained from
+ * System.currentTimeMillis
+ */
+ private long mConnectChoiceTimestamp = INVALID_NETWORK_SELECTION_DISABLE_TIMESTAMP;
+
+ /**
+ * Used to cache the temporary candidate during the network selection procedure. It will be
+ * kept updating once a new scan result has a higher score than current one
+ */
+ private ScanResult mCandidate;
+
+ /**
+ * Used to cache the score of the current temporary candidate during the network
+ * selection procedure.
+ */
+ private int mCandidateScore;
+
+ /**
+ * Indicate whether this network is visible in latest Qualified Network Selection. This
+ * means there is scan result found related to this Configuration and meet the minimum
+ * requirement. The saved network need not join latest Qualified Network Selection. For
+ * example, it is disabled. True means network is visible in latest Qualified Network
+ * Selection and false means network is invisible
+ */
+ private boolean mSeenInLastQualifiedNetworkSelection;
+
+ /**
+ * set whether this network is visible in latest Qualified Network Selection
+ * @param seen value set to candidate
+ */
+ public void setSeenInLastQualifiedNetworkSelection(boolean seen) {
+ mSeenInLastQualifiedNetworkSelection = seen;
+ }
+
+ /**
+ * get whether this network is visible in latest Qualified Network Selection
+ * @return returns true -- network is visible in latest Qualified Network Selection
+ * false -- network is invisible in latest Qualified Network Selection
+ */
+ public boolean getSeenInLastQualifiedNetworkSelection() {
+ return mSeenInLastQualifiedNetworkSelection;
+ }
+ /**
+ * set the temporary candidate of current network selection procedure
+ * @param scanCandidate {@link ScanResult} the candidate set to mCandidate
+ */
+ public void setCandidate(ScanResult scanCandidate) {
+ mCandidate = scanCandidate;
+ }
+
+ /**
+ * get the temporary candidate of current network selection procedure
+ * @return returns {@link ScanResult} temporary candidate of current network selection
+ * procedure
+ */
+ public ScanResult getCandidate() {
+ return mCandidate;
+ }
+
+ /**
+ * set the score of the temporary candidate of current network selection procedure
+ * @param score value set to mCandidateScore
+ */
+ public void setCandidateScore(int score) {
+ mCandidateScore = score;
+ }
+
+ /**
+ * get the score of the temporary candidate of current network selection procedure
+ * @return returns score of the temporary candidate of current network selection procedure
+ */
+ public int getCandidateScore() {
+ return mCandidateScore;
+ }
+
+ /**
+ * get user preferred choice over this configuration
+ *@return returns configKey of user preferred choice over this configuration
+ */
+ public String getConnectChoice() {
+ return mConnectChoice;
+ }
+
+ /**
+ * set user preferred choice over this configuration
+ * @param newConnectChoice, the configKey of user preferred choice over this configuration
+ */
+ public void setConnectChoice(String newConnectChoice) {
+ mConnectChoice = newConnectChoice;
+ }
+
+ /**
+ * get the timeStamp when user select a choice over this configuration
+ * @return returns when current connectChoice is set (time from System.currentTimeMillis)
+ */
+ public long getConnectChoiceTimestamp() {
+ return mConnectChoiceTimestamp;
+ }
+
+ /**
+ * set the timeStamp when user select a choice over this configuration
+ * @param timeStamp, the timestamp set to connectChoiceTimestamp, expected timestamp should
+ * be obtained from System.currentTimeMillis
+ */
+ public void setConnectChoiceTimestamp(long timeStamp) {
+ mConnectChoiceTimestamp = timeStamp;
+ }
+
+ /**
+ * get current Quality network selection status
+ * @return returns current Quality network selection status in String (for debug purpose)
*/
public String getNetworkStatusString() {
return QUALITY_NETWORK_SELECTION_STATUS[mStatus];
@@ -874,6 +987,7 @@
}
}
/**
+ * get current network disable reason
* @return current network disable reason in String (for debug purpose)
*/
public String getNetworkDisableReasonString() {
@@ -882,6 +996,7 @@
/**
* get current network network selection status
+ * @return return current network network selection status
*/
public int getNetworkSelectionStatus() {
return mStatus;
@@ -901,12 +1016,14 @@
}
/**
- * return whether current network is permanently disabled
+ * @return returns whether current network is permanently disabled
*/
public boolean isNetworkPermanentlyDisabled() {
return mStatus == NETWORK_SELECTION_PERMANENTLY_DISABLED;
}
+
/**
+ * set current networ work selection status
* @param status network selection status to set
*/
public void setNetworkSelectionStatus(int status) {
@@ -914,14 +1031,16 @@
mStatus = status;
}
}
+
/**
- * @return current network's disable reason
+ * @return returns current network's disable reason
*/
public int getNetworkSelectionDisableReason() {
return mNetworkSelectionDisableReason;
}
/**
+ * set Network disable reason
* @param reason Network disable reason
*/
public void setNetworkSelectionDisableReason(int reason) {
@@ -931,12 +1050,17 @@
throw new IllegalArgumentException("Illegal reason value: " + reason);
}
}
+
/**
- * @param reason whether current network is disabled by this reason
+ * check whether network is disabled by this reason
+ * @param reason a specific disable reason
+ * @return true -- network is disabled for this reason
+ * false -- network is not disabled for this reason
*/
public boolean isDisabledByReason(int reason) {
return mNetworkSelectionDisableReason == reason;
}
+
/**
* @param timeStamp Set when current network is disabled in millisecond since January 1,
* 1970 00:00:00.0 UTC
@@ -946,7 +1070,7 @@
}
/**
- * @return Get when current network is disabled in millisecond since January 1,
+ * @return returns when current network is disabled in millisecond since January 1,
* 1970 00:00:00.0 UTC
*/
public long getDisableTime() {
@@ -954,6 +1078,7 @@
}
/**
+ * get the disable counter of a specific reason
* @param reason specific failure reason
* @exception throw IllegalArgumentException for illegal input
* @return counter number for specific error reason.
@@ -992,6 +1117,7 @@
throw new IllegalArgumentException("Illegal reason value: " + reason);
}
}
+
/**
* clear the counter of a specific failure reason
* @hide
@@ -1005,6 +1131,7 @@
throw new IllegalArgumentException("Illegal reason value: " + reason);
}
}
+
/**
* clear all the failure reason counters
*/
@@ -1043,6 +1170,8 @@
}
mTemporarilyDisabledTimestamp = source.mTemporarilyDisabledTimestamp;
mNetworkSelectionBSSID = source.mNetworkSelectionBSSID;
+ setConnectChoice(source.getConnectChoice());
+ setConnectChoiceTimestamp(source.getConnectChoiceTimestamp());
}
public void writeToParcel(Parcel dest) {
@@ -1054,6 +1183,13 @@
}
dest.writeLong(getDisableTime());
dest.writeString(getNetworkSelectionBSSID());
+ if (getConnectChoice() != null) {
+ dest.writeInt(CONNECT_CHOICE_EXISTS);
+ dest.writeString(getConnectChoice());
+ dest.writeLong(getConnectChoiceTimestamp());
+ } else {
+ dest.writeInt(CONNECT_CHOICE_NOT_EXISTS);
+ }
}
public void readFromParcel(Parcel in) {
@@ -1065,6 +1201,13 @@
}
setDisableTime(in.readLong());
setNetworkSelectionBSSID(in.readString());
+ if (in.readInt() == CONNECT_CHOICE_EXISTS) {
+ setConnectChoice(in.readString());
+ setConnectChoiceTimestamp(in.readLong());
+ } else {
+ setConnectChoice(null);
+ setConnectChoiceTimestamp(INVALID_NETWORK_SELECTION_DISABLE_TIMESTAMP);
+ }
}
}
@@ -1184,7 +1327,11 @@
}
}
}
-
+ if (mNetworkSelectionStatus.getConnectChoice() != null) {
+ sbuf.append(" connect choice: ").append(mNetworkSelectionStatus.getConnectChoice());
+ sbuf.append(" connect choice set time: ").append(mNetworkSelectionStatus
+ .getConnectChoiceTimestamp());
+ }
if (this.numAssociation > 0) {
sbuf.append(" numAssociation ").append(this.numAssociation).append("\n");
@@ -1336,16 +1483,7 @@
sbuf.append('\n');
}
}
- if (this.connectChoices != null) {
- for(String key : this.connectChoices.keySet()) {
- Integer choice = this.connectChoices.get(key);
- if (choice != null) {
- sbuf.append(" choice: ").append(key);
- sbuf.append(" = ").append(choice);
- sbuf.append('\n');
- }
- }
- }
+
sbuf.append("triggeredLow: ").append(this.numUserTriggeredWifiDisableLowRSSI);
sbuf.append(" triggeredBad: ").append(this.numUserTriggeredWifiDisableBadRSSI);
sbuf.append(" triggeredNotHigh: ").append(this.numUserTriggeredWifiDisableNotHighRSSI);
@@ -1632,11 +1770,6 @@
mIpConfiguration = new IpConfiguration(source.mIpConfiguration);
- if ((source.connectChoices != null) && (source.connectChoices.size() > 0)) {
- connectChoices = new HashMap<String, Integer>();
- connectChoices.putAll(source.connectChoices);
- }
-
if ((source.linkedConfigurations != null)
&& (source.linkedConfigurations.size() > 0)) {
linkedConfigurations = new HashMap<String, Integer>();