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

Commit c4e71fe4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set TargetApi to BAKLAVA" into main

parents c0da3bb2 ddeb6898

packages/Vcn/service-b/src/com/android/server/ConnectivityServiceInitializerB.java

+1 −2
Original line number Diff line number Diff line
@@ -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;

packages/Vcn/service-b/src/com/android/server/VcnManagementService.java

+1 −2
Original line number Diff line number Diff line
@@ -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";

packages/Vcn/service-b/src/com/android/server/vcn/TelephonySubscriptionTracker.java

+1 −2
Original line number Diff line number Diff line
@@ -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

packages/Vcn/service-b/src/com/android/server/vcn/Vcn.java

+1 −2
Original line number Diff line number Diff line
@@ -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();

packages/Vcn/service-b/src/com/android/server/vcn/VcnGatewayConnection.java

+1 −2
Original line number Diff line number Diff line
@@ -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();