Commit Graph

1535 Commits

Author SHA1 Message Date
Alex Buynytskyy
780d2bb75d Merge "v4 signing schema parsing and verification." 2020-02-12 19:19:06 +00:00
Alex Buynytskyy
036864b62c v4 signing schema parsing and verification.
v4 is a streaming add-on to the existing v2/v3 schemas.

Flow:
- APK is signed with v2/v3 and v4 signature blocks,
- on installation, v4 signature bytes are stored next to the APK in
hidden block,
- on each read from APK, kernel verifies the v4 signature using
fs-verity-like code,
- on parsing/verification, we extract certificates from kernel and
compare them with certificates extracted from v2/v3 signature block.

By doing this we are making sure that v4 signature is produced by developer and original APK bytes are not changed.

Test: atest PkgInstallSignatureVerificationTest
Bug: b/136132412 b/133435829
Change-Id: Ia2a56c82c9864bf65e1338700dfe51abf6800deb
2020-02-12 09:46:06 -08:00
Sunny Shao
c83401dbc5 Add a new feature flag for Settings Schedules
Fixes: 148995400
Test: compilation
Change-Id: Id54eb51068ddf7b1a8fbbf535c7e0e86d1c9b5da
2020-02-11 17:48:22 +08:00
Alex Buynytskyy
02975de36f Addressing commens in ag/10265340.
Test: comments only
Change-Id: Ia3f786e89614c5a184d4c567baaf98e99c2af21a
2020-02-06 20:44:27 -08:00
Alex Buynytskyy
07674063ef ApkSignatureVerifier refactor.
Unifying multiple code paths.

Test: atest PkgInstallSignatureVerificationTest
Bug: b/136132412 b/133435829
Change-Id: I26612ad944ba34b64599a4148b6528ede31f3d11
2020-02-06 14:58:31 -08:00
Automerger Merge Worker
3e04f5af27 Merge "Avoid a @Nullable Boolean" am: 81a42af40d am: fd9c242128 am: 0db1f949da
Change-Id: Iae09c0c6e0d0b8cc9018b811c658d7d73e8a729b
2020-02-06 09:24:58 +00:00
Automerger Merge Worker
fd9c242128 Merge "Avoid a @Nullable Boolean" am: 81a42af40d
Change-Id: I5cf10a143bba4351efa2ea22fc5ccddb732f3044
2020-02-06 08:52:00 +00:00
Tej Singh
e86dab7a6a Move StatsLog.java to fw-statsd.jar
Test: atest GtsStatsdHostTestCases
Bug: 146578693
Change-Id: I7244c6099d16c5c7da14060a1a5fa0c866199754
2020-02-05 15:02:49 -08:00
Neil Fuller
b2d0306a00 Avoid a @Nullable Boolean
To avoid a @Nullable Boolean one method has been split into two. After
some changes in the last release this also removes an optional parameter
from the two new methods as it is now always null.

Bug: 148450671
Test: treehugger
Change-Id: I83be9647943c16ae30af4f8d032db428af1ad5fc
2020-02-05 17:13:31 +00:00
Jonathan Nguyen
a0e6de15df Update StatsLogProcessor to handle BinaryPushStateChanged
Also changed StatsLog to call write() instead of the hard coded function
in StatsService.

Test: gts-tradefed run gts-dev --module GtsStatsdHostTestCases
Change-Id: I26171fa4cfc877e1e179b74ec8076d964aff8548
2020-02-04 20:09:26 -08:00
Muhammad Qureshi
c5b609e6b0 Don't extend StatsLogInternal
Remove StatsLogInternal extension from StatsLog

Bug: 145952197
Test: m
Change-Id: Icd8e87315178f3b73f3ff8da07d355e29d297e7e
2020-02-04 11:25:16 -08:00
Shawn Lin
f2bfaebb94 Merge "Make WmDisplayCutout support waterfall and long edge cutout" 2020-02-04 06:59:25 +00:00
Muhammad Qureshi
e2b2432bc6 Use FrameworkStatsLog instead of StatsLog
As part of statsd becoming a Mainline module in R, autogenerated
StatsLog.write() calls are going away and replaced by
*StatsLog.java
that is autogenerated for each module.
This CL replaces some usages of StatsLog with
FrameworkStatsLog.

Bug: 145952197
Test: m
Change-Id: Iaa2db34a7be4c3215f62cc36661ba8ac81656baa
2020-02-03 09:17:40 -08:00
Zhen Zhang
7f5b5d18c5 Add a feature flag for the new tether settings UI
The default value of the flag is false.
Bug:148220934
Bug:148182953
Test: Build successfully.

Change-Id: I63bcf1afe68e42759cb1c73655bd7561fe180fab
2020-02-02 15:15:38 -08:00
TreeHugger Robot
1320c7b707 Merge changes I259a3f41,Id309a941
* changes:
  Guard the preserve settings logic in SettingsBackupAgent with a flag
  Do not restore settings marked as preserved in SettingsBackupAgent
