Merge "Disable Fold lock behavior setting by default" into main (3606ab36) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -389,6 +389,7 @@ java_defaults {
		static_libs: [
		"android.hardware.common.fmq-V1-java",
		"bouncycastle-repackaged-unbundled",
		"com.android.sysprop.foldlockbehavior",
		"framework-internal-utils",
		// If MimeMap ever becomes its own APEX, then this dependency would need to be removed
		// in favor of an API stubs dependency in java_library "framework" below.

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.
		*/

		package com.android.internal.foldables;

		import android.content.res.Resources;
		import android.sysprop.FoldLockBehaviorProperties;

		import com.android.internal.R;

		/**
		* Wrapper class to access {@link FoldLockBehaviorProperties} and also assists with testing
		*/
		public class FoldLockSettingAvailabilityProvider {

		boolean mFoldLockBehaviorResourceValue;

		public FoldLockSettingAvailabilityProvider(Resources resources) {
		mFoldLockBehaviorResourceValue = resources.getBoolean(
		R.bool.config_fold_lock_behavior);
		}

		public boolean isFoldLockBehaviorAvailable() {
		return mFoldLockBehaviorResourceValue
		&& FoldLockBehaviorProperties.fold_lock_setting_enabled().orElse(false);
		}
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -36,3 +36,10 @@ sysprop_library {
		api_packages: ["android.sysprop"],
		vendor_available: false,
		}

		sysprop_library {
		name: "com.android.sysprop.foldlockbehavior",
		srcs: ["FoldLockBehaviorProperties.sysprop"],
		property_owner: "Platform",
		api_packages: ["android.sysprop"],
		}

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2023 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.FoldLockBehaviorProperties"
		owner: Platform

		prop {
		api_name: "fold_lock_setting_enabled"
		type: Boolean
		prop_name: "persist.fold_lock_setting_enabled"
		scope: Internal
		access: Readonly
		}

0 → 100644

+0 −0

Empty file added.