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

Commit 44ec8a6c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Pass SdkVersion to getNeighboringCellInfo" am: cec3f1fa am:...

Merge "Merge "Pass SdkVersion to getNeighboringCellInfo" am: cec3f1fa am: 8f4fdd4e am: 3193926e am: 6493efa7"
parents 3e26fb95 2a21769d
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -1553,7 +1553,8 @@ public class TelephonyManager {
            ITelephony telephony = getITelephony();
            if (telephony == null)
                return null;
            return telephony.getNeighboringCellInfo(mContext.getOpPackageName());
            return telephony.getNeighboringCellInfo(mContext.getOpPackageName(),
                    mContext.getApplicationInfo().targetSdkVersion);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ interface ITelephony {
    /**
     * Returns the neighboring cell information of the device.
     */
    List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg);
    List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg, int targetSdk);

     int getCallState();