Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ae2674d authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Move SDK Check for getNeighboringCellInfo" 

am: 9ec58ff4

Change-Id: Id9975df8d6531103a9c1fa2d77b42699f07b823c
parents 66e9d986 9ec58ff4

telephony/java/android/telephony/TelephonyManager.java

+1 −2
Original line number Diff line number Diff line
@@ -1593,8 +1593,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) {

telephony/java/com/android/internal/telephony/ITelephony.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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();