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

Merge "Move SDK Check for getNeighboringCellInfo"

Browse Source 
am: 9ec58ff433

Change-Id: Id9975df8d6531103a9c1fa2d77b42699f07b823c
This commit is contained in:
Nathan Harold
2018-10-16 10:15:13 -07:00
committed by android-build-merger
parent 66e9d98618 9ec58ff433
commit 8ae2674d04
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

@@ -1593,8 +1593,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();