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

Commit f6934f14 authored May 05, 2023 by Yanli Wan Committed by Automerger Merge Worker May 05, 2023

Merge "Allow Device Lock APEX to use the SettingsLib" into udc-dev am: faf24da9

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

Change-Id: I7c6420cf6014ec646bfd9652c3ee41ce0a89d553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 35f6cc23 faf24da9

packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ android_library {
		"//apex_available:platform",
		"com.android.adservices",
		"com.android.cellbroadcast",
		"com.android.devicelock",
		"com.android.extservices",
		"com.android.permission",
		"com.android.healthfitness",

packages/SettingsLib/SettingsTheme/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ android_library {
		apex_available: [
		"//apex_available:platform",
		"com.android.cellbroadcast",
		"com.android.devicelock",
		"com.android.extservices",
		"com.android.permission",
		"com.android.adservices",

packages/SettingsLib/SettingsTransition/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ android_library {
		"//apex_available:platform",
		"com.android.adservices",
		"com.android.cellbroadcast",
		"com.android.devicelock",
		"com.android.extservices",
		"com.android.permission",
		"com.android.healthfitness",

packages/SettingsLib/TopIntroPreference/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ android_library {
		apex_available: [
		"//apex_available:platform",
		"com.android.cellbroadcast",
		"com.android.devicelock",
		"com.android.healthfitness",
		],
		}

packages/SettingsLib/Utils/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ android_library {
		"//apex_available:platform",
		"com.android.adservices",
		"com.android.cellbroadcast",
		"com.android.devicelock",
		"com.android.extservices",
		"com.android.healthfitness",
		"com.android.permission",