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

Commit 3193926e authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Pass SdkVersion to getNeighboringCellInfo" am: cec3f1fa 

am: 8f4fdd4e

Change-Id: I1397d457efe3c1758795aace2f05ed330a92e596
parents 36d40b0d 8f4fdd4e

telephony/java/android/telephony/TelephonyManager.java

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

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -390,7 +390,7 @@ interface ITelephony { 
    /**

    /**

     * Returns the neighboring cell information of the device.

     * Returns the neighboring cell information of the device.

     */

     */

    List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg);

    List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg, int targetSdk);





     int getCallState();

     int getCallState();