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

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

Merge "Make sure mainline modules can use Ravenwood annotations" into main

parents 447e938e db7ad0f8

core/java/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -294,7 +294,10 @@ java_library { 
java_library {

    name: "modules-utils-locallog",

    srcs: ["android/util/LocalLog.java"],

    libs: ["unsupportedappusage"],

    libs: [

        "unsupportedappusage",

        "ravenwood-annotations-lib",

    ],

    sdk_version: "module_current",

    min_sdk_version: "30",

    apex_available: [

core/java/android/os/HandlerExecutor.java

+1 −2
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ import java.util.concurrent.RejectedExecutionException; 
 *

 * @hide

 */

// Exported to Mainline modules; cannot use annotations

// @android.ravenwood.annotation.RavenwoodKeepWholeClass

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class HandlerExecutor implements Executor {

    private final Handler mHandler;

core/java/android/util/BackupUtils.java

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ import java.io.IOException; 
 * Utility methods for Backup/Restore

 * @hide

 */

// Exported to Mainline modules; cannot use annotations

// @android.ravenwood.annotation.RavenwoodKeepWholeClass

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class BackupUtils {



    public static final int NULL = 0;

core/java/android/util/IndentingPrintWriter.java

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ import java.util.Arrays; 
 *

 * @hide

 */

// Exported to Mainline modules; cannot use annotations

// @android.ravenwood.annotation.RavenwoodKeepWholeClass

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class IndentingPrintWriter extends PrintWriter {

    private final String mSingleIndent;

    private final int mWrapLength;

core/java/android/util/LocalLog.java

+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ import java.util.Iterator; 
/**

 * @hide

 */

// Exported to Mainline modules; cannot use annotations

// @android.ravenwood.annotation.RavenwoodKeepWholeClass

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public final class LocalLog {



    private final Deque<String> mLog;