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

Commit 7f437bb3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move Callbacks"

parents 06794713 9534f8ab

media/java/android/media/tv/tuner/Lnb.java

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.RequiresPermission; 
import android.annotation.SystemApi;

import android.content.Context;

import android.hardware.tv.tuner.V1_0.Constants;

import android.media.tv.tuner.Tuner.LnbCallback;

import android.media.tv.tuner.TunerConstants.Result;



import java.lang.annotation.Retention;

media/java/android/media/tv/tuner/LnbCallback.java

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.media.tv.tuner;





/**

 * Callback interface for receiving information from LNBs.

 *

 * @hide

 */

public interface LnbCallback {

    /**

     * Invoked when there is a LNB event.

     */

    void onEvent(int lnbEventType);



    /**

     * Invoked when there is a new DiSEqC message.

     *

     * @param diseqcMessage a byte array of data for DiSEqC (Digital Satellite

     * Equipment Control) message which is specified by EUTELSAT Bus Functional

     * Specification Version 4.2.

     */

    void onDiseqcMessage(byte[] diseqcMessage);

}

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

+1 −36
Original line number Diff line number Diff line
@@ -137,29 +137,10 @@ public final class Tuner implements AutoCloseable { 


    private static native DemuxCapabilities nativeGetDemuxCapabilities();



    /**

     * LNB Callback.

     *

     * @hide

     */

    public interface LnbCallback {

        /**

         * Invoked when there is a LNB event.

         */

        void onEvent(int lnbEventType);



        /**

         * Invoked when there is a new DiSEqC message.

         *

         * @param diseqcMessage a byte array of data for DiSEqC (Digital Satellite

         * Equipment Control) message which is specified by EUTELSAT Bus Functional

         * Specification Version 4.2.

         */

        void onDiseqcMessage(byte[] diseqcMessage);

    }



    /**

     * Callback interface for receiving information from the corresponding filters.

     * TODO: remove

     */

    public interface FilterCallback {

        /**
@@ -178,22 +159,6 @@ public final class Tuner implements AutoCloseable { 
        void onFilterStatusChanged(@NonNull Filter filter, @FilterStatus int status);

    }



    /**

     * DVR Callback.

     *

     * @hide

     */

    public interface DvrCallback {

        /**

         * Invoked when record status changed.

         */

        void onRecordStatus(int status);

        /**

         * Invoked when playback status changed.

         */

        void onPlaybackStatus(int status);

    }



    @Nullable

    private EventHandler createEventHandler() {

        Looper looper;

media/java/android/media/tv/tuner/dvr/Dvr.java

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.media.tv.tuner.dvr; 


import android.annotation.BytesLong;

import android.annotation.NonNull;

import android.media.tv.tuner.Tuner.DvrCallback;

import android.media.tv.tuner.Tuner.Filter;

import android.media.tv.tuner.TunerConstants.Result;

import android.os.ParcelFileDescriptor;

media/java/android/media/tv/tuner/dvr/DvrCallback.java

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.media.tv.tuner.dvr;



/**

 * Callback interface for receiving information from DVR interfaces.

 *

 * @hide

 */

public interface DvrCallback {

    /**

     * Invoked when record status changed.

     */

    void onRecordStatusChanged(int status);

    /**

     * Invoked when playback status changed.

     */

    void onPlaybackStatusChanged(int status);

}