Updated external storage configuration.
vold now manages external storage in a much more dynamic fashion, so we no longer need to define FUSE daemons or mount points. Bug: 19993667 Change-Id: I17a468fe37ed6d1f7af8524b93072672c2ec2164
This commit is contained in:
Jeff Sharkey
Ethan Chen
parent
6fa45107ec
commit
cc7385d30f
2 changed files with 3 additions and 101 deletions
|
|
@ -1,53 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
**
|
||||
** Copyright 2011, The Android Open Source Project
|
||||
**
|
||||
** Licensed under the Apache License, Version 2.0 (the "License")
|
||||
** you may not use this file except in compliance with the License.
|
||||
** You may obtain a copy of the License at
|
||||
**
|
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
**
|
||||
** Unless required by applicable law or agreed to in writing, software
|
||||
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
** See the License for the specific language governing permissions and
|
||||
** limitations under the License.
|
||||
*/
|
||||
-->
|
||||
|
||||
<!-- The <device> element should contain one or more <storage> elements.
|
||||
Exactly one of these should have the attribute primary="true".
|
||||
This storage will be the primary external storage and should have path="/mnt/sdcard".
|
||||
Each storage should have both a path and description attribute set.
|
||||
The following boolean attributes are optional:
|
||||
|
||||
primary: this storage is the primary external storage
|
||||
removable: this is removable storage (for example, a real SD card)
|
||||
emulated: the storage is emulated via the FUSE sdcard daemon
|
||||
mtp-reserve: number of megabytes of storage MTP should reserve for free storage
|
||||
(used for emulated storage that is shared with system's data partition)
|
||||
|
||||
A storage should not have both emulated and removable set to true
|
||||
-->
|
||||
|
||||
<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<storage android:mountPoint="/storage/sdcard0"
|
||||
android:storageDescription="@string/storage_internal"
|
||||
android:primary="true"
|
||||
android:emulated="true"
|
||||
android:mtpReserve="100" />
|
||||
|
||||
<storage android:mountPoint="/storage/sdcard1"
|
||||
android:storageDescription="@string/storage_sd_card"
|
||||
android:primary="false"
|
||||
android:removable="true"
|
||||
android:allowMassStorage="true" />
|
||||
|
||||
<storage android:mountPoint="/storage/usbdisk"
|
||||
android:storageDescription="@string/storage_usb"
|
||||
android:primary="false"
|
||||
android:removable="true" />
|
||||
|
||||
</StorageList>
|
||||
|
|
@ -41,34 +41,10 @@ on early-init
|
|||
symlink /data/tombstones /tombstones
|
||||
|
||||
on init
|
||||
mkdir /mnt/shell/emulated 0700 shell shell
|
||||
mkdir /storage 0550 system sdcard_r
|
||||
mkdir /storage/emulated 0555 root root
|
||||
|
||||
#External storage directories
|
||||
mkdir /mnt/media_rw/sdcard0 0700 media_rw media_rw
|
||||
mkdir /mnt/media_rw/sdcard1 0700 media_rw media_rw
|
||||
mkdir /mnt/media_rw/usbdisk 0700 media_rw media_rw
|
||||
|
||||
mkdir /storage/sdcard0 0700 root root
|
||||
mkdir /storage/sdcard1 0700 root root
|
||||
mkdir /storage/usbdisk 0700 root root
|
||||
|
||||
export EXTERNAL_STORAGE /storage/emulated/legacy
|
||||
export SECONDARY_STORAGE /storage/sdcard1:/storage/usbdisk
|
||||
export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
|
||||
export EMULATED_STORAGE_TARGET /storage/emulated
|
||||
|
||||
# for backwards compatibility
|
||||
symlink /storage/emulated/legacy /sdcard
|
||||
symlink /storage/emulated/legacy /mnt/sdcard
|
||||
symlink /storage/emulated/legacy /storage/sdcard0
|
||||
symlink /mnt/shell/emulated/0 /storage/emulated/legacy
|
||||
symlink /storage/sdcard1 /extSdCard
|
||||
symlink /storage/sdcard1 /mnt/extSdCard
|
||||
symlink /storage/sdcard1 /external_sd
|
||||
symlink /storage/usbdisk /usbdisk
|
||||
symlink /storage/usbdisk /mnt/usbdisk
|
||||
# Support legacy paths
|
||||
symlink /sdcard /mnt/sdcard
|
||||
symlink /sdcard /storage/sdcard0
|
||||
|
||||
on fs
|
||||
write /sys/devices/msm_sdcc.1/mmc_host/mmc1/power/control on
|
||||
|
|
@ -78,8 +54,6 @@ on fs
|
|||
|
||||
restorecon_recursive /efs
|
||||
|
||||
setprop ro.crypto.fuse_sdcard true
|
||||
|
||||
write /sys/kernel/boot_adsp/boot 1
|
||||
setprop qcom.audio.init complete
|
||||
|
||||
|
|
@ -89,10 +63,6 @@ on post-fs
|
|||
chmod 0664 /sys/block/mmcblk0/bkops_en
|
||||
|
||||
on post-fs-data
|
||||
# we will remap this as /mnt/sdcard with the sdcard fuse tool
|
||||
mkdir /data/media 0775 media_rw media_rw
|
||||
chown media_rw media_rw /data/media
|
||||
|
||||
mkdir /data/misc/bluetooth 0770 bluetooth bluetooth
|
||||
|
||||
# Create the directories used by the Wireless subsystem
|
||||
|
|
@ -1250,21 +1220,6 @@ service sec-sh /system/bin/sh /system/etc/init.sec.boot.sh
|
|||
user root
|
||||
oneshot
|
||||
|
||||
service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
|
||||
class late_start
|
||||
|
||||
service fuse_sdcard0 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard0 /storage/sdcard0
|
||||
class late_start
|
||||
disabled
|
||||
|
||||
service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1
|
||||
class late_start
|
||||
disabled
|
||||
|
||||
service fuse_usbdisk /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/usbdisk /storage/usbdisk
|
||||
class late_start
|
||||
disabled
|
||||
|
||||
on property:persist.sys.ssr.restart_level=1
|
||||
write /sys/module/subsystem_restart/parameters/restart_level 1
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue