Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move SDK Check for getNeighboringCellInfo

Browse Source 
Move the SDK check for getNeighboringCellInfo() to
inside the phone process for security.

Bug: 117520186
Test: atest CtsPermissionTestCasesSdk28
Change-Id: I9ca059dad0ed5d2107af154e0a63c282133aba3d
This commit is contained in:
Nathan Harold
2018-10-15 20:15:51 -07:00
parent 2a520365da
commit cb1c5ad25d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -1591,8 +1591,7 @@ public class TelephonyManager {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony == null) if (telephony == null)
return null; return null;
return telephony.getNeighboringCellInfo(mContext.getOpPackageName(), return telephony.getNeighboringCellInfo(mContext.getOpPackageName());
mContext.getApplicationInfo().targetSdkVersion);
} catch (RemoteException ex) { } catch (RemoteException ex) {
return null; return null;
} catch (NullPointerException ex) { } catch (NullPointerException ex) {

2
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -280,7 +280,7 @@ interface ITelephony {
/** /**
* Returns the neighboring cell information of the device. * Returns the neighboring cell information of the device.
*/ */
List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg, int targetSdk); List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg);
int getCallState(); int getCallState();