Commit Graph

1381 Commits

Author SHA1 Message Date
Rashed Abdel-Tawab
6f3d5db7b7 taimen: Import and tailor {extract-files,setup-makefiles}.sh
This is a squash of the following:

Author: Bruno Martins <bgcngm@gmail.com>
Date:   Tue Jun 19 23:55:25 2018 +0100

    taimen: Fix typo from CodeAurora in blob_fixup

    * Let com.qualcomm.qcrilmsgtunnel break free

    Change-Id: Ide5759eef7e3100ac5b50f5dc95a3f90119e592f

Author: Michael Bestas <mkbestas@lineageos.org>
Date:   Sat Dec 19 02:53:35 2020 +0200

    taimen: Switch to standalone extract utils

    Align with templates while we are at it

    Change-Id: Ife50623a3d1b8733f5cc76995c982d8950d39ad4

Author: Rashed Abdel-Tawab <rashed@linux.com>
Date:   Tue May 14 00:36:02 2019 -0700

    taimen: Import and tailor {extract-files,setup-makefiles}.sh

    * Partial pick of Id399faa404207ce018f0f0187c9576b61f5d4dc9.

    Change-Id: I866e015e3ba717ae7fc585dc56f118f3e251154c

Change-Id: I231d822f364f57314009be4d08af993b97bf5705
2024-06-08 21:31:33 +08:00
Jesse Chan
0e2bb683ad taimen: Enable option for full screen aspect ratio
Change-Id: I2a1b2acc5ed97ccb6795dc371c2b3ac9cb4f9d03
2024-06-08 21:31:00 +08:00
Christopher N. Hesse
8b5323ff25 taimen: Remove prebuilt kernel modules copy rules
Change-Id: Ifc1320c085ab8c7670921b638c5e33754d6cfb6b
2024-06-08 21:31:00 +08:00
Kevin F. Haggerty
6ec5d11ae6 taimen: Don't let builds complete without vendor tree
* There is zero reason to ever build without blobs. We've even seen
  this situation with official builds from our servers. It's always
  better for a build to fail than it is for it to produce something
  that has no chance at working.

Change-Id: I4968795670c91f691e9ecdc0e4af62e16ba3a93a
2024-06-08 21:30:44 +08:00
Asriadi Rahim
f0afc1c7dd taimen: Initial Evolution-X makefiles and dependencies
Signed-off-by: Asriadi Rahim <asriadirahim03@gmail.com>
2024-06-08 21:29:33 +08:00
PixelBoot
c5f0e4b449 taimen: refractor block device labeling for system_ext 2024-06-08 21:21:39 +08:00
PixelBoot
7c6098105b taimen: move bootctrl to device specific trees
Since we've adapted libgpt-utils to specific trees, bootctrl needs that too.
2024-06-08 21:21:39 +08:00
JarlPenguin
32dc7d5f70 taimen: defined product & system_ext as A/B partitions
This is done to distribute the system space more evenly thanks to product partitions.
2024-06-08 21:21:16 +08:00
PixelBoot
d0dd6e00e1 taimen: define local A/B ota partitions
Partitions vary between walleye and taimen now.
No longer define A/B OTA partitions in common wahoo tree.
2024-06-08 21:21:16 +08:00
Tao Bao
5e83695f18 Add recovery.wipe file.
Bug: 36427762
Test: lunch muskie-userdebug && make bootimage. Check
      $OUT/recovery/root/etc/recovery.wipe exists.
Change-Id: Id86c53d62d2b5a293f22b37fef3c64caa82f15f1
2024-06-08 21:21:16 +08:00
Rashed Abdel-Tawab
ed936e193f taimen: gpt-utils: Switch to generated_kernel_headers
This is a squash of the following:

Author: LuK1337 <priv.luk@gmail.com>
Date:   Sun Sep 27 16:12:10 2020 +0200

    wahoo: gpt-utils: Drop unnecessary include

    * When using generated_kernel_headers including
      stdio.h will cause errors due to redefined macros.

    Change-Id: I2f753a64f760b636be1325873e17697466fbf33d

