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

Commit 1b72f739 authored by Harshit Mahajan's avatar Harshit Mahajan
Browse files

[conflict] Merge "[CrashRecovery] Separating out required files" into main am:... 

[conflict] Merge "[CrashRecovery] Separating out required files" into main am: 9bbbca96 am: b2091f16 am: abc4c92b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2838375



Bug: b/312712725
Change-Id: I59b01996bed2695a26c238dd60d0b067927e3779
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82803232 abc4c92b

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -140,6 +140,9 @@ filegroup { 
        // For the generated R.java and Manifest.java

        ":framework-res{.aapt.srcjar}",



        // Java/AIDL sources to be moved out to CrashRecovery module

        ":framework-crashrecovery-sources",



        // etc.

        ":framework-javastream-protos",

        ":statslog-framework-java-gen", // FrameworkStatsLog.java

packages/CrashRecovery/OWNERS

0 → 100644
+3 −0
Original line number Diff line number Diff line 
ancr@google.com

harshitmahajan@google.com

robertogil@google.com

packages/CrashRecovery/framework/Android.bp

0 → 100644
+9 −0
Original line number Diff line number Diff line 
filegroup {

    name: "framework-crashrecovery-sources",

    srcs: [

        "java/**/*.java",

        "java/**/*.aidl",

    ],

    path: "java",

    visibility: ["//frameworks/base:__subpackages__"],

}

core/java/android/service/watchdog/ExplicitHealthCheckService.java→packages/CrashRecovery/framework/java/android/service/watchdog/ExplicitHealthCheckService.java

+0 −0

File moved.

View file

core/java/android/service/watchdog/IExplicitHealthCheckService.aidl→packages/CrashRecovery/framework/java/android/service/watchdog/IExplicitHealthCheckService.aidl

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.RemoteCallback; 
/**

 * @hide

 */

@PermissionManuallyEnforced

oneway interface IExplicitHealthCheckService

{

    void setCallback(in @nullable RemoteCallback callback);