Skip to content

Commit

Permalink
Use /data/vendor/radio for radio data folder
Browse files Browse the repository at this point in the history
Use /data/vendor partition to hold vendor radio data.
Modify radio related init rc and scripts.

Test: Basic telephony sanity with radio enforce mode

Bug: 36736902
Bug: 36717606
Bug: 62871452

Change-Id: I6518e276f68d405151b1b124de6a0ca1b759d951
  • Loading branch information
Naina Nalluri authored and Jayachandran C committed Jun 21, 2017
1 parent 8e782a5 commit a654a72
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 25 deletions.
21 changes: 12 additions & 9 deletions init.hardware.rc
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ on zygote-start
# Create directory used by the DASH client
mkdir /data/misc/dash 0770 media audio

# Create directory for radio
mkdir /data/vendor/radio 0771 system radio

# Create directory used by display clients
mkdir /data/misc/display 0770 system graphics

Expand All @@ -305,17 +308,17 @@ on zygote-start
chmod 775 /data/misc/sensors

# Mark the copy complete flag to not completed
write /data/misc/radio/copy_complete 0
chown radio radio /data/misc/radio/copy_complete
chmod 0660 /data/misc/radio/copy_complete
write /data/vendor/radio/copy_complete 0
chown radio radio /data/vendor/radio/copy_complete
chmod 0660 /data/vendor/radio/copy_complete

# File flags for prebuilt ril db file
write /data/misc/radio/prebuilt_db_support 1
chown radio radio /data/misc/radio/prebuilt_db_support
chmod 0400 /data/misc/radio/prebuilt_db_support
write /data/misc/radio/db_check_done 0
chown radio radio /data/misc/radio/db_check_done
chmod 0660 /data/misc/radio/db_check_done
write /data/vendor/radio/prebuilt_db_support 1
chown radio radio /data/vendor/radio/prebuilt_db_support
chmod 0400 /data/vendor/radio/prebuilt_db_support
write /data/vendor/radio/db_check_done 0
chown radio radio /data/vendor/radio/db_check_done
chmod 0660 /data/vendor/radio/db_check_done

# Create directories for Location services
mkdir /data/vendor/location 0770 gps gps
Expand Down
32 changes: 16 additions & 16 deletions init.radio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
#
# Copy qcril.db if needed for RIL
#
if [ -f /vendor/qcril.db -a ! -f /data/misc/radio/qcril.db ]; then
cp /vendor/qcril.db /data/misc/radio/qcril.db
chown -h radio.radio /data/misc/radio/qcril.db
if [ -f /vendor/radio/qcril_database/qcril.db -a ! -f /data/vendor/radio/qcril.db ]; then
cp /vendor/radio/qcril_database/qcril.db /data/vendor/radio/qcril.db
chown -h radio.radio /data/vendor/radio/qcril.db
fi
echo 1 > /data/misc/radio/db_check_done
echo 1 > /data/vendor/radio/db_check_done

#
# Make modem config folder and copy firmware config to that folder for RIL
#
if [ -f /data/misc/radio/ver_info.txt ]; then
prev_version_info=`cat /data/misc/radio/ver_info.txt`
if [ -f /data/vendor/radio/ver_info.txt ]; then
prev_version_info=`cat /data/vendor/radio/ver_info.txt`
else
prev_version_info=""
fi

cur_version_info=`cat /firmware/verinfo/ver_info.txt`
if [ ! -f /firmware/verinfo/ver_info.txt -o "$prev_version_info" != "$cur_version_info" ]; then
rm -rf /data/misc/radio/modem_config
mkdir /data/misc/radio/modem_config
chmod 770 /data/misc/radio/modem_config
cp -r /firmware/image/modem_pr/mcfg/configs/* /data/misc/radio/modem_config
chown -hR radio.radio /data/misc/radio/modem_config
cp /firmware/verinfo/ver_info.txt /data/misc/radio/ver_info.txt
chown radio.radio /data/misc/radio/ver_info.txt
rm -rf /data/vendor/radio/modem_config
mkdir /data/vendor/radio/modem_config
chmod 770 /data/vendor/radio/modem_config
cp -r /firmware/image/modem_pr/mcfg/configs/* /data/vendor/radio/modem_config
chown -hR radio.radio /data/vendor/radio/modem_config
cp /firmware/verinfo/ver_info.txt /data/vendor/radio/ver_info.txt
chown radio.radio /data/vendor/radio/ver_info.txt
fi
cp /firmware/image/modem_pr/mbn_ota.txt /data/misc/radio/modem_config
chown radio.radio /data/misc/radio/modem_config/mbn_ota.txt
echo 1 > /data/misc/radio/copy_complete
cp /firmware/image/modem_pr/mbn_ota.txt /data/vendor/radio/modem_config
chown radio.radio /data/vendor/radio/modem_config/mbn_ota.txt
echo 1 > /data/vendor/radio/copy_complete

0 comments on commit a654a72

Please sign in to comment.