Author: LuK1337 <priv.luk@gmail.com>
Date:   Mon Sep 9 22:38:02 2019 +0200

    wahoo: gpt-utils: Drop unnecessary include

    * When using generated_kernel_headers including
      asm/byteorder.h will cause a warning due to
      unused static functions.

    Change-Id: I2a74ec92487c13c4645048c96da8cb92b3cbd9f0

Author: Rashed Abdel-Tawab <rashed@linux.com>
Date:   Sun Sep 29 15:37:38 2019 -0400

    wahoo: Switch gpt-utils to generated_kernel_headers

    Change-Id: Ia6e2f7e140e6ffbd3a93dd823f836aaf399d03fb

Change-Id: Ia1f608778b5b37fec770abbf185c5e313cd5ba16
2024-06-08 21:21:16 +08:00
Akilesh Kailash
4112681d3e taimen: gpt-utils: fsync after block device writes
When markBoolSuccessful is invoked, we update
the partition table. These writes should be
synced before merge operation is resumed post OTA.
If not, any crash before these writes are landed to
backing storage will lead to incorrect switching of
slots.

BUG: 175711601
Test: Verify slot switching correctly after crash when merge in progress
(on redbull)
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I4d30342b44aaeb7a4fdc915cc1e53ffb20c17a2f
2024-06-08 21:20:49 +08:00
Tao Bao
e28d504d68 taimen: gpt-utils: Deprecate PRODUCT_STATIC_BOOT_CONTROL_HAL
In favor of using boot control HAL under recovery.

Bug: 34254109
Test: TreeHugger

This is a combination of 2 commits.
This is the 1st commit message:

Revert^2 "Build libgptutils with Android.bp.""

This reverts commit 215189f0b9ff44d28c2b4ace0abb26854b201271.

The previous landing broke checkbuild targets due to namespace issue. As
libgptutils.msm8998 was exposed to global namespace (previously guarded
via conditionals in Android.mk), but had a missing dependency on
nonexposed msm8998 kernel headers.

The relanding adds a Soong namespace of hardware/qcom/msm8998, to ensure
modules only getting built as needed.

Bug: 34254109
Test: Sideload on taimen.
Test: `m -j checkbuild` with aosp_x86-eng
Change-Id: I4a7c4cedcf58c7735172d989912e4f7afad1eaed
Merged-In: I4a7c4cedcf58c7735172d989912e4f7afad1eaed
(cherry picked from commit e74c7611d2cbea03ec8ec1559787a7a57b2bf767)

This is the commit message #2:

Revert^2 "Deprecate PRODUCT_STATIC_BOOT_CONTROL_HAL.""

This reverts commit d83c2cc22b3f037e94cd4ad7e19f5985da13a8b8.

The previous landing broke checkbuild targets due to namespace issue.
See the commit message for hardware/qcom/msm8998 change.

Bug: 34254109
Test: Build and boot taimen on device to home screen.
Test: Sideload on taimen.
Change-Id: I775026345eb5fc0ec580ba4ca0282835106a1d35
Merged-In: I775026345eb5fc0ec580ba4ca0282835106a1d35
(cherry picked from commit 4fa8e490208bef42faccf204381dc35ad1cfed46)
2024-06-08 21:20:49 +08:00
Tao Bao
c988a87f71 taimen: gpt-utils: Drop -Wno-unused-variable and address one warning
hardware/qcom/msm8998/gpt-utils/gpt-utils.cpp:750:17: error: unused variable 'ufs_dir_stat' [-Werror,-Wunused-variable]
    struct stat ufs_dir_stat;
                ^
hardware/qcom/msm8998/gpt-utils/gpt-utils.cpp:973:13: error: unused variable 'r' [-Werror,-Wunused-variable]
        int r, fd;
            ^
hardware/qcom/msm8998/gpt-utils/gpt-utils.cpp:973:16: error: unused variable 'fd' [-Werror,-Wunused-variable]
        int r, fd;
               ^
