commit 69646f44a596684855133bb224376ecb1d44aac8
author Po-Chien Hsueh <pchsueh@google.com> Thu Mar 09 05:15:37 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 09 05:15:37 2017 +0000
tree 2442aa0156f7dfa09fb0471243f3db06c2e00dd1
parent bfd41eb47b88cf55ade5989b4cbd8dabc1b2a596
parent c535b2fdedf61ac4c0e08d9bf005a3769da01ec8

Merge "Move default HAL libraries to vendor"

include/hardware/nfc-base.h

diff --git a/include/hardware/nfc-base.h b/include/hardware/nfc-base.h
index c9ae962..6b63ad2 100644
--- a/include/hardware/nfc-base.h
+++ b/include/hardware/nfc-base.h
@@ -1,5 +1,6 @@
 // This file is autogenerated by hidl-gen. Do not edit manually.
 // Source: android.hardware.nfc@1.0
+// Root: android.hardware:hardware/interfaces
 
 #ifndef HIDL_GENERATED_ANDROID_HARDWARE_NFC_V1_0_EXPORTED_CONSTANTS_H_
 #define HIDL_GENERATED_ANDROID_HARDWARE_NFC_V1_0_EXPORTED_CONSTANTS_H_

modules/radio/radio_hw.c

diff --git a/modules/radio/radio_hw.c b/modules/radio/radio_hw.c
index 54707d5..4010507 100644
--- a/modules/radio/radio_hw.c
+++ b/modules/radio/radio_hw.c
@@ -501,6 +501,10 @@
         status = -EINVAL;
         goto exit;
     }
+    if (config->lower_limit > config->upper_limit) {
+        status = -EINVAL;
+        goto exit;
+    }
     send_command_l(stub_tuner, CMD_CANCEL, 0, NULL);
     send_command_l(stub_tuner, CMD_CONFIG, 500, (void *)config);