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

Merge "Pass SdkVersion to getNeighboringCellInfo" am: cec3f1fafb

Browse Source 
am: 8f4fdd4e78

Change-Id: I1397d457efe3c1758795aace2f05ed330a92e596
This commit is contained in:
Nathan Harold
2018-08-01 16:13:48 -07:00
committed by android-build-merger
parent 36d40b0d36 8f4fdd4e78
commit 3193926e6a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1553,7 +1553,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) {

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

@@ -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();