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

Commit 9ec58ff4 authored by Nathan Harold's avatar Nathan Harold Committed by Gerrit Code Review
Browse files

Merge "Move SDK Check for getNeighboringCellInfo"

parents f943c521 cb1c5ad2

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