Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev

Browse Source 
am: cf1268a5f5

Change-Id: I294286840c969fba42ff2814423ae4dbd81a8577
This commit is contained in:
Blake Kragten
2019-09-06 11:03:30 -07:00
committed by android-build-merger
parent a5c53a01ae cf1268a5f5
commit da96cb4086
5 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/app/IBatteryStats.aidl
View File

@@ -106,7 +106,7 @@ interface IBatteryStats {
void notePhoneOn();
void notePhoneOff();
void notePhoneSignalStrength(in SignalStrength signalStrength);
void notePhoneDataConnectionState(int dataType, boolean hasData);
void notePhoneDataConnectionState(int dataType, boolean hasData, int serviceType);
void notePhoneState(int phoneState);
void noteWifiOn();
void noteWifiOff();

32
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -906,8 +906,6 @@ public class BatteryStatsImpl extends BatteryStats {
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
protected StopwatchTimer mBluetoothScanTimer;
boolean mIsCellularTxPowerHigh = false;
int mMobileRadioPowerState = DataConnectionRealTimeInfo.DC_POWER_STATE_LOW;
long mMobileRadioActiveStartTime;
StopwatchTimer mMobileRadioActiveTimer;
@@ -5261,16 +5259,26 @@ public class BatteryStatsImpl extends BatteryStats {
}
@UnsupportedAppUsage
public void notePhoneDataConnectionStateLocked(int dataType, boolean hasData) {
public void notePhoneDataConnectionStateLocked(int dataType, boolean hasData, int serviceType) {
// BatteryStats uses 0 to represent no network type.
// Telephony does not have a concept of no network type, and uses 0 to represent unknown.
// Unknown is included in DATA_CONNECTION_OTHER.
int bin = DATA_CONNECTION_NONE;
int bin = DATA_CONNECTION_OUT_OF_SERVICE;
if (hasData) {
if (dataType > 0 && dataType <= TelephonyManager.MAX_NETWORK_TYPE) {
bin = dataType;
} else {
bin = DATA_CONNECTION_OTHER;
switch (serviceType) {
case ServiceState.STATE_OUT_OF_SERVICE:
bin = DATA_CONNECTION_OUT_OF_SERVICE;
break;
case ServiceState.STATE_EMERGENCY_ONLY:
bin = DATA_CONNECTION_EMERGENCY_SERVICE;
break;
default:
bin = DATA_CONNECTION_OTHER;
break;
}
}
}
if (DEBUG) Log.i(TAG, "Phone Data Connection -> " + dataType + " = " + hasData);
@@ -11190,19 +11198,9 @@ public class BatteryStatsImpl extends BatteryStats {
}
}
if (levelMaxTimeSpent == ModemActivityInfo.TX_POWER_LEVELS - 1) {
if (!mIsCellularTxPowerHigh) {
mHistoryCur.states2 |= HistoryItem.STATE2_CELLULAR_HIGH_TX_POWER_FLAG;
addHistoryRecordLocked(elapsedRealtime, uptime);
mIsCellularTxPowerHigh = true;
}
return;
}
if (mIsCellularTxPowerHigh) {
mHistoryCur.states2 &= ~HistoryItem.STATE2_CELLULAR_HIGH_TX_POWER_FLAG;
mHistoryCur.states2 |= HistoryItem.STATE2_CELLULAR_HIGH_TX_POWER_FLAG;
addHistoryRecordLocked(elapsedRealtime, uptime);
mIsCellularTxPowerHigh = false;
}
return;
}
private final class BluetoothActivityInfoCache {
@@ -13660,7 +13658,6 @@ public class BatteryStatsImpl extends BatteryStats {
mCameraOnTimer.readSummaryFromParcelLocked(in);
mBluetoothScanNesting = 0;
mBluetoothScanTimer.readSummaryFromParcelLocked(in);
mIsCellularTxPowerHigh = false;
int NRPMS = in.readInt();
if (NRPMS > 10000) {
@@ -14644,7 +14641,6 @@ public class BatteryStatsImpl extends BatteryStats {
mCameraOnTimer = new StopwatchTimer(mClocks, null, -13, null, mOnBatteryTimeBase, in);
mBluetoothScanNesting = 0;
mBluetoothScanTimer = new StopwatchTimer(mClocks, null, -14, null, mOnBatteryTimeBase, in);
mIsCellularTxPowerHigh = false;
mDischargeUnplugLevel = in.readInt();
mDischargePlugLevel = in.readInt();
mDischargeCurrentLevel = in.readInt();