Commit graph

6664 commits

Author SHA1 Message Date
TreeHugger Robot
61da2b3d52 Merge "gs101: use wrapped keys for storage encryption" into sc-dev 2021-03-10 19:22:49 +00:00
SalmaxChang
eb4f865434 init: Remove unused log path am: 31ab19d5e7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13818919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I452a2c99b7aa6d83b360701aa3ada482c5693674
2021-03-10 14:03:14 +00:00
George Chang
ef7df93001 Remove libnfc-nci from common part
Bug: 182243379
Bug: 182351569
Test: build pass
Change-Id: Ib853fb48ace452aa4fcb22398e026af433eaec0b
2021-03-10 19:48:20 +08:00
audreyhung
4b7a3c8f6c Add variables in google3a_config for camera tuning
Add target_device into SOONG_CONFIG_NAMESPACES += google3a_config
for saperating projects (raven, oriole, slider)

Bug: 177041310
Test: build pass, manually test on O6
Change-Id: I605e0327a816fb7d04f57e679f287352e17abee0
2021-03-10 18:30:47 +08:00
Benjamin Schwartz
9618ebcc52 Merge "powerstats: Add core stats" into sc-dev am: caa1b96fc6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13819686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id523bcba64b56e18ab639025104114ba93f1be9d
2021-03-10 06:49:19 +00:00
SalmaxChang
31ab19d5e7 init: Remove unused log path
The path "/data/log/abox" violates Android treble rule. Pixel uses
google audio HAL but not vendor one. Remove the path.

Bug: 177186257
Change-Id: Ie53be71f31e0d673592457b88304136d4d616780
2021-03-10 06:41:31 +00:00
allenwtsu
0e0ad439a7 [Slider] Add pre-grant permission for mvs
Bug: 181915646
Test: manual
Change-Id: Ia9521d560435baac0483b3fb413787e1cb41ef54
2021-03-10 14:40:42 +08:00
Benjamin Schwartz
caa1b96fc6 Merge "powerstats: Add core stats" into sc-dev 2021-03-10 06:19:43 +00:00
Cody Schuffelen
815b951c33 Revert "Add vendor_dlkm partition"
Revert "Add vendor_dlkm to AB_OTA_PARTITIONS"

Revert submission 13804535-slider_vendor_dlkm

Reason for revert: Evaluating whether a revert fixes b/182319837
Reverted Changes:
I50887cb75:Add vendor_dlkm to AB_OTA_PARTITIONS
I6e3b20ada:Add vendor_dlkm partition

Change-Id: I71817d8ff65dfb63978dc775178947e12bd1982a
2021-03-10 01:37:58 +00:00
Benjamin Schwartz
27b42a6f12 Merge "powerstats: acpm_stats driver has moved" into sc-dev am: b5527ad721
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13817608

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fe23f61a53ea6ce5c2c37deba84aa65ccd59a0a
2021-03-10 01:25:42 +00:00
Benjamin Schwartz
b5527ad721 Merge "powerstats: acpm_stats driver has moved" into sc-dev 2021-03-10 01:13:33 +00:00
TreeHugger Robot
ab49a21562 Merge "Remove power stats HAL 1.0 service" into sc-dev am: 01e7f56135
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13817746

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f72f42d6e471cd6337f4625ccf278fd4fe71583
2021-03-10 01:08:25 +00:00
TreeHugger Robot
01e7f56135 Merge "Remove power stats HAL 1.0 service" into sc-dev 2021-03-10 00:45:33 +00:00
Petri Gynther
e951022d5b Remove extra copy of fstab.gs101
vendor_ramdisk.img is assembled from two directories:
$(PRODUCT_OUT)/vendor_ramdisk
$(PRODUCT_OUT)/recovery/root

Eliminate extra copy of fstab.gs101, so that there are no duplicate
files in vendor_ramdisk.img. This is a must-have for toybox cpio,
which is used to extract the archive in kernel build (build/build.sh).

Bug: 182309216
Test: build + inspect vendor_ramdisk.img
Test: prebuilts/build-tools/path/linux-x86/cpio -id
Test: verify install + boot to home + boot to recovery
Change-Id: Ib7c5e9d2535e97945fb90b1e749e2bb33b75329b
2021-03-09 16:09:13 -08:00
Benjamin Schwartz
da983cb5c2 powerstats: Add core stats
Bug: 182273949
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I4151f57ebd68102a58fd7035356279e68805a0f9
2021-03-09 16:05:58 -08:00
Daniel Mentz
23bd42fd38 Add vendor_dlkm partition am: 1adeec60ba
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13804535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic555242d0550c98e359dc5657fd0aeb2df044a4c
2021-03-09 23:23:22 +00:00
Daniel Mentz
1adeec60ba Add vendor_dlkm partition
Certain vendor kernel modules were previously stored in the vendor
partition. With this change, we create a new separate partition named
vendor_dlkm for these vendor modules.

