From 419b49ade3e19543dd0549c2fedcd91591087a4e Mon Sep 17 00:00:00 2001
From: Inseob Kim <inseob@google.com>
Date: Thu, 15 Oct 2020 12:58:15 +0900
Subject: [PATCH 1/2] Update sysprop_library API txt

Internal props are no longer stored in the txt file.

Bug: 170693240
Test: m
Change-Id: I698b55d7b22afed71c94ee18fe76f409abc18baa
Merged-In: I698b55d7b22afed71c94ee18fe76f409abc18baa
---
 .../api/com.android.sysprop.localization-current.txt     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/core/sysprop/api/com.android.sysprop.localization-current.txt b/core/sysprop/api/com.android.sysprop.localization-current.txt
index fe4f4578683c4..e69de29bb2d1d 100644
--- a/core/sysprop/api/com.android.sysprop.localization-current.txt
+++ b/core/sysprop/api/com.android.sysprop.localization-current.txt
@@ -1,9 +0,0 @@
-props {
-  module: "android.sysprop.LocalizationProperties"
-  prop {
-    api_name: "locale_filter"
-    type: String
-    scope: Internal
-    prop_name: "ro.localization.locale_filter"
-  }
-}

From 36a6eb193003a7c3c49e1840ac73c57e6c64366b Mon Sep 17 00:00:00 2001
From: Woody Lin <woodylin@google.com>
Date: Thu, 15 Oct 2020 18:14:33 +0800
Subject: [PATCH 2/2] Update API of sysprop_library to match current.txt

The current.txt is updated by:
m com.android.sysprop.watchdog-dump-api && \
    rm -rf frameworks/base/core/sysprop/api/com.android.sysprop.watchdog-current.txt && \
    cp -f out/soong/.intermediates/frameworks/base/core/sysprop/com.android.sysprop.watchdog_sysprop_library/api-dump.txt \
    frameworks/base/core/sysprop/api/com.android.sysprop.watchdog-current.txt

Bug: 170935569
Test: m
Change-Id: Ie6d6ff5ed6c3883cb3459b8fb57ca18f4ce28098
Merged-In: Ie6d6ff5ed6c3883cb3459b8fb57ca18f4ce28098
(cherry picked from commit 032f11ee7f810fee991efb6bf5fed3d86b320d4f)
---
 .../com.android.sysprop.watchdog-current.txt  | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/core/sysprop/api/com.android.sysprop.watchdog-current.txt b/core/sysprop/api/com.android.sysprop.watchdog-current.txt
index d901aef945c9b..e69de29bb2d1d 100644
--- a/core/sysprop/api/com.android.sysprop.watchdog-current.txt
+++ b/core/sysprop/api/com.android.sysprop.watchdog-current.txt
@@ -1,20 +0,0 @@
-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"
-  }
-}