Merge Android 12 QPR1
Bug: 210511427
Merged-In: I2b0b83ee7aee731031ebb4f18d476a39bf3e11d5
Change-Id: I58cdd42675542d875b1fee06777d1bbd836e2192
diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp
index 5585366..9d5cbec 100644
--- a/PermissionController/Android.bp
+++ b/PermissionController/Android.bp
@@ -130,6 +130,10 @@
type: "lite",
},
+ lint: {
+ strict_updatability_linting: true,
+ },
+
optimize: {
proguard_flags_files: ["proguard.flags"],
},
diff --git a/PermissionController/res/values-v31/strings.xml b/PermissionController/res/values-v31/strings.xml
new file mode 100644
index 0000000..d61afa3
--- /dev/null
+++ b/PermissionController/res/values-v31/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Name of a font family to use for headlines in SettingsLib. This overrides the default value which points to a private resource. Setting it to an empty value allows it to fallback to the default on the device. -->
+ <string name="settingslib_config_headlineFontFamily" translatable="false"></string>
+</resources>
+
diff --git a/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt b/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
index 1be7e8f..10a58ab 100644
--- a/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
+++ b/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
@@ -121,7 +121,7 @@
fun isHibernationEnabled(): Boolean {
return SdkLevel.isAtLeastS() &&
DeviceConfig.getBoolean(NAMESPACE_APP_HIBERNATION, Utils.PROPERTY_APP_HIBERNATION_ENABLED,
- false /* defaultValue */)
+ true /* defaultValue */)
}
/**
diff --git a/framework-s/Android.bp b/framework-s/Android.bp
index 476d03b..22dce7e 100644
--- a/framework-s/Android.bp
+++ b/framework-s/Android.bp
@@ -67,6 +67,9 @@
],
installable: true,
jarjar_rules: ":permission-jarjar-rules",
+ lint: {
+ strict_updatability_linting: true,
+ },
min_sdk_version: "30",
permitted_packages: [
"android.permission",
diff --git a/framework/Android.bp b/framework/Android.bp
index 04975ed..c379ff7 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -44,6 +44,9 @@
"com.android.permission",
"test_com.android.permission",
],
+ lint: {
+ strict_updatability_linting: true,
+ },
min_sdk_version: "30",
permitted_packages: [
"android.permission",
diff --git a/service/Android.bp b/service/Android.bp
index 46066a2..69e58d4 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -103,6 +103,9 @@
"service-permission-shared",
],
jarjar_rules: ":permission-jarjar-rules",
+ lint: {
+ strict_updatability_linting: true,
+ },
min_sdk_version: "30",
sdk_version: "system_server_current",
apex_available: [
