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

Commit eb47b34a authored by shubang's avatar shubang
Browse files

Change names of stopTune and stopScan 

Advice from API council

Test: make;
Bug: 139308734
Change-Id: I106dd9f488df79659bb2c63ac8498121c5f4c17c
parent b642e394

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -4842,6 +4842,8 @@ package android.media.tv.tuner { 














  public class Tuner implements java.lang.AutoCloseable {















    ctor @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public Tuner(@NonNull android.content.Context, @NonNull String, int, @Nullable android.media.tv.tuner.Tuner.OnResourceLostListener);













    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int cancelScanning();













    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int cancelTuning();















    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void clearOnTuneEventListener();















    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void close();















    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int connectCiCam(int);









@@ -4862,8 +4864,6 @@ package android.media.tv.tuner {













    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int setLna(boolean);















    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void setOnTuneEventListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.frontend.OnTuneEventListener);















    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void shareFrontendFromTuner(@NonNull android.media.tv.tuner.Tuner);













    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int stopScan();













    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int stopTune();















    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int tune(@NonNull android.media.tv.tuner.frontend.FrontendSettings);















    method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void updateResourcePriority(int, int);















  }

































media/java/android/media/tv/tuner/Tuner.java



+5
−5




























Original line number
Diff line number
Diff line








@@ -244,7 +244,7 @@ public class Tuner implements AutoCloseable  {













     *















     * <p>















     * Tuner events are started when {@link #tune(FrontendSettings)} is called and end when {@link













     * #stopTune()} is called.













     * #cancelTuning()} is called.















     *















     * @param eventListener receives tune events.















     * @throws SecurityException if the caller does not have appropriate permissions.










@@ -309,7 +309,7 @@ public class Tuner implements AutoCloseable  {













     */















    @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)















    @Result













    public int stopTune() {













    public int cancelTuning() {















        TunerUtils.checkTunerPermission(mContext);















        return nativeStopTune();















    }









@@ -322,8 +322,8 @@ public class Tuner implements AutoCloseable  {













     * @param settings A {@link FrontendSettings} to configure the frontend.















     * @param scanType The scan type.















     * @throws SecurityException     if the caller does not have appropriate permissions.













     * @throws IllegalStateException if {@code scan} is called again before {@link #stopScan()} is













     *                               called.













     * @throws IllegalStateException if {@code scan} is called again before













     *                               {@link #cancelScanning()} is called.















     */















    @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)















    @Result










@@ -354,7 +354,7 @@ public class Tuner implements AutoCloseable  {













     */















    @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)















    @Result













    public int stopScan() {













    public int cancelScanning() {















        TunerUtils.checkTunerPermission(mContext);















        int retVal = nativeStopScan();















        mScanCallback = null;