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

Commit 121c035a authored by Woody Lin's avatar Woody Lin Committed by Automerger Merge Worker
Browse files

Merge "Watchdog: break timeout loop via system fatal crash" am: 16402fc4 am:... 

Merge "Watchdog: break timeout loop via system fatal crash" am: 16402fc4 am: 2b206609 am: 6c1e2dd1 am: b54a712b

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

Change-Id: Ia7946f8ecfee3597121a237a884c8cac79e0d01b
parents f2276e4c b54a712b

core/sysprop/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -19,3 +19,11 @@ sysprop_library { 
    api_packages: ["android.sysprop"],

    vendor_available: false,

}



sysprop_library {

    name: "com.android.sysprop.watchdog",

    srcs: ["WatchdogProperties.sysprop"],

    property_owner: "Platform",

    api_packages: ["android.sysprop"],

    vendor_available: false,

}

core/sysprop/WatchdogProperties.sysprop

0 → 100644
+45 −0
Original line number Diff line number Diff line 
# Copyright (C) 2020 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



module: "android.sysprop.WatchdogProperties"

owner: Platform



# To escape the watchdog timeout loop, fatal reboot the system when

# watchdog timed out 'fatal_count' times in 'fatal_window_second'

# seconds, if both values are not 0. Default value of both is 0.

prop {

    api_name: "fatal_count"

    type: Integer

    prop_name: "framework_watchdog.fatal_count"

    scope: Internal

    access: Readonly

}



prop {

    api_name: "fatal_window_second"

    type: Integer

    prop_name: "framework_watchdog.fatal_window.second"

    scope: Internal

    access: Readonly

}



# The fatal counting can be disabled by setting property

# 'is_fatal_ignore' to true.

prop {

    api_name: "is_fatal_ignore"

    type: Boolean

    prop_name: "persist.debug.framework_watchdog.fatal_ignore"

    scope: Internal

    access: Readonly

}

core/sysprop/api/com.android.sysprop.watchdog-current.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
props {

  module: "android.sysprop.WatchdogProperties"

  prop {

    api_name: "fatal_count"

    type: Integer

    scope: Internal

    prop_name: "framework_watchdog.fatal_count"

  }

  prop {

    api_name: "fatal_window_second"

    type: Integer

    scope: Internal

    prop_name: "framework_watchdog.fatal_window.second"

  }

  prop {

    api_name: "is_fatal_ignore"

    scope: Internal

    prop_name: "persist.debug.framework_watchdog.fatal_ignore"

  }

}

core/sysprop/api/com.android.sysprop.watchdog-latest.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
props {

  module: "android.sysprop.WatchdogProperties"

  prop {

    api_name: "fatal_count"

    type: Integer

    scope: Internal

    prop_name: "framework_watchdog.fatal_count"

  }

  prop {

    api_name: "fatal_window_second"

    type: Integer

    scope: Internal

    prop_name: "framework_watchdog.fatal_window.second"

  }

  prop {

    api_name: "is_fatal_ignore"

    scope: Internal

    prop_name: "persist.debug.framework_watchdog.fatal_ignore"

  }

}

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ java_library_static { 
        "netd_aidl_interfaces-platform-java",

        "overlayable_policy_aidl-java",

        "SurfaceFlingerProperties",

        "com.android.sysprop.watchdog",

    ],

}