am c9ea3e42: Merge "Separate keymaster0 and keymaster1 HALs."
* commit 'c9ea3e425452819f6be82da22d58211bf04fac10':
Separate keymaster0 and keymaster1 HALs.
diff --git a/init.tilapia.rc b/init.tilapia.rc
index d6b899b..1be5b6b 100644
--- a/init.tilapia.rc
+++ b/init.tilapia.rc
@@ -262,6 +262,10 @@
# Interactive governor settings
chown system system /sys/devices/system/cpu/cpufreq/interactive/boost_factor
chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boost_factor
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/core_lock_count
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/core_lock_count
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/core_lock_period
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/core_lock_period
chown system system /sys/devices/system/cpu/cpufreq/interactive/go_maxspeed_load
chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/go_maxspeed_load
chown system system /sys/devices/system/cpu/cpufreq/interactive/io_is_busy
@@ -399,7 +403,7 @@
#Sensor load calibration files end
# virtual sdcard daemon running as media_rw (1023)
-service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
+service sdcard /system/bin/sdcard -u 1023 -g 1023 -t 4 -l /data/media /mnt/shell/emulated
class late_start
# bugreport is triggered by the VOLUME-DOWN and VOLUME-UP keys
diff --git a/releasetools.py b/releasetools.py
index dba721e..26d9dcc 100644
--- a/releasetools.py
+++ b/releasetools.py
@@ -32,6 +32,10 @@
else:
WriteRadio(info, radio_img)
+def IncrementalOTA_InstallBegin(info):
+ info.script.Unmount("/system")
+ info.script.TunePartition("/system", "-O", "^has_journal")
+ info.script.Mount("/system")
def IncrementalOTA_InstallEnd(info):
try:
