Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE
Change-Id: I8991be43dc5a9280b4074311c2710b0c2cb65c5f
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 767f08b..4e2eb7c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -54,6 +54,8 @@
TARGET_RECOVERY_FSTAB = device/samsung/manta/fstab.manta
TARGET_USERIMAGES_USE_EXT4 := true
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 685768704
+# Disable journaling on system.img to save space.
+BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0
BOARD_USERDATAIMAGE_PARTITION_SIZE := 14273216512
BOARD_CACHEIMAGE_PARTITION_SIZE := 553648128
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
diff --git a/audio_policy.conf b/audio_policy.conf
index 00f575f..080ecdd 100644
--- a/audio_policy.conf
+++ b/audio_policy.conf
@@ -81,8 +81,8 @@
inputs {
usb_device {
sampling_rates dynamic
- channel_masks AUDIO_CHANNEL_IN_STEREO
- formats AUDIO_FORMAT_PCM_16_BIT
+ channel_masks dynamic
+ formats dynamic
devices AUDIO_DEVICE_IN_USB_DEVICE
}
}
diff --git a/device.mk b/device.mk
index f01000e..119da83 100644
--- a/device.mk
+++ b/device.mk
@@ -184,10 +184,6 @@
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
persist.sys.usb.config=mtp
-# Allows healthd to boot directly from charger mode rather than initiating a reboot.
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
- ro.enable_boot_charger_mode=1
-
# for off charging mode
PRODUCT_PACKAGES += \
charger_res_images
diff --git a/kernel b/kernel
index 109bb72..8d7a3a9 100644
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/media_codecs.xml b/media_codecs.xml
index b5925f5..0ffad5b 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -148,7 +148,7 @@
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
<Limit name="size" min="32x32" max="1088x1152" />
- <Limit name="alignment" value="2x2" />
+ <Limit name="alignment" value="4x4" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="489600" />
<Limit name="bitrate" range="1-40000000" />
diff --git a/releasetools.py b/releasetools.py
index ae5692e..a9d12b4 100644
--- a/releasetools.py
+++ b/releasetools.py
@@ -25,6 +25,11 @@
else:
WriteBootloader(info, bootloader_img)
+def IncrementalOTA_InstallBegin(info):
+ info.script.Unmount("/system")
+ info.script.TunePartition("/system", "-O", "^has_journal")
+ info.script.Mount("/system")
+
def IncrementalOTA_VerifyEnd(info):
# try:
# target_radio_img = info.target_zip.read("RADIO/radio.img")