2020-02-02 16:28:38 +00:00
Automerger Merge Worker
8311aef869 Merge "Tidy up libcore.timezone APIs" am: 8e0e0e8535 am: 0769745f70 am: 5075b7014b
Change-Id: I3a8f7fba7c7c84b6f248a5d500b157c3412eaafc
2020-01-31 16:32:04 +00:00
Automerger Merge Worker
0769745f70 Merge "Tidy up libcore.timezone APIs" am: 8e0e0e8535
Change-Id: I0e15ce478bfaffb5defd0cfdb0e414f85bcf7af6
2020-01-31 16:29:11 +00:00
shawnlin
21e3f02b9c Make WmDisplayCutout support waterfall and long edge cutout
Bug: 146876976
Test: atest WmTests:WmDisplayCutoutTest
      atest DisplayLayoutTest
Change-Id: I1315533e17bd634f5db6be4276e66a00987dfc3d
2020-01-31 19:52:52 +08:00
Neil Fuller
8e0e0e8535 Merge "Tidy up libcore.timezone APIs" 2020-01-30 11:25:35 +00:00
TreeHugger Robot
8dee3654a9 Merge "Require signature scheme V2+ for target SDK R+" 2020-01-29 20:47:00 +00:00
Automerger Merge Worker
fdb676b4dd Merge "Rename ZoneInfoDB -> ZoneInfoDb" am: 402674f2a0 am: c3e31d6ac5 am: f8a4287915
Change-Id: I72978765010e3da52bcdf00299f7ba999bc9201b
2020-01-29 14:33:04 +00:00
Neil Fuller
c3e31d6ac5 Merge "Rename ZoneInfoDB -> ZoneInfoDb"
am: 402674f2a0

Change-Id: I3dca8a93ccbc0f5e6fd4905db82bec6d8e088164
2020-01-29 06:05:50 -08:00
Treehugger Robot
402674f2a0 Merge "Rename ZoneInfoDB -> ZoneInfoDb" 2020-01-29 14:00:45 +00:00
Automerger Merge Worker
6b398d9c37 Merge "CloseGuard: Fix JavaDoc code sample to use correct API" am: 88d4019b82 am: 87a25e33dd am: 363872235e
Change-Id: I615b0718b938185d9fa721c173d2bf0af3fc61d5
2020-01-29 01:52:04 +00:00
David Su
87a25e33dd Merge "CloseGuard: Fix JavaDoc code sample to use correct API"
am: 88d4019b82

Change-Id: Ia7a2358ca77ec0b25817f4b52c6793648933e2c4
2020-01-28 17:25:45 -08:00
Michael Groover
33df7c415a Require signature scheme V2+ for target SDK R+
With the recent sha-1 news, and since minSdk less than 18 for RSA and
minSdk less than 21 for DSA require sha-1, APK signature verification
will now require a minimum of a V2 signature for apps targeting R+.

Bug: 148313868
Test: atest PkgInstallSignatureVerificationTest
Change-Id: I8f518102a0b7cef190cbca59d140d380ae41c326
2020-01-28 14:31:29 -08:00
Neil Fuller
4720cf0309 Tidy up libcore.timezone APIs
Tidy up the libcore.timezone APIs to make them as close as possible to
android.timezone. In future, these classes should be repackages to be
the actual android.timezone classes, so the APIs need to be in sync.

Bug: 148086409
Test: treehugger
Change-Id: Ia520abcf00e691f4a1b5549dafec44b76075e31a
2020-01-28 15:26:45 +00:00
Neil Fuller
f14b18e153 Rename ZoneInfoDB -> ZoneInfoDb
Rename ZoneInfoDB -> ZoneInfoDb to conform with coding standards.

Bug: 148086409
Test: treehugger
Change-Id: I2a5eca6bd013d3ca2ba93aabf36745f8873fc6fb
2020-01-28 13:49:48 +00:00
David Su
ab2c291b46 CloseGuard: Fix JavaDoc code sample to use correct API
The code sample in the JavaDoc shows
`CloseGuard.get()` to create a new CloseGuard,
which is incorrect.
The correct API is `new CloseGuard()`.

Bug: 148291235
Test: compiles
Change-Id: I1dd24fff150e671007b67c023b20e078557f2966
2020-01-27 14:41:16 -08:00
Ruslan Tkhakokhov
6fb2bb1b42 Guard the preserve settings logic in SettingsBackupAgent with a flag
The flag will guard the feature in R and can be removed in the next
release.

