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

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

Snap for 12524026 from 039e81ad to 25Q1-release 

Change-Id: I28bbeafaacc8e1d9eac2d80209ff58f734e945a9
parents d39f6088 039e81ad

.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
/weathereffects/graphics/build/

msdllib/src/com/google/android/msdl/data/repository/MSDLRepositoryImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ internal class MSDLRepositoryImpl : MSDLRepository { 
                        HapticComposition(

                            listOf(

                                HapticCompositionPrimitive(

                                    VibrationEffect.Composition.PRIMITIVE_TICK,

                                    VibrationEffect.Composition.PRIMITIVE_CLICK,

                                    scale = 1f,

                                    delayMillis = 0,

                                )

msdllib/src/com/google/android/msdl/domain/MSDLPlayerImpl.kt

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ internal class MSDLPlayerImpl( 
                VibrationEffect.Composition.PRIMITIVE_THUD,

                VibrationEffect.Composition.PRIMITIVE_TICK,

                VibrationEffect.Composition.PRIMITIVE_CLICK,

                VibrationEffect.Composition.PRIMITIVE_LOW_TICK,

            )

    }

}

tracinglib/benchmark/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package { 
}



android_test {

    name: "tracinglib-benchmark",

    name: "CoroutineTracingPerfTests",



    srcs: [

        "src/**/*.kt",

tracinglib/benchmark/AndroidTest.xml

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs tracinglib-benchmark metric instrumentation.">

<configuration description="Runs CoroutineTracingPerfTests metric instrumentation.">

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

    <!-- Needed for pushing the trace config file -->

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
@@ -25,7 +25,7 @@ 


    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="tracinglib-benchmark.apk" />

        <option name="test-file-name" value="CoroutineTracingPerfTests.apk" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">