Merge "Fix missing dev nodes in init_boot.img ramdisk" am: 65af9993b3 am: 07738c42b2 am: f74012fd97 am: 25ebc644b0 am: 0b93342432
Original change: https://android-review.googlesource.com/c/platform/build/+/2442241
Change-Id: I21b8bbc967d4673470737bc2f13406eeee586b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index ae5db8f..1211684 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -40,10 +40,10 @@
include $(INTERNAL_BUILD_ID_MAKEFILE)
endif
-DEFAULT_PLATFORM_VERSION := UP1A
+DEFAULT_PLATFORM_VERSION := VP1A
.KATI_READONLY := DEFAULT_PLATFORM_VERSION
MIN_PLATFORM_VERSION := UP1A
-MAX_PLATFORM_VERSION := UP1A
+MAX_PLATFORM_VERSION := VP1A
# The last stable version name of the platform that was released. During
# development, this stays at that previous version, while the codename indicates
@@ -54,6 +54,7 @@
# These are the current development codenames, if the build is not a final
# release build. If this is a final release build, it is simply "REL".
PLATFORM_VERSION_CODENAME.UP1A := UpsideDownCake
+PLATFORM_VERSION_CODENAME.VP1A := VanillaIceCream
# This is the user-visible version. In a final release build it should
# be empty to use PLATFORM_VERSION as the user-visible version. For
@@ -90,7 +91,7 @@
Base Base11 Cupcake Donut Eclair Eclair01 EclairMr1 Froyo Gingerbread GingerbreadMr1 \
Honeycomb HoneycombMr1 HoneycombMr2 IceCreamSandwich IceCreamSandwichMr1 \
JellyBean JellyBeanMr1 JellyBeanMr2 Kitkat KitkatWatch Lollipop LollipopMr1 M N NMr1 O OMr1 P \
-Q R S Sv2 Tiramisu UpsideDownCake
+Q R S Sv2 Tiramisu UpsideDownCake VanillaIceCream
# Convert from space separated list to comma separated
PLATFORM_VERSION_KNOWN_CODENAMES := \
diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk
index 3009d6a..2da1395 100644
--- a/target/product/handheld_system.mk
+++ b/target/product/handheld_system.mk
@@ -43,7 +43,6 @@
CaptivePortalLogin \
CertInstaller \
CredentialManager \
- DeviceAsWebcam \
DocumentsUI \
DownloadProviderUi \
EasterEgg \
diff --git a/target/product/sysconfig/preinstalled-packages-platform-handheld-product.xml b/target/product/sysconfig/preinstalled-packages-platform-handheld-product.xml
index 79c1565..54add22 100644
--- a/target/product/sysconfig/preinstalled-packages-platform-handheld-product.xml
+++ b/target/product/sysconfig/preinstalled-packages-platform-handheld-product.xml
@@ -17,8 +17,11 @@
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
-->
<config>
- <install-in-user-type package="com.android.wallpapercropper">
+ <!-- Android Keyboard (AOSP) (LatinIME) TODO(b/258055479) -->
+ <install-in-user-type package="com.android.inputmethod.latin">
+ <install-in user-type="SYSTEM" />
<install-in user-type="FULL" />
+ <install-in user-type="PROFILE" />
</install-in-user-type>
<!-- Calendar -->
@@ -28,30 +31,43 @@
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
- <!-- Camera -->
+ <!-- Camera (Camera2) -->
<install-in-user-type package="com.android.camera2">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
- <!-- Clock -->
+ <!-- Clock (DeskClock) -->
<install-in-user-type package="com.android.deskclock">
<install-in user-type="FULL" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
- <!-- Contacts -->
+ <!-- Contacts -->
<install-in-user-type package="com.android.contacts">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
- <!-- Gallery -->
+ <!-- Gallery (Gallery2) -->
<install-in-user-type package="com.android.gallery3d">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
+
+ <!-- Search (QuickSearchBox) TODO(b/258055479) -->
+ <install-in-user-type package="com.android.quicksearchbox">
+ <install-in user-type="SYSTEM" />
+ <install-in user-type="FULL" />
+ <install-in user-type="PROFILE" />
+ <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+ </install-in-user-type>
+
+ <!-- WallpaperCropper -->
+ <install-in-user-type package="com.android.wallpapercropper">
+ <install-in user-type="FULL" />
+ </install-in-user-type>
</config>
diff --git a/target/product/sysconfig/preinstalled-packages-platform-handheld-system.xml b/target/product/sysconfig/preinstalled-packages-platform-handheld-system.xml
index d25c17a..02b03f1 100644
--- a/target/product/sysconfig/preinstalled-packages-platform-handheld-system.xml
+++ b/target/product/sysconfig/preinstalled-packages-platform-handheld-system.xml
@@ -17,7 +17,15 @@
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
-->
<config>
- <!-- Printer (Does not show on launcher, but shows on the share sheet) -->
+ <!-- Files (DocumentsUI) TODO(b/258055479) -->
+ <install-in-user-type package="com.android.documentsui">
+ <install-in user-type="SYSTEM" />
+ <install-in user-type="FULL" />
+ <install-in user-type="PROFILE" />
+ <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+ </install-in-user-type>
+
+ <!-- Printer (BuiltInPrintService) (Does not show on launcher but shows on the share sheet) -->
<install-in-user-type package="com.android.bips">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />