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

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

Merge "Add the FEATURE_TELEPHONY restriction to... 

Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a am: dc9f8fab am: 1a3c88a5
am: c3a94cb6

* commit 'c3a94cb6':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
parents fdcc4d42 c3a94cb6

telephony/java/android/telephony/TelephonyManager.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -2874,7 +2874,7 @@ public class TelephonyManager { 
    /**

    /**

     * Returns all observed cell information from all radios on the

     * Returns all observed cell information from all radios on the

     * device including the primary and neighboring cells. This does

     * device including the primary and neighboring cells. This does

     * not cause or change the rate of PhoneStateListner#onCellInfoChanged.

     * not cause or change the rate of PhoneStateListener#onCellInfoChanged.

     *<p>

     *<p>

     * The list can include one or more of {@link android.telephony.CellInfoGsm CellInfoGsm},

     * The list can include one or more of {@link android.telephony.CellInfoGsm CellInfoGsm},

     * {@link android.telephony.CellInfoCdma CellInfoCdma},

     * {@link android.telephony.CellInfoCdma CellInfoCdma},
@@ -2888,6 +2888,9 @@ public class TelephonyManager { 
     * devices this may return null in which case getCellLocation should

     * devices this may return null in which case getCellLocation should

     * be called.

     * be called.

     *<p>

     *<p>

     * This API will return valid data for registered cells on devices with

     * {@link android.content.pm.PackageManager.FEATURE_TELEPHONY}

     *<p>

     * @return List of CellInfo or null if info unavailable.

     * @return List of CellInfo or null if info unavailable.

     *

     *

     * <p>Requires Permission: {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}

     * <p>Requires Permission: {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}