Snap for 8625096 from 8c8ae09272
to tm-qpr1-release
Change-Id: Ie911f57d7ae99b0a14690c202ebb6aea6074009b
This commit is contained in:
commit
12a6105716
4 changed files with 18 additions and 4 deletions
|
@ -63,6 +63,8 @@
|
||||||
<permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="false"/>
|
<permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="false"/>
|
||||||
<!-- Used to call ActivityTransition API for Smart PNO -->
|
<!-- Used to call ActivityTransition API for Smart PNO -->
|
||||||
<permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
|
<permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
|
||||||
|
<!-- Notifications -->
|
||||||
|
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
|
||||||
</exception>
|
</exception>
|
||||||
|
|
||||||
<exception
|
<exception
|
||||||
|
|
|
@ -882,6 +882,8 @@ SUPPORT_NR := true
|
||||||
SUPPORT_NR_DS := true
|
SUPPORT_NR_DS := true
|
||||||
# Using IRadio 2.0
|
# Using IRadio 2.0
|
||||||
USE_RADIO_HAL_2_0 := true
|
USE_RADIO_HAL_2_0 := true
|
||||||
|
# Using Early Send Device Info
|
||||||
|
USE_EARLY_SEND_DEVICE_INFO := true
|
||||||
|
|
||||||
#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk)
|
#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk)
|
||||||
#$(call inherit-product, vendor/google_devices/gs201/proprietary/device-vendor.mk)
|
#$(call inherit-product, vendor/google_devices/gs201/proprietary/device-vendor.mk)
|
||||||
|
@ -1111,8 +1113,8 @@ PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
|
||||||
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs201/device_framework_matrix_product.xml
|
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs201/device_framework_matrix_product.xml
|
||||||
|
|
||||||
# Preopt SystemUI
|
# Preopt SystemUI
|
||||||
PRODUCT_DEXPREOPT_SPEED_APPS += \
|
PRODUCT_DEXPREOPT_SPEED_APPS += SystemUIGoogle # For internal
|
||||||
SystemUIGoogle
|
PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI # For AOSP
|
||||||
|
|
||||||
# Compile SystemUI on device with `speed`.
|
# Compile SystemUI on device with `speed`.
|
||||||
PRODUCT_PROPERTY_OVERRIDES += \
|
PRODUCT_PROPERTY_OVERRIDES += \
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
</interface>
|
</interface>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl" optional="true">
|
<hal format="hidl" optional="true">
|
||||||
<name>com.fingerprints35.extension</name>
|
<name>com.fingerprints42.extension</name>
|
||||||
<version>1.0</version>
|
<version>1.0</version>
|
||||||
<interface>
|
<interface>
|
||||||
<name>IFingerprintAuthenticator</name>
|
<name>IFingerprintAuthenticator</name>
|
||||||
|
@ -141,6 +141,14 @@
|
||||||
<instance>default</instance>
|
<instance>default</instance>
|
||||||
</interface>
|
</interface>
|
||||||
</hal>
|
</hal>
|
||||||
|
<hal format="hidl" optional="true">
|
||||||
|
<name>hardware.google.bluetooth.ext</name>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>IBluetoothExt</name>
|
||||||
|
<instance>default</instance>
|
||||||
|
</interface>
|
||||||
|
</hal>
|
||||||
<hal format="hidl">
|
<hal format="hidl">
|
||||||
<name>hardware.google.bluetooth.ccc</name>
|
<name>hardware.google.bluetooth.ccc</name>
|
||||||
<version>1.1</version>
|
<version>1.1</version>
|
||||||
|
|
|
@ -145,6 +145,7 @@ void private_healthd_board_init(struct healthd_config *hc) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int private_healthd_board_battery_update(HealthInfo *health_info) {
|
int private_healthd_board_battery_update(HealthInfo *health_info) {
|
||||||
|
int batt_level;
|
||||||
deviceHealth.update(health_info);
|
deviceHealth.update(health_info);
|
||||||
battThermalControl.updateThermalState(*health_info);
|
battThermalControl.updateThermalState(*health_info);
|
||||||
battMetricsLogger.logBatteryProperties(*health_info);
|
battMetricsLogger.logBatteryProperties(*health_info);
|
||||||
|
@ -153,8 +154,9 @@ int private_healthd_board_battery_update(HealthInfo *health_info) {
|
||||||
ChargerDetect::onlineUpdate(health_info);
|
ChargerDetect::onlineUpdate(health_info);
|
||||||
battDefender.update(health_info);
|
battDefender.update(health_info);
|
||||||
|
|
||||||
|
batt_level = (health_info->batteryStatus == ::aidl::android::hardware::health::BatteryStatus::FULL) ? 101 : health_info->batteryLevel;
|
||||||
if (needs_wlc_updates &&
|
if (needs_wlc_updates &&
|
||||||
!android::base::WriteStringToFile(std::to_string(health_info->batteryLevel), kWlcCapacity))
|
!android::base::WriteStringToFile(std::to_string(batt_level), kWlcCapacity))
|
||||||
LOG(INFO) << "Unable to write battery level to wireless capacity";
|
LOG(INFO) << "Unable to write battery level to wireless capacity";
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue