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

Commit 76d6a2c4 authored by shubang's avatar shubang
Browse files

Unhide TunedInfo APIs 

Bug: 163350497
Test: atest android.media.tv.cts.TvInputManagerTest#testGetTunedInfos
Change-Id: Ib01d0359f25d9d0034c3176336d6f3f673798682
parent 41a7b5ae

api/system-current.txt

+21 −0
Original line number Original line Diff line number Diff line
@@ -4769,6 +4769,22 @@ package android.media.tv { 
    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.DvbDeviceInfo> CREATOR;

    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.DvbDeviceInfo> CREATOR;

  }

  }




















  public final class TunedInfo implements android.os.Parcelable {














    method public int describeContents();














    method public int getAppTag();














    method public int getAppType();














    method @Nullable public android.net.Uri getChannelUri();














    method @NonNull public String getInputId();














    method public boolean isForeground();














    method public boolean isRecordingSession();














    method public void writeToParcel(@NonNull android.os.Parcel, int);














    field public static final int APP_TAG_SELF = 0; // 0x0














    field public static final int APP_TYPE_NON_SYSTEM = 3; // 0x3














    field public static final int APP_TYPE_SELF = 1; // 0x1














    field public static final int APP_TYPE_SYSTEM = 2; // 0x2














    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.TunedInfo> CREATOR;














  }
























  public final class TvContentRatingSystemInfo implements android.os.Parcelable {







  public final class TvContentRatingSystemInfo implements android.os.Parcelable {











    method public static android.media.tv.TvContentRatingSystemInfo createTvContentRatingSystemInfo(int, android.content.pm.ApplicationInfo);







    method public static android.media.tv.TvContentRatingSystemInfo createTvContentRatingSystemInfo(int, android.content.pm.ApplicationInfo);











    method public int describeContents();







    method public int describeContents();










@@ -4884,6 +4900,7 @@ package android.media.tv {









    method @RequiresPermission(android.Manifest.permission.MODIFY_PARENTAL_CONTROLS) public void addBlockedRating(@NonNull android.media.tv.TvContentRating);







    method @RequiresPermission(android.Manifest.permission.MODIFY_PARENTAL_CONTROLS) public void addBlockedRating(@NonNull android.media.tv.TvContentRating);











    method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public boolean captureFrame(String, android.view.Surface, android.media.tv.TvStreamConfig);







    method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public boolean captureFrame(String, android.view.Surface, android.media.tv.TvStreamConfig);











    method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public java.util.List<android.media.tv.TvStreamConfig> getAvailableTvStreamConfigList(String);







    method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public java.util.List<android.media.tv.TvStreamConfig> getAvailableTvStreamConfigList(String);














    method @NonNull @RequiresPermission("com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS") public java.util.List<android.media.tv.TunedInfo> getCurrentTunedInfos();











    method @NonNull @RequiresPermission("android.permission.DVB_DEVICE") public java.util.List<android.media.tv.DvbDeviceInfo> getDvbDeviceList();







    method @NonNull @RequiresPermission("android.permission.DVB_DEVICE") public java.util.List<android.media.tv.DvbDeviceInfo> getDvbDeviceList();











    method @RequiresPermission(android.Manifest.permission.TV_INPUT_HARDWARE) public java.util.List<android.media.tv.TvInputHardwareInfo> getHardwareList();







    method @RequiresPermission(android.Manifest.permission.TV_INPUT_HARDWARE) public java.util.List<android.media.tv.TvInputHardwareInfo> getHardwareList();











    method @RequiresPermission(android.Manifest.permission.READ_CONTENT_RATING_SYSTEMS) public java.util.List<android.media.tv.TvContentRatingSystemInfo> getTvContentRatingSystemList();







    method @RequiresPermission(android.Manifest.permission.READ_CONTENT_RATING_SYSTEMS) public java.util.List<android.media.tv.TvContentRatingSystemInfo> getTvContentRatingSystemList();









@@ -4909,6 +4926,10 @@ package android.media.tv {









    method public abstract void onStreamConfigChanged(android.media.tv.TvStreamConfig[]);







    method public abstract void onStreamConfigChanged(android.media.tv.TvStreamConfig[]);











  }







  }






























  public abstract static class TvInputManager.TvInputCallback {














    method public void onCurrentTunedInfosUpdated(@NonNull java.util.List<android.media.tv.TunedInfo>);














  }
























  public abstract class TvInputService extends android.app.Service {







  public abstract class TvInputService extends android.app.Service {











    method @Nullable public android.media.tv.TvInputInfo onHardwareAdded(android.media.tv.TvInputHardwareInfo);







    method @Nullable public android.media.tv.TvInputInfo onHardwareAdded(android.media.tv.TvInputHardwareInfo);











    method @Nullable public String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);







    method @Nullable public String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);

































media/java/android/media/tv/TunedInfo.java



+2
−0




























Original line number
Original line
Diff line number
Diff line








@@ -19,6 +19,7 @@ package android.media.tv;









import android.annotation.IntDef;







import android.annotation.IntDef;











import android.annotation.NonNull;







import android.annotation.NonNull;











import android.annotation.Nullable;







import android.annotation.Nullable;














import android.annotation.SystemApi;











import android.net.Uri;







import android.net.Uri;











import android.os.Parcel;







import android.os.Parcel;











import android.os.Parcelable;







import android.os.Parcelable;









@@ -35,6 +36,7 @@ import java.util.Objects;









 * or pass-through input.







 * or pass-through input.











 * @hide







 * @hide











 */







 */














@SystemApi











public final class TunedInfo implements Parcelable {







public final class TunedInfo implements Parcelable {











    static final String TAG = "TunedInfo";







    static final String TAG = "TunedInfo";





















































media/java/android/media/tv/TvInputManager.java



+5
−4




























Original line number
Original line
Diff line number
Diff line








@@ -906,8 +906,8 @@ public final class TvInputManager {









         * @param tunedInfos a list of {@link TunedInfo} objects of new tuned information.







         * @param tunedInfos a list of {@link TunedInfo} objects of new tuned information.











         * @hide







         * @hide











         */







         */











        public void onCurrentTunedInfosUpdated(







        @SystemApi











                @NonNull List<TunedInfo> tunedInfos) {







        public void onCurrentTunedInfosUpdated(@NonNull List<TunedInfo> tunedInfos) {











        }







        }











    }







    }






























@@ -969,7 +969,7 @@ public final class TvInputManager {









            });







            });











        }







        }































        public void onCurrentTunedInfosUpdated(final List<TunedInfo> currentTunedInfos) {







        public void postCurrentTunedInfosUpdated(final List<TunedInfo> currentTunedInfos) {











            mHandler.post(new Runnable() {







            mHandler.post(new Runnable() {











                @Override







                @Override











                public void run() {







                public void run() {










@@ -1286,7 +1286,7 @@ public final class TvInputManager {









            public void onCurrentTunedInfosUpdated(List<TunedInfo> currentTunedInfos) {







            public void onCurrentTunedInfosUpdated(List<TunedInfo> currentTunedInfos) {











                synchronized (mLock) {







                synchronized (mLock) {











                    for (TvInputCallbackRecord record : mCallbackRecords) {







                    for (TvInputCallbackRecord record : mCallbackRecords) {











                        record.onCurrentTunedInfosUpdated(currentTunedInfos);







                        record.postCurrentTunedInfosUpdated(currentTunedInfos);











                    }







                    }











                }







                }











            }







            }










@@ -1988,6 +1988,7 @@ public final class TvInputManager {









     * {@link TunedInfo#getChannelUri()} returns {@code null}.







     * {@link TunedInfo#getChannelUri()} returns {@code null}.











     * @hide







     * @hide











     */







     */














    @SystemApi











    @RequiresPermission("com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS")







    @RequiresPermission("com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS")











    @NonNull







    @NonNull











    public List<TunedInfo> getCurrentTunedInfos() {







    public List<TunedInfo> getCurrentTunedInfos() {

































non-updatable-api/system-current.txt



+21
−0




























Original line number
Original line
Diff line number
Diff line








@@ -4709,6 +4709,22 @@ package android.media.tv {









    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.DvbDeviceInfo> CREATOR;







    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.DvbDeviceInfo> CREATOR;











  }







  }






























  public final class TunedInfo implements android.os.Parcelable {














    method public int describeContents();














    method public int getAppTag();














    method public int getAppType();














    method @Nullable public android.net.Uri getChannelUri();














    method @NonNull public String getInputId();














    method public boolean isForeground();














    method public boolean isRecordingSession();














    method public void writeToParcel(@NonNull android.os.Parcel, int);














    field public static final int APP_TAG_SELF = 0; // 0x0














    field public static final int APP_TYPE_NON_SYSTEM = 3; // 0x3














    field public static final int APP_TYPE_SELF = 1; // 0x1














    field public static final int APP_TYPE_SYSTEM = 2; // 0x2














    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.TunedInfo> CREATOR;














  }
























  public final class TvContentRatingSystemInfo implements android.os.Parcelable {







  public final class TvContentRatingSystemInfo implements android.os.Parcelable {











    method public static android.media.tv.TvContentRatingSystemInfo createTvContentRatingSystemInfo(int, android.content.pm.ApplicationInfo);







    method public static android.media.tv.TvContentRatingSystemInfo createTvContentRatingSystemInfo(int, android.content.pm.ApplicationInfo);











    method public int describeContents();







    method public int describeContents();










@@ -4824,6 +4840,7 @@ package android.media.tv {









    method @RequiresPermission(android.Manifest.permission.MODIFY_PARENTAL_CONTROLS) public void addBlockedRating(@NonNull android.media.tv.TvContentRating);







    method @RequiresPermission(android.Manifest.permission.MODIFY_PARENTAL_CONTROLS) public void addBlockedRating(@NonNull android.media.tv.TvContentRating);











    method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public boolean captureFrame(String, android.view.Surface, android.media.tv.TvStreamConfig);







    method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public boolean captureFrame(String, android.view.Surface, android.media.tv.TvStreamConfig);











    method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public java.util.List<android.media.tv.TvStreamConfig> getAvailableTvStreamConfigList(String);







    method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public java.util.List<android.media.tv.TvStreamConfig> getAvailableTvStreamConfigList(String);














    method @NonNull @RequiresPermission("com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS") public java.util.List<android.media.tv.TunedInfo> getCurrentTunedInfos();











    method @NonNull @RequiresPermission("android.permission.DVB_DEVICE") public java.util.List<android.media.tv.DvbDeviceInfo> getDvbDeviceList();







    method @NonNull @RequiresPermission("android.permission.DVB_DEVICE") public java.util.List<android.media.tv.DvbDeviceInfo> getDvbDeviceList();











    method @RequiresPermission(android.Manifest.permission.TV_INPUT_HARDWARE) public java.util.List<android.media.tv.TvInputHardwareInfo> getHardwareList();







    method @RequiresPermission(android.Manifest.permission.TV_INPUT_HARDWARE) public java.util.List<android.media.tv.TvInputHardwareInfo> getHardwareList();











    method @RequiresPermission(android.Manifest.permission.READ_CONTENT_RATING_SYSTEMS) public java.util.List<android.media.tv.TvContentRatingSystemInfo> getTvContentRatingSystemList();







    method @RequiresPermission(android.Manifest.permission.READ_CONTENT_RATING_SYSTEMS) public java.util.List<android.media.tv.TvContentRatingSystemInfo> getTvContentRatingSystemList();









@@ -4849,6 +4866,10 @@ package android.media.tv {









    method public abstract void onStreamConfigChanged(android.media.tv.TvStreamConfig[]);







    method public abstract void onStreamConfigChanged(android.media.tv.TvStreamConfig[]);











  }







  }






























  public abstract static class TvInputManager.TvInputCallback {














    method public void onCurrentTunedInfosUpdated(@NonNull java.util.List<android.media.tv.TunedInfo>);














  }
























  public abstract class TvInputService extends android.app.Service {







  public abstract class TvInputService extends android.app.Service {











    method @Nullable public android.media.tv.TvInputInfo onHardwareAdded(android.media.tv.TvInputHardwareInfo);







    method @Nullable public android.media.tv.TvInputInfo onHardwareAdded(android.media.tv.TvInputHardwareInfo);











    method @Nullable public String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);







    method @Nullable public String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);