Set TargetApi to BAKLAVA
Generated with `cd frameworks/base/packages/Vcn/service-b && \ fdfind -t file . -x sed -i -z 's#// TODO(b\/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization\n@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)#@TargetApi(Build.VERSION_CODES.BAKLAVA)#g' Flag: EXEMPT Baklava Finalization Test: lunch mainline_modules_x86_64-next-eng && m Bug: 376680864 Bug: 374174952 Bug: 392570119 Change-Id: I1dc2af23ac85d1c90b1419a14ca992e68106e9f7
This commit is contained in:
parent
e290f34e8e
commit
4eb48fe868
11 changed files with 11 additions and 22 deletions
|
|
@ -32,8 +32,7 @@ import com.android.tools.r8.keepanno.annotations.UsedByReflection;
|
|||
// Without this annotation, this class will be treated as unused class and be removed during build
|
||||
// time.
|
||||
@UsedByReflection(kind = KeepItemKind.CLASS_AND_METHODS)
|
||||
// TODO(b/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization
|
||||
@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
|
||||
@TargetApi(Build.VERSION_CODES.BAKLAVA)
|
||||
public final class ConnectivityServiceInitializerB extends SystemService {
|
||||
private static final String TAG = ConnectivityServiceInitializerB.class.getSimpleName();
|
||||
private final VcnManagementService mVcnManagementService;
|
||||
|
|
|
|||
|
|
@ -165,8 +165,7 @@ import java.util.concurrent.TimeUnit;
|
|||
* @hide
|
||||
*/
|
||||
// TODO(b/180451994): ensure all incoming + outgoing calls have a cleared calling identity
|
||||
// TODO(b/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization
|
||||
@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
|
||||
@TargetApi(Build.VERSION_CODES.BAKLAVA)
|
||||
public class VcnManagementService extends IVcnManagementService.Stub {
|
||||
@NonNull private static final String TAG = VcnManagementService.class.getSimpleName();
|
||||
@NonNull private static final String CONTEXT_ATTRIBUTION_TAG = "VCN";
|
||||
|
|
|
|||
|
|
@ -79,8 +79,7 @@ import java.util.Set;
|
|||
*
|
||||
* @hide
|
||||
*/
|
||||
// TODO(b/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization
|
||||
@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
|
||||
@TargetApi(Build.VERSION_CODES.BAKLAVA)
|
||||
public class TelephonySubscriptionTracker extends BroadcastReceiver {
|
||||
@NonNull private static final String TAG = TelephonySubscriptionTracker.class.getSimpleName();
|
||||
private static final boolean LOG_DBG = false; // STOPSHIP if true
|
||||
|
|
|
|||
|
|
@ -77,8 +77,7 @@ import java.util.Set;
|
|||
*
|
||||
* @hide
|
||||
*/
|
||||
// TODO(b/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization
|
||||
@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
|
||||
@TargetApi(Build.VERSION_CODES.BAKLAVA)
|
||||
public class Vcn extends Handler {
|
||||
private static final String TAG = Vcn.class.getSimpleName();
|
||||
|
||||
|
|
|
|||
|
|
@ -174,8 +174,7 @@ import java.util.function.Consumer;
|
|||
*
|
||||
* @hide
|
||||
*/
|
||||
// TODO(b/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization
|
||||
@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
|
||||
@TargetApi(Build.VERSION_CODES.BAKLAVA)
|
||||
public class VcnGatewayConnection extends StateMachine {
|
||||
private static final String TAG = VcnGatewayConnection.class.getSimpleName();
|
||||
|
||||
|
|
|
|||
|
|
@ -58,8 +58,7 @@ import java.util.concurrent.Executor;
|
|||
*/
|
||||
// TODO(b/388919146): Implement a more generic solution to prevent concurrent modifications on
|
||||
// mListeners and mRequests
|
||||
// TODO(b/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization
|
||||
@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
|
||||
@TargetApi(Build.VERSION_CODES.BAKLAVA)
|
||||
public class VcnNetworkProvider extends NetworkProvider {
|
||||
private static final String TAG = VcnNetworkProvider.class.getSimpleName();
|
||||
|
||||
|
|
|
|||
|
|
@ -61,8 +61,7 @@ import java.util.concurrent.TimeUnit;
|
|||
*
|
||||
* <p>This class is flag gated by "network_metric_monitor" and "ipsec_tramsform_state"
|
||||
*/
|
||||
// TODO(b/374174952) Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization
|
||||
@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
|
||||
@TargetApi(Build.VERSION_CODES.BAKLAVA)
|
||||
public class IpSecPacketLossDetector extends NetworkMetricMonitor {
|
||||
private static final String TAG = IpSecPacketLossDetector.class.getSimpleName();
|
||||
|
||||
|
|
|
|||
|
|
@ -44,8 +44,7 @@ import java.util.concurrent.Executor;
|
|||
*
|
||||
* <p>This class is flag gated by "network_metric_monitor"
|
||||
*/
|
||||
// TODO(b/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization
|
||||
@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
|
||||
@TargetApi(Build.VERSION_CODES.BAKLAVA)
|
||||
public abstract class NetworkMetricMonitor implements AutoCloseable {
|
||||
private static final String TAG = NetworkMetricMonitor.class.getSimpleName();
|
||||
|
||||
|
|
|
|||
|
|
@ -52,8 +52,7 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
|
||||
/** @hide */
|
||||
// TODO(b/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization
|
||||
@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
|
||||
@TargetApi(Build.VERSION_CODES.BAKLAVA)
|
||||
class NetworkPriorityClassifier {
|
||||
@NonNull private static final String TAG = NetworkPriorityClassifier.class.getSimpleName();
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -75,8 +75,7 @@ import java.util.TreeSet;
|
|||
*
|
||||
* @hide
|
||||
*/
|
||||
// TODO(b/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization
|
||||
@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
|
||||
@TargetApi(Build.VERSION_CODES.BAKLAVA)
|
||||
public class UnderlyingNetworkController {
|
||||
@NonNull private static final String TAG = UnderlyingNetworkController.class.getSimpleName();
|
||||
|
||||
|
|
|
|||
|
|
@ -52,8 +52,7 @@ import java.util.concurrent.TimeUnit;
|
|||
*
|
||||
* @hide
|
||||
*/
|
||||
// TODO(b/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization
|
||||
@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
|
||||
@TargetApi(Build.VERSION_CODES.BAKLAVA)
|
||||
public class UnderlyingNetworkEvaluator {
|
||||
private static final String TAG = UnderlyingNetworkEvaluator.class.getSimpleName();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue