DO NOT MERGE
Merge pie-platform-release (PPRL.181105.017, history only) into master
Bug: 118454372
Change-Id: Idc6a67cb96ec899505e2fe0e65828db9dc90cb96
diff --git a/overlay/frameworks/base/core/res/res/values-as/strings.xml b/overlay/frameworks/base/core/res/res/values-as/strings.xml
deleted file mode 100644
index cdb6d20..0000000
--- a/overlay/frameworks/base/core/res/res/values-as/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2017 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="accessibility_shortcut_toogle_warning" msgid="7758891516165017413">"শ্বৰ্টকাট অন হৈ থকাৰ সময়ত দুয়োটা ভলিউম বুটামত ৩ ছেকেণ্ডৰ বাবে টিপি থাকিলে সাধ্য সুবিধা এটা আৰম্ভ হ\'ব।\n\n এতিয়া ব্য়ৱহাৰ কৰি থকা সাধ্য সুবিধাবোৰ হৈছে:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n আপুনি এই সুবিধাটো ছেটিংসমূহত >; সাধ্য সুবিধাসমূহত সলনি কৰিব পাৰে।"</string>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-or/strings.xml b/overlay/frameworks/base/core/res/res/values-or/strings.xml
deleted file mode 100644
index d5a98b9..0000000
--- a/overlay/frameworks/base/core/res/res/values-or/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2017 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="accessibility_shortcut_toogle_warning" msgid="7758891516165017413">"ସର୍ଟକଟ୍ ଅନ୍ ଥିବା ବେଳେ, ଉଭୟ ବ୍ୟାକ୍ ଓ ଡାଉନ୍ ବଟନ୍ 3 ସେକେଣ୍ଡ ପାଇଁ ଦବାଇବା ଦ୍ୱାରା ଦିବ୍ୟାଙ୍ଗମାନଙ୍କ ପାଇଁ ବୈଶିଷ୍ଟ ଆରମ୍ଭ ହେବ।\n\n ସମ୍ପ୍ରତି ଦିବ୍ୟାଙ୍ଗମାନଙ୍କ ପାଇଁ ସୁବିଧା:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n ଆପଣ ସେଟିଂସ ଏବଂ ଆକ୍ସେସବିଲିଟିରେ ସୁବିଧା ବଦଳାଇ ପାରିବେ।"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-as/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values-as/config.xml
deleted file mode 100644
index 9c7cfc9..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values-as/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="recents_tv_blacklist_array">
- <item msgid="9050240242608018713">"com.google.android.tv.remote.service"</item>
- <item msgid="8901636675968723687">"com.google.android.apps.mediashell"</item>
- </string-array>
-</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-or/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values-or/config.xml
deleted file mode 100644
index 9c7cfc9..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values-or/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="recents_tv_blacklist_array">
- <item msgid="9050240242608018713">"com.google.android.tv.remote.service"</item>
- <item msgid="8901636675968723687">"com.google.android.apps.mediashell"</item>
- </string-array>
-</resources>
diff --git a/products/atv_base.mk b/products/atv_base.mk
index 8e8cc04..4b2602e 100644
--- a/products/atv_base.mk
+++ b/products/atv_base.mk
@@ -34,36 +34,8 @@
# From build/target/product/core_base.mk
PRODUCT_PACKAGES += \
- ContactsProvider \
- DefaultContainerService \
UserDictionaryProvider \
- libaudiopreprocessing \
- libfilterpack_imageproc \
- libgabi++ \
libkeystore \
- libstagefright_soft_aacdec \
- libstagefright_soft_aacenc \
- libstagefright_soft_amrdec \
- libstagefright_soft_amrnbenc \
- libstagefright_soft_amrwbenc \
- libstagefright_soft_avcdec \
- libstagefright_soft_avcenc \
- libstagefright_soft_flacdec \
- libstagefright_soft_flacenc \
- libstagefright_soft_g711dec \
- libstagefright_soft_gsmdec \
- libstagefright_soft_hevcdec \
- libstagefright_soft_mp3dec \
- libstagefright_soft_mpeg2dec \
- libstagefright_soft_mpeg4dec \
- libstagefright_soft_mpeg4enc \
- libstagefright_soft_opusdec \
- libstagefright_soft_rawdec \
- libstagefright_soft_vorbisdec \
- libstagefright_soft_vpxdec \
- libstagefright_soft_vpxenc \
- mdnsd \
- requestsync
# From build/target/product/core.mk
PRODUCT_PACKAGES += \
@@ -81,8 +53,7 @@
ProxyHandler \
SharedStorageBackup \
VpnDialogs \
- com.android.media.tv.remoteprovider \
- com.android.media.tv.remoteprovider.xml
+ com.android.media.tv.remoteprovider
# From build/target/product/generic_no_telephony.mk
PRODUCT_PACKAGES += \
