From 5488b1998f55b58d248b192af5cbb208e01cd478 Mon Sep 17 00:00:00 2001 From: Kyle Repinski Date: Fri, 6 Nov 2015 02:10:01 -0600 Subject: Fix RIL_Init ending unexpectedly when passed unknown args. When libsec-ril receives an unknown argument, RIL_Init completely aborts early. With Android 5.0 and up, a "client id" argument is passed (via '-c' param), but libsec-ril's getopt call uses "p:d:s:", and anything not '-p' '-d' or '-s' jumps to the end of RIL_Init. By passing '--' before '-c', getopt ignores what's left and signals it's done. Currently there's no extra args passed after rild.libargs other than '-c', but even if that were to change in the future this change would still be required for RIL_Init to work. Conflicts: system.prop Change-Id: I904d1c7fd83c71f1c2e1961ed96ac698a160f7f9 --- system.prop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system.prop b/system.prop index 9633cc2..11a37dd 100644 --- a/system.prop +++ b/system.prop @@ -2,7 +2,7 @@ # system.prop for maguro # rild.libpath=/vendor/lib/libsec-ril.so -rild.libargs=-d /dev/ttys0 +rild.libargs=-d /dev/ttys0 -- telephony.lteOnCdmaDevice=0 # Ril sends only one RIL_UNSOL_CALL_RING, so set call_ring.multiple to false -- cgit v1.1