Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move constants to a separate class

Browse Source 
Test: make;
Change-Id: I3f03a8b515e15b23285dc7a2bcecca75f26d07ed
This commit is contained in:
shubang
2019-10-31 11:20:46 -07:00
parent be66ddd989
commit 420aaa107e
2 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
media/java/android/media/tv/tuner/Tuner.java
View File

@@ -16,11 +16,6 @@
package android.media.tv.tuner;
import android.annotation.IntDef;
import android.hardware.tv.tuner.V1_0.Constants;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
/**
@@ -32,32 +27,7 @@ public final class Tuner implements AutoCloseable {
private static final String TAG = "MediaTvTuner";
private static final boolean DEBUG = false;
@Retention(RetentionPolicy.SOURCE)
@IntDef({FRONTEND_TYPE_UNDEFINED, FRONTEND_TYPE_ANALOG, FRONTEND_TYPE_ATSC, FRONTEND_TYPE_ATSC3,
FRONTEND_TYPE_DVBC, FRONTEND_TYPE_DVBS, FRONTEND_TYPE_DVBT, FRONTEND_TYPE_ISDBS,
FRONTEND_TYPE_ISDBS3, FRONTEND_TYPE_ISDBT})
public @interface FrontendType {}
public static final int FRONTEND_TYPE_UNDEFINED = Constants.FrontendType.UNDEFINED;
public static final int FRONTEND_TYPE_ANALOG = Constants.FrontendType.ANALOG;
public static final int FRONTEND_TYPE_ATSC = Constants.FrontendType.ATSC;
public static final int FRONTEND_TYPE_ATSC3 = Constants.FrontendType.ATSC3;
public static final int FRONTEND_TYPE_DVBC = Constants.FrontendType.DVBC;
public static final int FRONTEND_TYPE_DVBS = Constants.FrontendType.DVBS;
public static final int FRONTEND_TYPE_DVBT = Constants.FrontendType.DVBT;
public static final int FRONTEND_TYPE_ISDBS = Constants.FrontendType.ISDBS;
public static final int FRONTEND_TYPE_ISDBS3 = Constants.FrontendType.ISDBS3;
public static final int FRONTEND_TYPE_ISDBT = Constants.FrontendType.ISDBT;
@Retention(RetentionPolicy.SOURCE)
@IntDef({FRONTEND_EVENT_TYPE_LOCKED, FRONTEND_EVENT_TYPE_NO_SIGNAL,
FRONTEND_EVENT_TYPE_LOST_LOCK})
public @interface FrontendEventType {}
public static final int FRONTEND_EVENT_TYPE_LOCKED = Constants.FrontendEventType.LOCKED;
public static final int FRONTEND_EVENT_TYPE_NO_SIGNAL = Constants.FrontendEventType.NO_SIGNAL;
public static final int FRONTEND_EVENT_TYPE_LOST_LOCK = Constants.FrontendEventType.LOST_LOCK;
private static final int MSG_ON_FRONTEND_EVENT = 1;
static {
System.loadLibrary("media_tv_tuner");

72
media/java/android/media/tv/tuner/TunerConstants.java Normal file
View File

@@ -0,0 +1,72 @@
/*
* 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;
import android.annotation.IntDef;
import android.hardware.tv.tuner.V1_0.Constants;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
* @hide
*/
final class TunerConstants {
public static final int INVALID_TS_PID = Constants.Constant.INVALID_TS_PID;
public static final int INVALID_STREAM_ID = Constants.Constant.INVALID_STREAM_ID;
@Retention(RetentionPolicy.SOURCE)
@IntDef({FRONTEND_TYPE_UNDEFINED, FRONTEND_TYPE_ANALOG, FRONTEND_TYPE_ATSC, FRONTEND_TYPE_ATSC3,
FRONTEND_TYPE_DVBC, FRONTEND_TYPE_DVBS, FRONTEND_TYPE_DVBT, FRONTEND_TYPE_ISDBS,
FRONTEND_TYPE_ISDBS3, FRONTEND_TYPE_ISDBT})
public @interface FrontendType {}
public static final int FRONTEND_TYPE_UNDEFINED = Constants.FrontendType.UNDEFINED;
public static final int FRONTEND_TYPE_ANALOG = Constants.FrontendType.ANALOG;
public static final int FRONTEND_TYPE_ATSC = Constants.FrontendType.ATSC;
public static final int FRONTEND_TYPE_ATSC3 = Constants.FrontendType.ATSC3;
public static final int FRONTEND_TYPE_DVBC = Constants.FrontendType.DVBC;
public static final int FRONTEND_TYPE_DVBS = Constants.FrontendType.DVBS;
public static final int FRONTEND_TYPE_DVBT = Constants.FrontendType.DVBT;
public static final int FRONTEND_TYPE_ISDBS = Constants.FrontendType.ISDBS;
public static final int FRONTEND_TYPE_ISDBS3 = Constants.FrontendType.ISDBS3;
public static final int FRONTEND_TYPE_ISDBT = Constants.FrontendType.ISDBT;
@Retention(RetentionPolicy.SOURCE)
@IntDef({FRONTEND_EVENT_TYPE_LOCKED, FRONTEND_EVENT_TYPE_NO_SIGNAL,
FRONTEND_EVENT_TYPE_LOST_LOCK})
public @interface FrontendEventType {}
public static final int FRONTEND_EVENT_TYPE_LOCKED = Constants.FrontendEventType.LOCKED;
public static final int FRONTEND_EVENT_TYPE_NO_SIGNAL = Constants.FrontendEventType.NO_SIGNAL;
public static final int FRONTEND_EVENT_TYPE_LOST_LOCK = Constants.FrontendEventType.LOST_LOCK;
@Retention(RetentionPolicy.SOURCE)
@IntDef({DATA_FORMAT_TS, DATA_FORMAT_PES, DATA_FORMAT_ES, DATA_FORMAT_SHV_TLV})
public @interface DataFormat {}
public static final int DATA_FORMAT_TS = Constants.DataFormat.TS;
public static final int DATA_FORMAT_PES = Constants.DataFormat.PES;
public static final int DATA_FORMAT_ES = Constants.DataFormat.ES;
public static final int DATA_FORMAT_SHV_TLV = Constants.DataFormat.SHV_TLV;
private TunerConstants() {
}
}