diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-07 03:12:27 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-07 03:12:27 +0000 |
commit | f87cb21c4e7a807d4a18f4fd1d7608c7fad10c7a (patch) | |
tree | b7252fbdc4929b44e568d4c412819c27b7e53821 | |
parent | f9e47981a225ef82f5a37a60bcd9af2f8f7be576 (diff) | |
parent | a156b590429ad544a35c46993d24bb048b7299f7 (diff) | |
download | device_generic_goldfish-f87cb21c4e7a807d4a18f4fd1d7608c7fad10c7a.tar.gz device_generic_goldfish-f87cb21c4e7a807d4a18f4fd1d7608c7fad10c7a.tar.bz2 device_generic_goldfish-f87cb21c4e7a807d4a18f4fd1d7608c7fad10c7a.zip |
Snap for 4937098 from a156b590429ad544a35c46993d24bb048b7299f7 to pi-qpr1-release
Change-Id: If74b290cc0168f36633f0c7b8da61f0c59e2b0cf
-rw-r--r-- | fstab.ranchu | 2 | ||||
-rw-r--r-- | ril/reference-ril.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fstab.ranchu b/fstab.ranchu index 0c83d592..12988ab0 100644 --- a/fstab.ranchu +++ b/fstab.ranchu @@ -2,5 +2,5 @@ #<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> # The filesystem that contains the filesystem checker binary (typically /system) cannot # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK -/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,quota,forceencrypt=/dev/block/vdd +/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,quota,forceencrypt=/dev/block/vdd,reservedsize=128M /devices/*/block/vdf auto auto defaults voldmanaged=sdcard:auto,encryptable=userdata diff --git a/ril/reference-ril.c b/ril/reference-ril.c index b1f6b379..c0db44d0 100644 --- a/ril/reference-ril.c +++ b/ril/reference-ril.c @@ -1899,7 +1899,7 @@ static void requestSimOpenChannel(void *data, size_t datalen, RIL_Token t) return; } - RIL_onRequestComplete(t, RIL_E_SUCCESS, &session_id, sizeof(&session_id)); + RIL_onRequestComplete(t, RIL_E_SUCCESS, &session_id, sizeof(session_id)); at_response_free(p_response); } |