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

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

Merge "Injecting system calls into alarm manager"

parents 826a36c1 6226c2ff

services/core/java/com/android/server/AlarmManagerService.java

+242 −164

File changed.

Preview size limit exceeded, changes collapsed.

services/java/com/android/server/SystemServer.java

+2 −1
Original line number Diff line number Diff line
@@ -883,7 +883,8 @@ public final class SystemServer { 
            }



            traceBeginAndSlog("StartAlarmManagerService");

            mSystemServiceManager.startService(AlarmManagerService.class);

            mSystemServiceManager.startService(new AlarmManagerService(context));



            traceEnd();



            traceBeginAndSlog("InitWatchdog");

services/tests/mockingservicestests/Android.mk

+6 −7
Original line number Diff line number Diff line
@@ -20,22 +20,21 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := \

    services.core \

    services.devicepolicy \

    frameworks-base-testutils \

    services.core \

    androidx-test \

    mockito-target-extended-minus-junit4 \

    platform-test-annotations \

    ShortcutManagerTestUtils \

    compatibility-device-util \

    truth-prebuilt

    truth-prebuilt \



LOCAL_JAVA_LIBRARIES := \

    android.test.mock

LOCAL_JAVA_LIBRARIES := android.test.mock android.test.base android.test.runner



LOCAL_JNI_SHARED_LIBRARIES := \

    libdexmakerjvmtiagent \

    libstaticjvmtiagent

    libstaticjvmtiagent \



LOCAL_CERTIFICATE := platform

LOCAL_PACKAGE_NAME := FrameworksMockingServicesTests

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_COMPATIBILITY_SUITE := device-tests

services/tests/mockingservicestests/AndroidManifest.xml

+4 −1
Original line number Diff line number Diff line
@@ -17,7 +17,10 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.frameworks.mockingservicestests">



    <application android:debuggable="true">

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />



    <application android:testOnly="true"

                 android:debuggable="true">

        <uses-library android:name="android.test.runner" />

    </application>

services/tests/mockingservicestests/AndroidTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


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

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

        <option name="install-arg" value="-t" />

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

    </target_preparer>