Bug: 144838882
Test: atest SettingsBackupAgentTest
Change-Id: I259a3f41304c40d8aac5ab5e4d24ae1027914b56
2020-01-27 13:01:28 +00:00
TreeHugger Robot
457318ef6d Merge "Fixes SparseSetArray#add return logic" 2020-01-23 16:39:49 +00:00
Al Sutton
c8f1f33ed4 Merge "Add feature flag for "no data" backup calls" 2020-01-23 07:31:51 +00:00
Mike Ma
cc7c338c48 Merge "Make ProtoOutputStream public"
am: 566f8f0195

Change-Id: Id322686c850a1aa273d31c60c86e4fe052390d21
2020-01-22 10:33:00 -08:00
Mike Ma
566f8f0195 Merge "Make ProtoOutputStream public" 2020-01-22 18:14:00 +00:00
Automerger Merge Worker
ac3c3256aa Merge "Add new module-lib APIs for MTS testing" am: b9e3e9e34c am: 876c59823e am: 8c4c7d0039
Change-Id: I37488a81d4066d240bdc0a22dbd3c72cafd55749
2020-01-22 15:35:36 +00:00
Neil Fuller
876c59823e Merge "Add new module-lib APIs for MTS testing"
am: b9e3e9e34c

Change-Id: I3acc8118e444ba3255f393a622ea8405c03ffe03
2020-01-22 07:09:25 -08:00
Al Sutton
27c64a3bed Add feature flag for "no data" backup calls
This will allow us to turn off the new functionality while the
transport implementations are updated.

Bug: 147481066
Test: m -j RunBackupFrameworksServicesRoboTests
Change-Id: I8c0019ff80d94dd8d94299a7b03b78e3081f2b8e
2020-01-22 13:23:45 +00:00
Mike Ma
5f0652fc07 Make ProtoOutputStream public
Bug: 142279786
Test: atest ProtoInputStreamTests
Change-Id: I1f6eeb09898277a0975c2081630bfa849afc13ab
Merged-In: I1f6eeb09898277a0975c2081630bfa849afc13ab
2020-01-21 21:02:43 -08:00
Jay Aliomer
15d855465b Custom dark theme scheduling
allows the use to set the start and end automatic dark theme
activation within a day.
Fixes: 147649309
Test: atest UiModeManagerServiceTest UiModeManagerTest
Change-Id: Iaa3593d4e8863412e3703ce9f089b88dd4df1225
2020-01-21 14:13:23 -05:00
Neil Fuller
2551c033df Add new module-lib APIs for MTS testing
Several android.timezone classes have already been exposed for the
telephony module work, so these tests provide coverage for those.
Additional APIs have been exposed for MTS testing, i.e. to provide
greater confidence that the tzdata module data is correct / is
being read correctly.

Also, small changes to existing code to make them consistent with new
classes. Small docs improvements.

Bug: 147884233
Test: see system/timezone change
Change-Id: I047b29f17a41993f859947a6d6c3685896fe4cb6
2020-01-21 17:17:31 +00:00
Meng Wang
07bb82392d Merge "Expose logToRadioBuffer as system API" 2020-01-16 23:45:39 +00:00
Patrick Baumann
2c82a4b593 Fixes SparseSetArray#add return logic
Docs state that adding a key value pair that already exists will return
false, else true. The actual behavior is reverse. This change fixes
that.

Test: atest AppStateTrackerTest
Change-Id: I2593f2ba22b5972cccb1c0b3dc5aabb4ed65a023
2020-01-16 14:58:28 -08:00
Meng Wang
aa2ba8e941 Expose logToRadioBuffer as system API
Bug: 144374158
Test: make
Change-Id: I2d25a5844733ed7f1e0bb3f66d39f746f0f7acd8
2020-01-16 12:02:33 -08:00
Julia Reynolds
dcd70d6ec6 Allow conversations to be demoted out of the conversation space
Also default the flag to allow more notifications into that
space to on.

Test: atest
Bug: 137397357
Change-Id: I225f462879bdb28411cc631a3e259b4c71ba7394
2020-01-16 14:39:46 -05:00
TreeHugger Robot
e46c7474a2 Merge "Remove feature flag" 2020-01-16 15:10:17 +00:00
Muhammad Qureshi
91f03e0047 Merge "StatsEvent @SystemApi" 2020-01-16 01:22:35 +00:00
Xin Li
e13851556b DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb
2020-01-15 16:15:41 -08:00
Raff Tsai
e643911963 Remove feature flag
Bug: 141601408
Test: rebuild
Change-Id: If56d4f95413f029e3d4501d5daa129f6d78f9bca
2020-01-16 05:25:29 +08:00
Muhammad Qureshi
089d1bb28d StatsEvent @SystemApi
Make StatsEvent and StatsLog.write(StatsEvent) @SystemApi.

Bug: 146383532
Test: m

Change-Id: I15050734e757bdb622fb83e3ef244a6ebd26923b
2020-01-15 12:02:01 -08:00
TreeHugger Robot
9b10a80412 Merge "Flag to bypass shortcut req for "convo" notifs" 2020-01-14 03:50:40 +00:00