From cb1c5ad25d6fc5cedcb0b882c7fefd0335e80a11 Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Mon, 15 Oct 2018 20:15:51 -0700 Subject: Move SDK Check for getNeighboringCellInfo Move the SDK check for getNeighboringCellInfo() to inside the phone process for security. Bug: 117520186 Test: atest CtsPermissionTestCasesSdk28 Change-Id: I9ca059dad0ed5d2107af154e0a63c282133aba3d --- telephony/java/android/telephony/TelephonyManager.java | 3 +-- telephony/java/com/android/internal/telephony/ITelephony.aidl | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index e4204482aa3d..279dcb055d90 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1591,8 +1591,7 @@ public class TelephonyManager { ITelephony telephony = getITelephony(); if (telephony == null) return null; - return telephony.getNeighboringCellInfo(mContext.getOpPackageName(), - mContext.getApplicationInfo().targetSdkVersion); + return telephony.getNeighboringCellInfo(mContext.getOpPackageName()); } 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 ebb94ff325c2..474416dd3620 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -280,7 +280,7 @@ interface ITelephony { /** * Returns the neighboring cell information of the device. */ - List getNeighboringCellInfo(String callingPkg, int targetSdk); + List getNeighboringCellInfo(String callingPkg); int getCallState(); -- cgit v1.2.3-59-g8ed1b