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

Commit b67a9540 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11517367 from 8454fc6b to 24Q2-release 

Change-Id: I5fd96b8884ec833f40d0bd87d7a1d665029c1952
parents d53fe6bc 8454fc6b

AconfigFlags.bp

+9 −0
Original line number Diff line number Diff line
@@ -310,6 +310,8 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.os.flags-aconfig",

    package: "android.os",

    exportable: true,

    container: "system",

    srcs: ["core/java/android/os/*.aconfig"],

}
@@ -326,6 +328,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "android.os.flags-aconfig-java-export",

    aconfig_declarations: "android.os.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    mode: "exported",

}



// VirtualDeviceManager

cc_aconfig_library {

    name: "android.companion.virtualdevice.flags-aconfig-cc",

apct-tests/perftests/core/src/android/graphics/perftests/VectorDrawablePerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import android.perftests.utils.BenchmarkState; 
import android.perftests.utils.BitmapUtils;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfTestActivity;

import android.test.suitebuilder.annotation.LargeTest;



import androidx.test.filters.LargeTest;

import androidx.test.rule.ActivityTestRule;

import androidx.test.runner.AndroidJUnit4;

apct-tests/perftests/core/src/android/libcore/AdditionPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package android.libcore; 


import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.test.suitebuilder.annotation.LargeTest;



import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Rule;

apct-tests/perftests/core/src/android/libcore/ArrayCopyPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package android.libcore; 


import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.test.suitebuilder.annotation.LargeTest;



import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Rule;

apct-tests/perftests/core/src/android/libcore/ArrayIterationPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package android.libcore; 


import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.test.suitebuilder.annotation.LargeTest;



import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Rule;