3 errors generated.

[ 22% 4/18] target  C++: libgptutils <= hardware/qcom/msm8998/gpt-utils/gpt-utils.cpp
In file included from hardware/qcom/msm8998/gpt-utils/gpt-utils.cpp:54:
system/core/libcutils/include_vndk/cutils/log.h:38:2: warning: "Deprecated: don't include cutils/log.h, use either android/log.h or log/log.h" [-W#warnings]
 ^
1 warning generated.

Test: lunch aosp_walleye-userdebug && m -j libgptutils
Change-Id: Ie3c33cc61fc62ac93ab0954a9e292b62cfcf9e03
2024-06-08 21:20:49 +08:00
Chih-Hung Hsieh
f79c042214 taimen: gpt-utils: Use -Werror
* Suppress existing warnings.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: If2d100b57d6f29a91ed744263aae75714c8b1bff
2024-06-08 21:20:49 +08:00
Logan Chien
d5cbb1b09c taimen: gpt-utils: Replace libsparse.so with libz.so
This commit replaces sparse_crc32() with crc32() from libz.so because
libsparse.so won't be vendor available.

Bug: 38303202
Test: android builds
Change-Id: Ib318da74b5d55f729cbd40d9a62da53e6316fe7b
2024-06-08 21:20:49 +08:00
Isaac Chen
a1223e05c9 taimen: gpt-utils: Move lib to vendor for build split
libgptutils is only used by vendor. Move it to
vendor partition so they can work with generic AOSP
system image.

Bug: 37927875
Test: These libs are under /vendor/lib(64) instead of
/system/lib(64) and the resulted image works on the device.
Change-Id: Id04f7a09fdc8e60de79f83b8fd0c2504fd2e2ebe

Change-Id: I7f3f8fe845d35a05492ffc4785787622c7851b79
2024-06-08 21:20:07 +08:00
Thierry Strudel
d507e418c7 taimen: gpt-utils: Squashed PTN_SWAP_LIST additions
Author: Thierry Strudel <tstrudel@google.com>
Date:   Thu May 4 18:15:01 2017 -0700
    gpt-utils: PTN_SWAP_LIST add the missing new partitions

    abl, dtbo, vbmeta were not part of the list updated by bootctl HAL.
    This will fix the issue but bootctl HAL should be rewritten to not
    detect A/B partition candidate at runtime.

    Bug: 37501587
    Change-Id: I64140d9fce8d142e16a12c9778f1b10394f9dc76
    Signed-off-by: Thierry Strudel <tstrudel@google.com>

Author: Patrick Tjin <pattjin@google.com>
Date:   Tue Jul 25 19:26:1 2017 -0700
    Add aes as A/B OTA partition

    Bug: 37554629
    Change-Id: I162150922683000dbfc0beceab807d46bd51325e

Author: Patrick Tjin <pattjin@google.com>
Date:   Wed May 10 15:36:34 2017 -0700
    Add laf partition to swap list.

    Bug: 37743272
    Change-Id: If9521bbd29af9439aa01ac72c8bb8cbc0bf674b6

Change-Id: I8aa1386206e6b675a4b7d1e696841f23f5955c2d
2024-06-08 21:20:07 +08:00
Thierry Strudel
34c4af49c8 taimen: Adding gpt-utils
Change-Id: Ib39a2dd8319c1b9e5fbbb1fc782237d061046094
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2024-06-08 21:19:46 +08:00
PixelBoot
b472231570 Revert "Use on_vendor VNDK APEX for non-REL build"
This reverts commit 038066f517.
2024-06-08 21:19:46 +08:00
PixelBoot
4fdafe15fa Revert "Disable seamless transition for taimen"
This reverts commit 33746f88ad.
2024-06-08 21:19:46 +08:00
Luca Stefani
5071798882 taimen: Adjust powerhint for QOS interface
Currently all writes to the dev interface are done
by WriteStringToFd that uses char internally.

The current values seem to expect to be written as s32,
this sadly won't happen and triggers a special case in
the write handling of pm_qos_power_write:
it expects char buffers to be encoded as base16 and
decodes them.
This means the current 44 is actually 0x44 -> 68 seen by
the kernel.

Luckily it seems like both accepted values for this node
don't hit the threshold to enter C2, so it was never
noticed in real usage and didn't effect the device
C-States handling during hints.

Signed-off-by: Luca Stefani <luca.stefani.ge1@gmail.com>
Change-Id: Ic544d4dcaa1edc3de913aed737baf1af88a45360
2024-06-08 21:19:46 +08:00
Dan Pasanen
d29221bcd3 taimen: Disable ext4 share_dup_blocks
* This allows us to remount ext4 partitions read-write

Change-Id: Idb66b7290a27550db70441c38b4ab3207bdcaff7
2024-06-08 21:19:46 +08:00
Eamon Powell
6fb91d166d taimen: Don't copy aosp_excluded_hardware.xml to vendor
This will only hurt GPS accuracy. Let's just drop this.

Change-Id: I9ae662e47b4bf8d9506f3938d9f4217acf947dc2
2024-06-08 21:19:46 +08:00
Tianjie
e40685c57d taimen: Use light boot animation on first boot only
Today, the dark boot follows the Dark Theme mode in Settings. Now
the UI team decide to always use dark boot after the device is
provisioned. So users will see fewer disturbances when a scheduled
update is taken at night

Bug: 181339788
Test: flash a Pixel -> boot -> dark theme is set;
      boot again -> observe dark boot
Change-Id: Id4989e4e78471bcefc2730ba7d9adc36f5ac9c75
2024-06-08 21:19:46 +08:00
Ethan Chen
f38c485b90 taimen: Disable userdebug diagnostics
Change-Id: I31df2090b31243b742c4e82dc08cd8491dada54f
2024-06-08 21:19:46 +08:00
Xin Li
40ecbca556 Skip ab/6749736 in stage.
Merged-In: I99c036576a5cc12ced295fe635aa65c265e996bf
Change-Id: I7a107b22c574877dade00986491ce07a44c8e312
2020-10-08 17:20:27 -07:00
Xin Li
e0a2caae14 [automerger skipped] Merge Android R am: 7a56081cce -s ours
am skip reason: Change-Id I5ba640a8fb8b578755c1a7366d368ef1d81f7160 with SHA-1 f43d76b40d is in history

Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1422328

Change-Id: Ic93a14028a22f1f73ce47d7c128bffcdbe5b77a2
2020-09-11 00:40:52 +00:00
Xin Li
7a56081cce Merge Android R
Bug: 168057903
Merged-In: I5ba640a8fb8b578755c1a7366d368ef1d81f7160
Change-Id: If96e0ed2ac67e0bbfda6a6ddcb55a405d3d5e000
2020-09-08 16:53:43 -07:00
Xin Li
f43d76b40d Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I6421c2bcd0d8252ec1aafe0c316ebbca46f6fe20
Change-Id: I5ba640a8fb8b578755c1a7366d368ef1d81f7160
2020-08-27 10:16:05 -07:00
Yo Chiang
f15eed2065 Use on_vendor VNDK APEX for non-REL build am: 038066f517
Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1402427

Change-Id: Ic9a92346b22120e3ba5e9c98b11b0b29b9986368
2020-08-19 08:55:15 +00:00
Yo Chiang
038066f517 Use on_vendor VNDK APEX for non-REL build
For non-REL branch, move VNDK APEX to /vendor partition so we don't need
to update vendor.img prebuilt everytime there is a change in the VNDK
libraries.
For REL branch, the API/ABI surfaces of VNDK libraries are frozen so
don't need to move to /vendor partition.

Bug: 140136207
Test: Build on REL and non-REL branch
Change-Id: Ibce24465b546c52bc447b4b28a474de2b4b53792
2020-08-17 11:43:06 +08:00
Jiyong Park
fd0a640dda [automerger skipped] Remove unnecessary sysprop settings am: 18953b4917 am: cb7455c1f6 -s ours am: 82095bf64c -s ours
am skip reason: Change-Id I6d1dd46edba0ad69586791935fca0da484ef2746 with SHA-1 4744ee6eb6 is in history

Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1347164

Change-Id: I99c036576a5cc12ced295fe635aa65c265e996bf
2020-07-01 02:26:58 +00:00
Jiyong Park
82095bf64c [automerger skipped] Remove unnecessary sysprop settings am: 18953b4917 am: cb7455c1f6 -s ours
am skip reason: Change-Id I6d1dd46edba0ad69586791935fca0da484ef2746 with SHA-1 4744ee6eb6 is in history

Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1347164

Change-Id: I6421c2bcd0d8252ec1aafe0c316ebbca46f6fe20
2020-07-01 02:13:43 +00:00
Jiyong Park
cb7455c1f6 Remove unnecessary sysprop settings am: 18953b4917
Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1347164

Change-Id: Ieaf671f1b27f4f408462f6f31f0ed915bdcdec93
2020-07-01 01:59:20 +00:00
Jiyong Park
3ec183da06 Remove unnecessary sysprop settings am: 4744ee6eb6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/12041863

Change-Id: I404864e08f3580d6e08c140dc6cd64d58e851867
2020-06-30 09:58:25 +00:00
Jiyong Park
18953b4917 Remove unnecessary sysprop settings
These debuf.sf.early_* properties have been inactive because they are
all eclipsed by the settings in wahoo/device.mk. Specifically,

// wahoo/device.mk
PRODUCT_PROPERTY_OVERRIDES := a=10

// taimen/device.mk
include wahoo/device.mk
PRODUCT_PROPERTY_OVERRIDES += a=20

With above, PRODUCT_PROPERTY_OVERRIDES becomes "a=10 a=20" and the build
system has chosen "a=10" via the uniq-pairs-by-first-component macro.
This was  because PRODUCT_* lists were designed with an assumption that
those mk files are inherited (without being included) in which case the
values from more specific *.mk file are 'prepended' (not appaended).

Since the settings in taimen/device.mk has been obsolete, let's remove
them. This problem was actually found with
I9c073a21c8257987cf2378012cadaeeeb698a4fb where duplicated sysprop
assignments are prohibited, which is an attempt to make the sysprop
settings be agnostic to the confusing ordering behavior imposed by the
product inheritance mechanism.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick master

Merged-In: I6d1dd46edba0ad69586791935fca0da484ef2746
(cherry picked from commit 695f1fbe29f2ea08ed3a5cefb0fa487bea9144f4)
Change-Id: I6d1dd46edba0ad69586791935fca0da484ef2746
2020-06-30 18:45:35 +09:00
Jiyong Park
4744ee6eb6 Remove unnecessary sysprop settings
These debuf.sf.early_* properties have been inactive because they are
all eclipsed by the settings in wahoo/device.mk. Specifically,

// wahoo/device.mk
PRODUCT_PROPERTY_OVERRIDES := a=10

// taimen/device.mk
include wahoo/device.mk
PRODUCT_PROPERTY_OVERRIDES += a=20

With above, PRODUCT_PROPERTY_OVERRIDES becomes "a=10 a=20" and the build
system has chosen "a=10" via the uniq-pairs-by-first-component macro.
This was  because PRODUCT_* lists were designed with an assumption that
those mk files are inherited (without being included) in which case the
values from more specific *.mk file are 'prepended' (not appaended).

Since the settings in taimen/device.mk has been obsolete, let's remove
them. This problem was actually found with
I9c073a21c8257987cf2378012cadaeeeb698a4fb where duplicated sysprop
assignments are prohibited, which is an attempt to make the sysprop
settings be agnostic to the confusing ordering behavior imposed by the
product inheritance mechanism.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick master

Merged-In: I6d1dd46edba0ad69586791935fca0da484ef2746
(cherry picked from commit 695f1fbe29f2ea08ed3a5cefb0fa487bea9144f4)
Change-Id: I6d1dd46edba0ad69586791935fca0da484ef2746
2020-06-30 14:29:29 +09:00
Automerger Merge Worker
746632dbcf Merge changes from topic "am-5c49126713864de48797e12bf7acf180" into rvc-d1-dev-plus-aosp
* changes:
  Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" into rvc-dev am: ba8fbc6237 am: 16fd1c3a2d
  Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ac8a09f798 am: c9fc093ffb
2020-06-22 06:02:30 +00:00
Cyril Lee
d76129693b Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" into rvc-dev am: ba8fbc6237 am: 16fd1c3a2d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861

Change-Id: If76de1a14e266319c5b238d460c4da0b7de977a3
2020-06-22 06:02:25 +00:00
Ken Chen
7d58f0edaa Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ac8a09f798 am: c9fc093ffb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861

Change-Id: I8f50f70ee691b4938a9e52364847b6f02e1c9b7a
2020-06-22 06:02:24 +00:00
Cyril Lee
94c9eb70e5 Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" into rvc-dev am: ba8fbc6237 am: ee73c28eea
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861

Change-Id: I85e3476fe33dc2937192babc7798f122741fc9b3
2020-06-22 06:02:17 +00:00
Ken Chen
81375f6446 Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ac8a09f798 am: d5237a3d22
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861

Change-Id: I2ad506cc26201d9e4282490f903c3955fae9e5ca
2020-06-22 06:02:15 +00:00
Cyril Lee
16fd1c3a2d Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" into rvc-dev am: ba8fbc6237
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861

Change-Id: I0d2f10629c5d4fff815eea11d3ba42849796c971
2020-06-22 05:49:20 +00:00
Ken Chen
c9fc093ffb Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ac8a09f798
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861

Change-Id: I93a5b1545066309a4855643ffe5539663da15d3e
2020-06-22 05:49:19 +00:00
Cyril Lee
ee73c28eea Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" into rvc-dev am: ba8fbc6237
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861

Change-Id: I49560b5d9121a17110b0cd8a0107a2c3c79185d1
2020-06-22 05:49:04 +00:00
Ken Chen
d5237a3d22 Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ac8a09f798
Original change: https://googleplex-android-review.googlesource.com/c/device/google/taimen/+/11940861

Change-Id: I5410e0660814afafcbb4480d9611e7cee16f9c55
2020-06-22 05:49:00 +00:00
Cyril Lee
ba8fbc6237 Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" into rvc-dev 2020-06-22 05:35:33 +00:00
Ken Chen
ac8a09f798 Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."
Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."

Revert submission 11818631-deferred_medium_priority_actions

Reason for revert: <investigate b/159568565>
Reverted Changes:
Id1d6d67f6:[DO NOT MERGE] Remove ASSIST_GESTURE action from d...
I9bc31a200:[DO NOT MERGE] Remove ASSIST_GESTURE action from d...
I9b033a06e:[DO NOT MERGE] Remove ASSIST_GESTURE action from d...
I1633e191c:[DO NOT MERGE] Remove ASSIST_GESTURE action from d...
I56d8f9e5d:[DO NOT MERGE] Remove ASSIST_GESTURE action from d...
I086d2d9a5:[DO NOT MERGE] Remove ASSIST_GESTURE action from d...
Ibc6e15d29:[DO NOT MERGE] Remove ASSIST_GESTURE action from d...
I086d2d9a5:[DO NOT MERGE] Remove ASSIST_GESTURE action from d...

Change-Id: I0d174786308589a8bd6eaa0453b8614008b509d9
2020-06-22 01:39:14 +00:00
Automerger Merge Worker
9f0b94add2 Merge changes from topic "am-700a2a681bdb4a528bf52c8b1542452c" into rvc-d1-dev-plus-aosp
* changes:
  Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_priority_actions resource" into rvc-dev am: ea000cd90c am: 74cea49ef7
  [DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_priority_actions resource am: 7cf1a9368a am: 459d70f2dc
2020-06-20 10:26:02 +00:00