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

Commit 093d9949 authored by Jae Seo's avatar Jae Seo
Browse files

TIF: Replace explicit types with <> 

Also removed unnecessary boxing/unboxing

Change-Id: I97ef6b7f369cac97a133180773be96463f2a813d
parent b40933de

media/java/android/media/tv/ITvInputSessionWrapper.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -285,8 +285,7 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 




    @Override

    @Override

    public void timeShiftSeekTo(long timeMs) {

    public void timeShiftSeekTo(long timeMs) {

        mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_TIME_SHIFT_SEEK_TO,

        mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_TIME_SHIFT_SEEK_TO, timeMs));

                Long.valueOf(timeMs)));

    }

    }





    @Override

    @Override
@@ -298,7 +297,7 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
    @Override

    @Override

    public void timeShiftEnablePositionTracking(boolean enable) {

    public void timeShiftEnablePositionTracking(boolean enable) {

        mCaller.executeOrSendMessage(mCaller.obtainMessageO(

        mCaller.executeOrSendMessage(mCaller.obtainMessageO(

                DO_TIME_SHIFT_ENABLE_POSITION_TRACKING, Boolean.valueOf(enable)));

                DO_TIME_SHIFT_ENABLE_POSITION_TRACKING, enable));

    }

    }





    private final class TvInputEventReceiver extends InputEventReceiver {

    private final class TvInputEventReceiver extends InputEventReceiver {

media/java/android/media/tv/TvContract.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -485,8 +485,7 @@ public final class TvContract { 
        /** The video resolution for ultra high-definition. */

        /** The video resolution for ultra high-definition. */

        public static final String VIDEO_RESOLUTION_UHD = "VIDEO_RESOLUTION_UHD";

        public static final String VIDEO_RESOLUTION_UHD = "VIDEO_RESOLUTION_UHD";





        private static final Map<String, String> VIDEO_FORMAT_TO_RESOLUTION_MAP =

        private static final Map<String, String> VIDEO_FORMAT_TO_RESOLUTION_MAP = new HashMap<>();

                new HashMap<String, String>();





        static {

        static {

            VIDEO_FORMAT_TO_RESOLUTION_MAP.put(VIDEO_FORMAT_480I, VIDEO_RESOLUTION_SD);

            VIDEO_FORMAT_TO_RESOLUTION_MAP.put(VIDEO_FORMAT_480I, VIDEO_RESOLUTION_SD);
@@ -1128,7 +1127,7 @@ public final class TvContract { 
            /** The genre for Tech/Science. */

            /** The genre for Tech/Science. */

            public static final String TECH_SCIENCE = "TECH_SCIENCE";

            public static final String TECH_SCIENCE = "TECH_SCIENCE";





            private static final ArraySet<String> CANONICAL_GENRES = new ArraySet<String>();

            private static final ArraySet<String> CANONICAL_GENRES = new ArraySet<>();

            static {

            static {

                CANONICAL_GENRES.add(FAMILY_KIDS);

                CANONICAL_GENRES.add(FAMILY_KIDS);

                CANONICAL_GENRES.add(SPORTS);

                CANONICAL_GENRES.add(SPORTS);

media/java/android/media/tv/TvInputInfo.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -626,7 +626,7 @@ public final class TvInputInfo implements Parcelable { 
        public static Set<String> getHiddenTvInputIds(Context context, int userId) {

        public static Set<String> getHiddenTvInputIds(Context context, int userId) {

            String hiddenIdsString = Settings.Secure.getStringForUser(

            String hiddenIdsString = Settings.Secure.getStringForUser(

                    context.getContentResolver(), Settings.Secure.TV_INPUT_HIDDEN_INPUTS, userId);

                    context.getContentResolver(), Settings.Secure.TV_INPUT_HIDDEN_INPUTS, userId);

            Set<String> set = new HashSet<String>();

            Set<String> set = new HashSet<>();

            if (TextUtils.isEmpty(hiddenIdsString)) {

            if (TextUtils.isEmpty(hiddenIdsString)) {

                return set;

                return set;

            }

            }
@@ -648,7 +648,7 @@ public final class TvInputInfo implements Parcelable { 
        public static Map<String, String> getCustomLabels(Context context, int userId) {

        public static Map<String, String> getCustomLabels(Context context, int userId) {

            String labelsString = Settings.Secure.getStringForUser(

            String labelsString = Settings.Secure.getStringForUser(

                    context.getContentResolver(), Settings.Secure.TV_INPUT_CUSTOM_LABELS, userId);

                    context.getContentResolver(), Settings.Secure.TV_INPUT_CUSTOM_LABELS, userId);

            Map<String, String> map = new HashMap<String, String>();

            Map<String, String> map = new HashMap<>();

            if (TextUtils.isEmpty(labelsString)) {

            if (TextUtils.isEmpty(labelsString)) {

                return map;

                return map;

            }

            }

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

+13 −14
Original line number Original line Diff line number Diff line
@@ -221,16 +221,15 @@ public final class TvInputManager { 
    private final Object mLock = new Object();

    private final Object mLock = new Object();





    // @GuardedBy("mLock")

    // @GuardedBy("mLock")

    private final List<TvInputCallbackRecord> mCallbackRecords =

    private final List<TvInputCallbackRecord> mCallbackRecords = new LinkedList<>();

            new LinkedList<TvInputCallbackRecord>();





    // A mapping from TV input ID to the state of corresponding input.

    // A mapping from TV input ID to the state of corresponding input.

    // @GuardedBy("mLock")

    // @GuardedBy("mLock")

    private final Map<String, Integer> mStateMap = new ArrayMap<String, Integer>();

    private final Map<String, Integer> mStateMap = new ArrayMap<>();





    // A mapping from the sequence number of a session to its SessionCallbackRecord.

    // A mapping from the sequence number of a session to its SessionCallbackRecord.

    private final SparseArray<SessionCallbackRecord> mSessionCallbackRecordMap =

    private final SparseArray<SessionCallbackRecord> mSessionCallbackRecordMap =

            new SparseArray<SessionCallbackRecord>();

            new SparseArray<>();





    // A sequence number for the next session to be created. Should be protected by a lock

    // A sequence number for the next session to be created. Should be protected by a lock

    // {@code mSessionCallbackRecordMap}.

    // {@code mSessionCallbackRecordMap}.
@@ -983,7 +982,7 @@ public final class TvInputManager { 
                Log.w(TAG, "Unrecognized input ID: " + inputId);

                Log.w(TAG, "Unrecognized input ID: " + inputId);

                return INPUT_STATE_DISCONNECTED;

                return INPUT_STATE_DISCONNECTED;

            }

            }

            return state.intValue();

            return state;

        }

        }

    }

    }
@@ -1074,7 +1073,7 @@ public final class TvInputManager { 
    @SystemApi

    @SystemApi

    public List<TvContentRating> getBlockedRatings() {

    public List<TvContentRating> getBlockedRatings() {

        try {

        try {

            List<TvContentRating> ratings = new ArrayList<TvContentRating>();

            List<TvContentRating> ratings = new ArrayList<>();

            for (String rating : mService.getBlockedRatings(mUserId)) {

            for (String rating : mService.getBlockedRatings(mUserId)) {

                ratings.add(TvContentRating.unflattenFromString(rating));

                ratings.add(TvContentRating.unflattenFromString(rating));

            }

            }
@@ -1332,8 +1331,8 @@ public final class TvInputManager { 
        // protect pending input events and the input channel.

        // protect pending input events and the input channel.

        private final InputEventHandler mHandler = new InputEventHandler(Looper.getMainLooper());

        private final InputEventHandler mHandler = new InputEventHandler(Looper.getMainLooper());





        private final Pool<PendingEvent> mPendingEventPool = new SimplePool<PendingEvent>(20);

        private final Pool<PendingEvent> mPendingEventPool = new SimplePool<>(20);

        private final SparseArray<PendingEvent> mPendingEvents = new SparseArray<PendingEvent>(20);

        private final SparseArray<PendingEvent> mPendingEvents = new SparseArray<>(20);

        private final SparseArray<SessionCallbackRecord> mSessionCallbackRecordMap;

        private final SparseArray<SessionCallbackRecord> mSessionCallbackRecordMap;





        private IBinder mToken;

        private IBinder mToken;
@@ -1342,11 +1341,11 @@ public final class TvInputManager { 




        private final Object mMetadataLock = new Object();

        private final Object mMetadataLock = new Object();

        // @GuardedBy("mMetadataLock")

        // @GuardedBy("mMetadataLock")

        private final List<TvTrackInfo> mAudioTracks = new ArrayList<TvTrackInfo>();

        private final List<TvTrackInfo> mAudioTracks = new ArrayList<>();

        // @GuardedBy("mMetadataLock")

        // @GuardedBy("mMetadataLock")

        private final List<TvTrackInfo> mVideoTracks = new ArrayList<TvTrackInfo>();

        private final List<TvTrackInfo> mVideoTracks = new ArrayList<>();

        // @GuardedBy("mMetadataLock")

        // @GuardedBy("mMetadataLock")

        private final List<TvTrackInfo> mSubtitleTracks = new ArrayList<TvTrackInfo>();

        private final List<TvTrackInfo> mSubtitleTracks = new ArrayList<>();

        // @GuardedBy("mMetadataLock")

        // @GuardedBy("mMetadataLock")

        private String mSelectedAudioTrackId;

        private String mSelectedAudioTrackId;

        // @GuardedBy("mMetadataLock")

        // @GuardedBy("mMetadataLock")
@@ -1587,17 +1586,17 @@ public final class TvInputManager { 
                    if (mAudioTracks == null) {

                    if (mAudioTracks == null) {

                        return null;

                        return null;

                    }

                    }

                    return new ArrayList<TvTrackInfo>(mAudioTracks);

                    return new ArrayList<>(mAudioTracks);

                } else if (type == TvTrackInfo.TYPE_VIDEO) {

                } else if (type == TvTrackInfo.TYPE_VIDEO) {

                    if (mVideoTracks == null) {

                    if (mVideoTracks == null) {

                        return null;

                        return null;

                    }

                    }

                    return new ArrayList<TvTrackInfo>(mVideoTracks);

                    return new ArrayList<>(mVideoTracks);

                } else if (type == TvTrackInfo.TYPE_SUBTITLE) {

                } else if (type == TvTrackInfo.TYPE_SUBTITLE) {

                    if (mSubtitleTracks == null) {

                    if (mSubtitleTracks == null) {

                        return null;

                        return null;

                    }

                    }

                    return new ArrayList<TvTrackInfo>(mSubtitleTracks);

                    return new ArrayList<>(mSubtitleTracks);

                }

                }

            }

            }

            throw new IllegalArgumentException("invalid type: " + type);

            throw new IllegalArgumentException("invalid type: " + type);

media/java/android/media/tv/TvInputService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ public abstract class TvInputService extends Service { 
     */

     */

    private final Handler mServiceHandler = new ServiceHandler();

    private final Handler mServiceHandler = new ServiceHandler();

    private final RemoteCallbackList<ITvInputServiceCallback> mCallbacks =

    private final RemoteCallbackList<ITvInputServiceCallback> mCallbacks =

            new RemoteCallbackList<ITvInputServiceCallback>();

            new RemoteCallbackList<>();





    private TvInputManager mTvInputManager;

    private TvInputManager mTvInputManager;
@@ -377,7 +377,7 @@ public abstract class TvInputService extends Service { 
         * @throws IllegalArgumentException if {@code tracks} contains redundant tracks.

         * @throws IllegalArgumentException if {@code tracks} contains redundant tracks.

         */

         */

        public void notifyTracksChanged(final List<TvTrackInfo> tracks) {

        public void notifyTracksChanged(final List<TvTrackInfo> tracks) {

            Set<String> trackIdSet = new HashSet<String>();

            Set<String> trackIdSet = new HashSet<>();

            for (TvTrackInfo track : tracks) {

            for (TvTrackInfo track : tracks) {

                String trackId = track.getId();

                String trackId = track.getId();

                if (trackIdSet.contains(trackId)) {

                if (trackIdSet.contains(trackId)) {