Yurii Zubrytskyi
b65950642d
Fix the MacOS build of incremental*
...
Test: local build, no feature code changes
Change-Id: Ic0072b06f6bfd6b12f26c4056bd3192cd3fdd778
2020-02-20 15:39:36 -08:00
Automerger Merge Worker
2d99a504a3
Merge "libsnapshot: fix stats write in Resume()" am: 20d9d6a630
am: b568c330dc
am: 692cdf94ef
...
Change-Id: Id81ce411f63c7f16b0d4765f8acad94fd493a0ad
2020-02-20 20:49:54 +00:00
Automerger Merge Worker
692cdf94ef
Merge "libsnapshot: fix stats write in Resume()" am: 20d9d6a630
am: b568c330dc
...
Change-Id: Ica782d25b00bd75e411a7c38e210dac88397bab3
2020-02-20 20:34:38 +00:00
Automerger Merge Worker
b568c330dc
Merge "libsnapshot: fix stats write in Resume()" am: 20d9d6a630
...
Change-Id: I37c5c5eb0063d4f4c94ed321c18614b93086a2bd
2020-02-20 20:18:24 +00:00
Alessio Balsini
20d9d6a630
Merge "libsnapshot: fix stats write in Resume()"
2020-02-20 19:37:25 +00:00
Alessio Balsini
91da9dfeef
libsnapshot: fix stats write in Resume()
...
The Resume() operation is supposed to increment the resume counter, but
the updated counter value was not written to the device.
Fix by adding the write operation and refactoring the code.
Bug: none
Test: m
Change-Id: I3fffd61cc779c59e2780900809f0ce0b84258e78
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-02-20 15:05:13 +00:00
Automerger Merge Worker
7b7ad663f5
Merge "Store reason in case of userspace-reboot watchdog reboot" am: e53f8b8f9d
am: 93823ce9df
am: 29651ce5f2
...
Change-Id: I255be73194c92f6c8a1ad617c0aad71ff86ef848
2020-02-20 12:04:30 +00:00
Automerger Merge Worker
69f44ea75f
Merge "[adb] Add a version field to v4 signature format" am: aab85d3b4c
am: 7521152cf2
am: 6d309caa59
...
Change-Id: I56433cae0f16bbabdb34f75f814192bd5dfb309c
2020-02-20 12:04:22 +00:00
Automerger Merge Worker
29651ce5f2
Merge "Store reason in case of userspace-reboot watchdog reboot" am: e53f8b8f9d
am: 93823ce9df
...
Change-Id: Iac34b1d721bab27359724d10e847a65e1be36295
2020-02-20 11:50:37 +00:00
Automerger Merge Worker
6d309caa59
Merge "[adb] Add a version field to v4 signature format" am: aab85d3b4c
am: 7521152cf2
...
Change-Id: I370ccb892a3df564e6067007eae59eb789e21608
2020-02-20 11:50:28 +00:00
Automerger Merge Worker
93823ce9df
Merge "Store reason in case of userspace-reboot watchdog reboot" am: e53f8b8f9d
...
Change-Id: Iff395a6e8ad4e51026ff9bbc4aa711adf37a8491
2020-02-20 11:38:47 +00:00
Automerger Merge Worker
7521152cf2
Merge "[adb] Add a version field to v4 signature format" am: aab85d3b4c
...
Change-Id: I2cc666e0e12e160830746ebf2031f22fe041485e
2020-02-20 11:38:38 +00:00
Nikita Ioffe
e53f8b8f9d
Merge "Store reason in case of userspace-reboot watchdog reboot"
2020-02-20 11:37:32 +00:00
Yurii Zubrytskyi
aab85d3b4c
Merge "[adb] Add a version field to v4 signature format"
2020-02-20 11:28:18 +00:00
Bowgo Tsai
99651b012b
Allowing R and S developer GSI for DSU
...
Adding new keys to allow a device boot a R-Deverloper-GSI and
S-Developer-GSI, respectively.
Also removing previous keys for R-Compliance-GSI and
S-Compliance-GSI, respectively. We will be allowing CTS-on-GSI
to run on unlocked state in R and later releases.
https://android-review.googlesource.com/c/platform/test/suite_harness/+/1228453
Bug: 149805495
Test: boot a device
Change-Id: I000365d0b407605b426c4695c6ac614150ee9b13
Merged-In: I6bc1e068368e64cb0bbf6ef63805444b35a1fdfb
2020-02-20 16:32:26 +08:00
Howard Ro
0aa2faf8b1
Merge "Revert^2 "Update init.rc for statsd setup""
2020-02-20 08:00:53 +00:00
Kiyoung Kim
f611e41e14
Remove ld.config.txt from adbd APEX
...
Dynamic linker will use generated linker configuration in general. As
ld.config.txt file in the APEX module will not be used, we can remove
this to avoid confusion.
Bug: 149887007
Test: m -j passed
Test: Boot succeeded from cuttlefish and walleye
Change-Id: Ic98aca819b5a4d0e0af4fe0ea25145a483aa7d53
2020-02-20 16:06:53 +09:00
Automerger Merge Worker
a7634f5fa6
Merge "Adding new GSI public keys" am: c5c3f54806
am: 63f215d4c5
am: 290bb3368a
...
Change-Id: I9d1e5ba88c5c410f582f48fdc7cc4a4b88a6f4d4
2020-02-20 06:52:31 +00:00
Automerger Merge Worker
290bb3368a
Merge "Adding new GSI public keys" am: c5c3f54806
am: 63f215d4c5
...
Change-Id: I1f8f5f1cd8596a6fc0057ce3f0c293703faecd29
2020-02-20 06:40:04 +00:00
Automerger Merge Worker
63f215d4c5
Merge "Adding new GSI public keys" am: c5c3f54806
...
Change-Id: I31b77a7fdd4a3e411f068bd5c7f07794ea35d985
2020-02-20 06:28:03 +00:00
Treehugger Robot
c5c3f54806
Merge "Adding new GSI public keys"
2020-02-20 06:18:41 +00:00
Howard Ro
78900ad658
Revert^2 "Update init.rc for statsd setup"
...
77a8d9f64e
Change-Id: Ic8dce44e6e83323381a39682b833acf8feb714a2
2020-02-20 04:57:00 +00:00
Howard Ro
d4586b5833
Merge "Revert "Update init.rc for statsd setup""
2020-02-20 04:22:01 +00:00
Howard Ro
77a8d9f64e
Revert "Update init.rc for statsd setup"
...
Revert "Migrate Statsd to the apex"
Revert "Update statsd binary path for apex"
Revert submission 10356003-statsd_apex
Reason for revert: https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=build_test&lkgb=6221366&fkbb=6221428
Reverted Changes:
Ic84e77269:Update init.rc for statsd setup
I6f3fab4b4:Update statsd binary path for apex
Ib4ea98aed:Migrate Statsd to the apex
Change-Id: I0db7f3be927f379b70e0b68bcf1cfdab3f2f1ae0
2020-02-20 04:19:41 +00:00
Howard Ro
e32d0a9567
Merge "Update init.rc for statsd setup"
2020-02-20 01:53:20 +00:00
Alessio Balsini
4eb783b3d9
Merge "snapshotctl: send snapshot merge report metrics"
2020-02-20 01:12:03 +00:00
Automerger Merge Worker
aa8b9d9179
Merge "[GWP-ASan] Add GWP-ASan information to tombstones." am: 2dd81da3b4
am: f7ad6f22da
am: 13a75c69a5
...
Change-Id: I17e9190766c0a30f23df43cfce4ca7d86ffc39f7
2020-02-19 23:15:02 +00:00
Automerger Merge Worker
6c4efc8ecf
Merge "Incremental installations in adb, client/host side." am: 2bca658a3b
am: f45c016896
am: 665e15e2a8
...
Change-Id: Ic75d516b443c7db9a09a77e51282372d5367ee61
2020-02-19 23:14:43 +00:00
Automerger Merge Worker
35bc5a454d
Merge "Rename ro.device_owner system property" am: db6650a905
am: c798ade67a
am: bcc6b99820
...
Change-Id: I9959e6564d96efe72fe136e0aa810427f644c85d
2020-02-19 23:14:24 +00:00
Yurii Zubrytskyi
516c441fd8
[adb] Add a version field to v4 signature format
...
Test: manual
Change-Id: I8a1034d7131905463749d5b131dd9a3c8703fe96
2020-02-19 14:46:16 -08:00
Automerger Merge Worker
13a75c69a5
Merge "[GWP-ASan] Add GWP-ASan information to tombstones." am: 2dd81da3b4
am: f7ad6f22da
...
Change-Id: Icb9a00f631181329acec3d6f4620e2a1ccc8ea86
2020-02-19 22:27:16 +00:00
Automerger Merge Worker
89d31aadb3
Merge "Add project ID constants." am: 529605bc9e
am: df4f865d7a
am: 3781fb4a9a
...
Change-Id: I61572b4fcfcd57af9fb29dfd37c67a2b956d820e
2020-02-19 22:20:44 +00:00
Automerger Merge Worker
663b251b68
Merge "Allow apexes to link against more libs" am: 6c364f94ad
am: 73b4968059
am: 32545e5c21
...
Change-Id: I7b15e47d5b5cdcfd6e22bd1537d627d4ba1529d7
2020-02-19 22:20:01 +00:00
Automerger Merge Worker
1cbb9071da
Merge "Add wrapped key support for metadata encryption" am: 5ed0698b41
am: ca03b68e12
am: 1427fe5c6f
...
Change-Id: I162a366af66396f022eb3df2462fd4311b7e9099
2020-02-19 22:19:26 +00:00
Automerger Merge Worker
bab2c72da6
Merge "Specify argument types for function prototype" am: 83c7d04493
am: e690cb7b4f
am: 1cb9820545
...
Change-Id: I9fa3e11efad8d7d6bc32ea4729914114bd96d108
2020-02-19 22:19:10 +00:00
Automerger Merge Worker
8f361f61ba
Merge "Some minor fixes to libadb_tls_connection." am: 8f04b0ca58
am: 7a15d5c88f
am: 4a36b59bfc
...
Change-Id: Ib3997fc85907ae75eb6616ce58edcb3b171c6e35
2020-02-19 22:18:04 +00:00
Automerger Merge Worker
4b1222edb9
Merge "Add UNSUPPORTED to health HAL 2.1 values" am: 9d261c3fed
am: 5c2dc9c222
am: 4391aab160
...
Change-Id: Iae34ca697b0bd3a4ecf0316c3f8fb70338244c84
2020-02-19 22:16:25 +00:00
Automerger Merge Worker
f7ad6f22da
Merge "[GWP-ASan] Add GWP-ASan information to tombstones." am: 2dd81da3b4
...
Change-Id: I708936c9139c020963bff5879eb07385946e34f1
2020-02-19 22:14:27 +00:00
Jeffrey Huang
8dcbcf13e4
Update init.rc for statsd setup
...
Apexes do not support "on" macros, so we are moving
them into the system partition
Bug: 145923087
Test: m -j
Change-Id: Ic84e77269f80097b675d6a1b0d206c2bae7d918d
2020-02-19 14:11:16 -08:00
Mitch Phillips
2dd81da3b4
Merge "[GWP-ASan] Add GWP-ASan information to tombstones."
2020-02-19 20:35:10 +00:00
Nikita Ioffe
d0bc0b6f1e
Store reason in case of userspace-reboot watchdog reboot
...
Test: adb reboot userspace
Bug: 148767783
Change-Id: I58cf103fd5ce47eadae334376109492d0cc1c1c6
2020-02-19 20:12:07 +00:00
Automerger Merge Worker
665e15e2a8
Merge "Incremental installations in adb, client/host side." am: 2bca658a3b
am: f45c016896
...
Change-Id: I03e14c8461ff69dd8b7533580da85c645ac460d5
2020-02-19 20:10:10 +00:00
Automerger Merge Worker
f45c016896
Merge "Incremental installations in adb, client/host side." am: 2bca658a3b
...
Change-Id: I1c9cf39207a6f29c9d0294f3d32c5fe234931bb4
2020-02-19 19:50:08 +00:00
Yurii Zubrytskyi
2bca658a3b
Merge "Incremental installations in adb, client/host side."
2020-02-19 19:25:10 +00:00
Automerger Merge Worker
bcc6b99820
Merge "Rename ro.device_owner system property" am: db6650a905
am: c798ade67a
...
Change-Id: I4bedc599e43772996a568290ff5debb4e0f920bf
2020-02-19 17:49:37 +00:00
Automerger Merge Worker
c798ade67a
Merge "Rename ro.device_owner system property" am: db6650a905
...
Change-Id: Ia35df5e63121b72cad532f463378a1f5aec16314
2020-02-19 17:30:07 +00:00
Treehugger Robot
db6650a905
Merge "Rename ro.device_owner system property"
2020-02-19 17:12:43 +00:00
Alex Buynytskyy
96ff54bf34
Incremental installations in adb, client/host side.
...
Test: adb install --incremental <apk>
Change-Id: I74e3eaf9718a16272bc533bc8298dfcf81120caa
2020-02-19 08:01:06 -08:00
Rubin Xu
7a5cbfc645
Rename ro.device_owner system property
...
This is renamed to ro.organization_owned to cover the extended
usage now that there is a new management mode for fully-managed
organization owned devices: organization-owned managed profile.
A device is considered fully-managed if there is a device owner
or an organization-owned managed profile.
Test: atest liblog-unit-tests
Test: atest propertyinfoserializer_tests
Bug: 148437300
Change-Id: Iaa8ea246c973732526abc1da5b307af8bce1a0af
2020-02-19 10:34:36 +00:00
Bowgo Tsai
14b8c451c4
Adding new GSI public keys
...
Adding two new public keys for R-Developer-GSI and S-Developer-GSI,
respectively.
Bug: 149805495
Test: m r-developer-gsi.avbpubkey
Test: m s-developer-gsi.avbpubkey
Change-Id: Iaa7521ef40b94f13fe3c9c61d276678f47c60b98
Merged-In: Iaa7521ef40b94f13fe3c9c61d276678f47c60b98
(cherry picked from commit b697d47eb3
)
2020-02-19 17:42:25 +08:00