From 3892d05850c5a04ebfea94ef934a6f96850e3702 Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Fri, 20 Jul 2018 12:08:24 -0700
Subject: Pass SdkVersion to getNeighboringCellInfo

Bug: 62490173
Test: tested manually with SL4A (P and P+ SDK)
Change-Id: I65bae72ab8379f996486e7f4326eddf1b305658a
---
 telephony/java/android/telephony/TelephonyManager.java        | 3 ++-
 telephony/java/com/android/internal/telephony/ITelephony.aidl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 53cf87707205..37d56eed7434 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1471,7 +1471,8 @@ public class TelephonyManager {
             ITelephony telephony = getITelephony();
             if (telephony == null)
                 return null;
-            return telephony.getNeighboringCellInfo(mContext.getOpPackageName());
+            return telephony.getNeighboringCellInfo(mContext.getOpPackageName(),
+                    mContext.getApplicationInfo().targetSdkVersion);
         } catch (RemoteException ex) {
             return null;
         } catch (NullPointerException ex) {
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 2c5732ad4e30..d28a16a16e5b 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -390,7 +390,7 @@ interface ITelephony {
     /**
      * Returns the neighboring cell information of the device.
      */
-    List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg);
+    List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg, int targetSdk);
 
      int getCallState();
 
-- 
cgit v1.2.3-59-g8ed1b