Move SDK Check for getNeighboringCellInfo am: cb1c5ad25d

am: cd3d9a5ba9

Change-Id: I2226bcddceed70ab2b2328a42e7e0f1238017f88
This commit is contained in:
Nathan Harold
2018-10-16 11:13:44 -07:00
committed by android-build-merger
2 changed files with 2 additions and 3 deletions

View File

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

View File

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