Bug: 173653839
Change-Id: I6e3b20ada58ffea05de3df8e7eae9fc59a6019e0
2021-03-09 22:48:49 +00:00
Benjamin Schwartz
82a0c52a12 powerstats: acpm_stats driver has moved
Bug: 182255966
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I667fb71f6f2c7aade2d56dc8ec8d4462dcc97594
2021-03-09 11:20:04 -08:00
Benjamin Schwartz
0d6392efa6 Remove power stats HAL 1.0 service
Bug: 179527556
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Test: device boot and examined logs to make sure no errors related to
missing power stats 1.0

Change-Id: Ib8cc394f9968edaf948a2d9700e9f7fcaa5b9dc0
2021-03-09 10:27:55 -08:00
TreeHugger Robot
ae5a58c44e Merge "gs101: Use FUSE passthrough by default" into sc-dev am: d287e223f4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13774554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8758d1c34b6e9b109e0ebb6991136a7abecf5c39
2021-03-09 15:38:33 +00:00
TreeHugger Robot
d287e223f4 Merge "gs101: Use FUSE passthrough by default" into sc-dev 2021-03-09 14:55:44 +00:00
TreeHugger Robot
03d89d1b13 Merge "[P21]Phase in FactoryOta" into sc-dev am: 46663e2a5d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13805529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a1062adef4449836d8521879392b7492c81140b
2021-03-09 12:27:17 +00:00
TreeHugger Robot
46663e2a5d Merge "[P21]Phase in FactoryOta" into sc-dev 2021-03-09 11:57:38 +00:00
David Chen
2cd5ec394e Merge "dumpstate: dump more touch information" into sc-dev am: 8721f832dc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13782433

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f98a4d1a4bf6972b229ea801cc3bc91f4649fe6
2021-03-09 06:30:50 +00:00
David Chen
8721f832dc Merge "dumpstate: dump more touch information" into sc-dev 2021-03-09 06:01:28 +00:00
TreeHugger Robot
2d74d55108 Merge "powerstats: Add NFC, PCIE, WIFI stats" into sc-dev am: fed4fa3022
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13808282

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id693937432530c7cfc5704f57088893414931883
2021-03-09 04:48:05 +00:00
TreeHugger Robot
fed4fa3022 Merge "powerstats: Add NFC, PCIE, WIFI stats" into sc-dev 2021-03-09 04:01:56 +00:00
TreeHugger Robot
d3cc8eaebf Merge "bootctrl: run clang-format" into sc-dev am: 9175b81a90
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13809674

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife96c205697f9070de3728afe2a2c22a642e03c4
2021-03-09 02:37:01 +00:00
TreeHugger Robot
9175b81a90 Merge "bootctrl: run clang-format" into sc-dev 2021-03-09 01:54:41 +00:00
Benjamin Schwartz
194edaf7db powerstats: Add NFC, PCIE, WIFI stats
Bug: 179277258
Test: adb shell dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I64d84f82eafe34c12caeaa73f24ed79a60db3604
2021-03-09 01:40:43 +00:00
Benjamin Schwartz
aede81aeab Merge "Revert^2 "powerstats: Add PixelStateResidencyDataProvider"" into sc-dev am: 627a8136fc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13809831

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f689ab95e54c564f8f182622d47588ca4335788
2021-03-09 01:38:08 +00:00
Benjamin Schwartz
4ec52045e5 Merge "Revert "powerstats: Add PixelStateResidencyDataProvider"" into sc-dev am: 3cde50fe34
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13809353

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ba36a58015755a2e0648530bebd651f36e3ac0c
2021-03-09 01:37:22 +00:00
Benjamin Schwartz
627a8136fc Merge "Revert^2 "powerstats: Add PixelStateResidencyDataProvider"" into sc-dev 2021-03-09 01:31:11 +00:00
Benjamin Schwartz
5b34563d88 Revert^2 "powerstats: Add PixelStateResidencyDataProvider"
05a79631f7

Change-Id: If088251400b80a8f47b09d6f2806a3f386ea3161
2021-03-09 01:24:49 +00:00
Benjamin Schwartz
3cde50fe34 Merge "Revert "powerstats: Add PixelStateResidencyDataProvider"" into sc-dev 2021-03-09 00:58:56 +00:00
Benjamin Schwartz
05a79631f7 Revert "powerstats: Add PixelStateResidencyDataProvider"
Revert "powerstats: Create vendor state residency provider"

Revert submission 13807923-pixel provider

Reason for revert: caused build breakage

Reverted Changes:
I6b0c1d350:bthal/1.1: Use PixelStateResidencyProvider
Ia028e589b:powerstats: Create vendor state residency provider...
Id99e6d2a9:powerstats: Add PixelStateResidencyDataProvider

