commit cec3f1fafb012bc26f0cc56b918a977e778d3a0d
author Nathan Harold <nharold@google.com> Tue Jul 31 20:28:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 31 20:28:59 2018 +0000
tree 084efc31defc940c96eeaef9ff2500092661c7d2
parent e1d140619ff9a22c3cb2e679df07296a8842ce96
parent 3892d05850c5a04ebfea94ef934a6f96850e3702

Merge "Pass SdkVersion to getNeighboringCellInfo"

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 53cf877..37d56ee 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1471,7 +1471,8 @@
             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) {

telephony/java/com/android/internal/telephony/ITelephony.aidl

diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 2c5732a..d28a16a 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -390,7 +390,7 @@
     /**
      * Returns the neighboring cell information of the device.
      */
-    List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg);
+    List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg, int targetSdk);
 
      int getCallState();