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

Commit cb1c5ad2 authored by Nathan Harold's avatar Nathan Harold
Browse files

Move SDK Check for getNeighboringCellInfo 

Move the SDK check for getNeighboringCellInfo() to
inside the phone process for security.

Bug: 117520186
Test: atest CtsPermissionTestCasesSdk28
Change-Id: I9ca059dad0ed5d2107af154e0a63c282133aba3d
parent 2a520365

telephony/java/android/telephony/TelephonyManager.java

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