Change-Id: Ib1b18b5984af6b665c4ad0c9e9217a314a64e6ed
2021-03-09 00:54:23 +00:00
TreeHugger Robot
2bcc37f5cc Merge "powerstats: Add PixelStateResidencyDataProvider" into sc-dev am: 26856c61a8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13807923

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22cfbb3c5bb87bc77619a8196ac810d9b0d7aaa4
2021-03-09 00:38:10 +00:00
TreeHugger Robot
26856c61a8 Merge "powerstats: Add PixelStateResidencyDataProvider" into sc-dev 2021-03-09 00:18:42 +00:00
Fernando Lugo
2b75765719 bootctrl: run clang-format
Bug: 156694052
Signed-off-by: Fernando Lugo <flugo@google.com>
Change-Id: I003fb99e96bcee2d745365992b3c8d4a3816f818
2021-03-08 15:36:55 -08:00
Eric Biggers
fe9ab8c5a4 Merge changes Ia94682ee,I4da3ce85 into sc-dev am: fa50bf6c7c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13807420

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id81d5936a8272cd1c8ff9f0d5cebfa8dbc4a4271
2021-03-08 21:58:08 +00:00
Petri Gynther
e0852fb739 gs101: build vendor_ramdisk.img am: 3c5da8c48b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13807513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff808da075e4e7b212c17aa0167838c57f2a1fa1
2021-03-08 21:54:19 +00:00
Eric Biggers
c27e9e5ff9 gs101: use wrapped keys for storage encryption
Make better use of the new hardware by using wrapped keys via the KDN
(Key Distribution Network), rather than standard keys.  Wrapped keys are
slightly better protected against being compromised.

When this change is submitted, a factory reset will be required.

Bug: 149360056
Test: Booted Android and verified via the kernel log and
      'dmctl table userdata' that both FBE and metadata encryption are
      using wrapped keys.  Also ran vts_kernel_encryption_test.
      Also storage-qa and reboot stress testing (b/178650615).
Change-Id: Iab6f4199306de02b5846062e7499783b7aedf901
2021-03-08 21:23:20 +00:00
Eric Biggers
fa50bf6c7c Merge changes Ia94682ee,I4da3ce85 into sc-dev
* changes:
  gs101: remove unused fstabs for eMMC storage
  gs101: remove unneeded crypto properties
2021-03-08 21:22:50 +00:00
Benjamin Schwartz
9c9f563bd6 powerstats: Add PixelStateResidencyDataProvider
This data provider will be used to produce state residency data from
other native services that have registered callbacks.

Bug: 179277258
Test: adb shell dumpsys android.hardware.power.stats.IPowerStats/default
Test: killed power.stats and bluetooth services and verified that
providers are re-registered.

Change-Id: Id99e6d2a9300f7c7483e3fb7a6a9604a46fbbc6f
2021-03-08 11:54:56 -08:00
Petri Gynther
3c5da8c48b gs101: build vendor_ramdisk.img
aosp/1619809 has landed, so let's start building:
out/target/product/<name>/vendor_ramdisk.img

We can then easily grab ramdisk.img + vendor_ramdisk.img
from any go/ab build to our kernel dev environment.

Bug: 170687803
Change-Id: I1469fd9e545353029ceea6251dad631eab2ae1d9
2021-03-08 10:57:28 -08:00
Eric Biggers
93b740b0b0 gs101: remove unused fstabs for eMMC storage
These devices will only use UFS, so remove the emmc and sdboot fstab
files which are unused and outdated.

Bug: 181883233
Change-Id: Ia94682eecca4d792c2a50d2336cd6a542ed282db
2021-03-08 10:17:55 -08:00
Eric Biggers
3014832d9a gs101: remove unneeded crypto properties
It is unnessary to set ro.crypto.dm_default_key.options_format.version=2
or ro.crypto.volume.filenames_mode=aes-256-cts on devices with
PRODUCT_SHIPPING_API_LEVEL >= 30, since in that case these settings are
already the default.

Bug: 181883233
Change-Id: I4da3ce857a45c479e5efcee481f74031093234d8
2021-03-08 10:17:55 -08:00
Beverly
de4b2af870 Move udfps-specific config to device config.xml
Test: manual
Bug: 176550666
Change-Id: Ibaab1a4328e3559b0d0b4d7afd043a5668746ae9
2021-03-08 09:31:33 -05:00
Alessio Balsini
eb39490266 gs101: Use FUSE passthrough by default
Enable the persist.sys.fuse.passthrough.enable flag for the P21 device
configuration to enable the FUSE passthrough feature.
This feature has been enabled on Cuttlefish, Wembley and Redbull devices for
months and no issues have been detected yet.

Bug: 168023149
Test: 'adb shell getprop | grep persist.sys.fuse.passthrough.enable',
    ScopedStorageTest
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: I3f39b02af436f7e508bb70efc702565a667a051c
2021-03-08 12:05:36 +00:00
Ocean Chen
91262dd631 pixelstats: add ufs host reset count
Add path for new atom, UFS_RESET_COUNT

bug: 176740886
Change-Id: Icae0b5b104674be078854193048c3fc49f7bf527
2021-03-08 17:49:36 +08:00