From ebc1d7dcf6a2ee9ea4779f14213b832cdb1cad07 Mon Sep 17 00:00:00 2001 From: Tanuj Tekriwal Date: Thu, 15 Dec 2022 09:39:53 +0530 Subject: [PATCH] Remove category home from TvSettings as it causes conflict. Tracked-On: OAM-104028 Signed-off-by: Tanuj Tekriwal --- ...nt-t-add-TvSettings-to-category-Home.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 aosp_diff/celadon_tv/packages/apps/TvSettings/0001-Dont-t-add-TvSettings-to-category-Home.patch diff --git a/aosp_diff/celadon_tv/packages/apps/TvSettings/0001-Dont-t-add-TvSettings-to-category-Home.patch b/aosp_diff/celadon_tv/packages/apps/TvSettings/0001-Dont-t-add-TvSettings-to-category-Home.patch new file mode 100644 index 0000000000..2b58df6f0d --- /dev/null +++ b/aosp_diff/celadon_tv/packages/apps/TvSettings/0001-Dont-t-add-TvSettings-to-category-Home.patch @@ -0,0 +1,30 @@ +From 8f9a102eb54a10074b0593efde582c26bc3686b6 Mon Sep 17 00:00:00 2001 +From: Tanuj Tekriwal +Date: Thu, 15 Dec 2022 09:31:35 +0530 +Subject: [PATCH] Dont't add TvSettings to category Home + +When TvSettings is added to category home with TvSampleLeanbackLauncher +then it causes conflict between the 2 and stops Android boot. + +Tracked-On: OAM-104028 +Signed-off-by: Tanuj Tekriwal +--- + Settings/AndroidManifest.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml +index 63cdf7207..53488e873 100644 +--- a/Settings/AndroidManifest.xml ++++ b/Settings/AndroidManifest.xml +@@ -693,7 +693,7 @@ + android:theme="@style/FallbackHome"> + + +- ++ + + + +-- +2.17.1 +