Merge changes from topic "multi_window_foreground_group" into main
* changes:
Add a new policy for for foreground of multi-window
Create a new group for foreground of multi-window
diff --git a/init/Android.bp b/init/Android.bp
index ffb6380..ed1f148 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -226,7 +226,6 @@
],
whole_static_libs: [
"libcap",
- "libcom.android.sysprop.init",
],
header_libs: ["bootimg_headers"],
proto: {
diff --git a/init/builtins.cpp b/init/builtins.cpp
index 122adb7..1e81692 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -46,7 +46,6 @@
#include <map>
#include <memory>
-#include <InitProperties.sysprop.h>
#include <android-base/chrono_utils.h>
#include <android-base/file.h>
#include <android-base/logging.h>
diff --git a/init/property_service.cpp b/init/property_service.cpp
index 96a9cd4..4d3742a 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -46,7 +46,6 @@
#include <thread>
#include <vector>
-#include <InitProperties.sysprop.h>
#include <android-base/chrono_utils.h>
#include <android-base/file.h>
#include <android-base/logging.h>
diff --git a/init/reboot.cpp b/init/reboot.cpp
index 66ee977..ef9db9f 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -39,7 +39,6 @@
#include <thread>
#include <vector>
-#include <InitProperties.sysprop.h>
#include <android-base/chrono_utils.h>
#include <android-base/file.h>
#include <android-base/logging.h>
diff --git a/init/sysprop/Android.bp b/init/sysprop/Android.bp
deleted file mode 100644
index 296cdc1..0000000
--- a/init/sysprop/Android.bp
+++ /dev/null
@@ -1,16 +0,0 @@
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "system_core_init_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["system_core_init_license"],
-}
-
-sysprop_library {
- name: "com.android.sysprop.init",
- srcs: ["InitProperties.sysprop"],
- property_owner: "Platform",
- api_packages: ["android.sysprop"],
- recovery_available: true,
-}
diff --git a/init/sysprop/InitProperties.sysprop b/init/sysprop/InitProperties.sysprop
deleted file mode 100644
index 24c2434..0000000
--- a/init/sysprop/InitProperties.sysprop
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2019 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.
-
-owner: Platform
-module: "android.sysprop.InitProperties"
-
-# Serves as a signal to all processes that userspace reboot is happening.
-prop {
- api_name: "userspace_reboot_in_progress"
- type: Boolean
- scope: Public
- access: ReadWrite
- prop_name: "sys.init.userspace_reboot.in_progress"
- integer_as_bool: true
-}
-
-# Shows whenever the device supports userspace reboot or not.
-prop {
- api_name: "is_userspace_reboot_supported"
- type: Boolean
- scope: Public
- access: Readonly
- prop_name: "init.userspace_reboot.is_supported"
- integer_as_bool: true
-}
diff --git a/init/sysprop/api/com.android.sysprop.init-current.txt b/init/sysprop/api/com.android.sysprop.init-current.txt
deleted file mode 100644
index 01f4e9a..0000000
--- a/init/sysprop/api/com.android.sysprop.init-current.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-props {
- module: "android.sysprop.InitProperties"
- prop {
- api_name: "is_userspace_reboot_supported"
- prop_name: "init.userspace_reboot.is_supported"
- integer_as_bool: true
- }
- prop {
- api_name: "userspace_reboot_in_progress"
- access: ReadWrite
- prop_name: "sys.init.userspace_reboot.in_progress"
- integer_as_bool: true
- }
-}
diff --git a/init/sysprop/api/com.android.sysprop.init-latest.txt b/init/sysprop/api/com.android.sysprop.init-latest.txt
deleted file mode 100644
index 01f4e9a..0000000
--- a/init/sysprop/api/com.android.sysprop.init-latest.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-props {
- module: "android.sysprop.InitProperties"
- prop {
- api_name: "is_userspace_reboot_supported"
- prop_name: "init.userspace_reboot.is_supported"
- integer_as_bool: true
- }
- prop {
- api_name: "userspace_reboot_in_progress"
- access: ReadWrite
- prop_name: "sys.init.userspace_reboot.in_progress"
- integer_as_bool: true
- }
-}