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

Commit b30f2188 authored by jsh's avatar jsh Committed by Android Git Automerger
Browse files

am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread 

Merge commit '17fe229f' into gingerbread-plus-aosp

* commit '17fe229f':
  Unhide GsmCellLocation.getPsc().
parents 23b8054e 17fe229f

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -153680,6 +153680,17 @@ 
 visibility="public"

>

</method>

<method name="getPsc"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="setLacAndCid"

 return="void"

 abstract="false"

telephony/java/android/telephony/gsm/GsmCellLocation.java

+3 −1
Original line number Diff line number Diff line
@@ -60,8 +60,10 @@ public class GsmCellLocation extends CellLocation { 
    }



    /**

     * On a UMTS network, returns the primary scrambling code of the serving

     * cell.

     *

     * @return primary scrambling code for UMTS, -1 if unknown or GSM

     * @hide

     */

    public int getPsc() {

        return mPsc;