Merge "prebuilts: Add SoundPickerPrebuilt" into q10
diff --git a/build/tools/repopick.py b/build/tools/repopick.py
index 2b1271f..a85b1d8 100755
--- a/build/tools/repopick.py
+++ b/build/tools/repopick.py
@@ -182,7 +182,7 @@
parser.add_argument('-f', '--force', action='store_true', help='force cherry pick even if change is closed')
parser.add_argument('-p', '--pull', action='store_true', help='execute pull instead of cherry-pick')
parser.add_argument('-P', '--path', help='use the specified path for the change')
- parser.add_argument('-t', '--topic', help='pick all commits from a specified topic')
+ parser.add_argument('-t', '--topic', nargs='*', help='pick all commits from the specified topics')
parser.add_argument('-Q', '--query', help='pick all commits using the specified query')
parser.add_argument('-g', '--gerrit', default=default_gerrit, help='Gerrit Instance to use. Form proto://[user@]host[:port]')
parser.add_argument('-e', '--exclude', nargs=1, help='exclude a list of commit numbers separated by a ,')
@@ -282,8 +282,13 @@
return cmp(review_a['number'], review_b['number'])
if args.topic:
- reviews = fetch_query(args.gerrit, 'topic:{0}'.format(args.topic))
- change_numbers = [str(r['number']) for r in sorted(reviews, key=cmp_to_key(cmp_reviews))]
+ for t in args.topic:
+ # Store current topic to process for change_numbers
+ topic = fetch_query(args.gerrit, 'topic:{0}'.format(t))
+ # Append topic to reviews, for later reference
+ reviews += topic
+ # Cycle through the current topic to get the change numbers
+ change_numbers += sorted([str(r['number']) for r in topic], key=int)
if args.query:
reviews = fetch_query(args.gerrit, args.query)
change_numbers = [str(r['number']) for r in sorted(reviews, key=cmp_to_key(cmp_reviews))]
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index ec48425..b2287f8 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -41,10 +41,6 @@
PRODUCT_PACKAGES += \
rsync
-# Overlays
-PRODUCT_PACKAGES += \
- GooglePermissionControllerOverlay
-
# These packages are excluded from user builds
PRODUCT_PACKAGES_DEBUG += \
procmem
diff --git a/overlay/Android.mk b/overlay/Android.mk
index 317907b..8a537c3 100644
--- a/overlay/Android.mk
+++ b/overlay/Android.mk
@@ -1,18 +1,6 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE := GooglePermissionControllerOverlay
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(LOCAL_MODULE)/$(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay/
-LOCAL_PRODUCT_MODULE := true
-LOCAL_DEX_PREOPT := false
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
LOCAL_MODULE := PixelDocumentsUIGoogleOverlay
LOCAL_OVERRIDES_PACKAGES := DocumentsUIOverlay
LOCAL_MODULE_TAGS := optional
diff --git a/overlay/GooglePermissionControllerOverlay/GooglePermissionControllerOverlay.apk b/overlay/GooglePermissionControllerOverlay/GooglePermissionControllerOverlay.apk
deleted file mode 100644
index d138535..0000000
--- a/overlay/GooglePermissionControllerOverlay/GooglePermissionControllerOverlay.apk
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index a56f122..b38d060 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -25,6 +25,18 @@
<item>org.microg.nlp</item>
</string-array>
+ <!-- Default SMS Application. This will be the default SMS application when
+ the phone first boots. The user can then change the default app to one
+ of their choosing.
+ This can be overridden for devices where a different default SMS
+ application is desired.
+ If this string is empty or the specified package does not exist, then
+ the platform will search for an SMS app and use that (if there is one)-->
+ <string name="config_defaultSms" translatable="false">com.android.messaging</string>
+
+ <!-- The name of the package that will hold the dialer role by default. -->
+ <string name="config_defaultDialer" translatable="false">com.android.dialer</string>
+
<bool name="config_cellBroadcastAppLinks">true</bool>
<!-- Disable stock OTA components if installed -->