Commit Graph

1829 Commits

Author SHA1 Message Date
Neil Fuller
0fa758c3b8 Merge "Add the ability to configure NTP port for tests" am: 72e04a7dc2 am: 53d21a8591
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030083

Change-Id: Ia24fc0a73f74756a8b764961f5ac6023f478f327
2022-03-18 12:28:29 +00:00
Neil Fuller
72e04a7dc2 Merge "Add the ability to configure NTP port for tests" 2022-03-18 11:48:29 +00:00
Neil Fuller
187c975af9 Add the ability to configure NTP port for tests
Add the ability to configure NTP port for tests via the command line and
the associated plumbing / knock-ons.

In-progress CTS tests will run a fake NTP server on the device itself.
Binding to NTP's default port of 123 is restricted. Therefore, we need
to be able to override the port for tests.

adb shell cmd network_time_update_service set_server_config --port 9999
adb shell dumpsys network_time_update_service
<observe port value>
adb shell cmd network_time_update_service force_refresh
<observe false>

adb shell cmd network_time_update_service set_server_config
adb shell dumpsys network_time_update_service
<observe port value>
adb shell cmd network_time_update_service force_refresh
<observe true>

Bug: 213393821
Test: See above
Change-Id: I21e8b735fab268df0d617848b8a562f86560ad16
2022-03-17 11:36:19 +00:00
Presubmit Automerger Backend
6b38ba998e [automerge] Changes TimingsTraceLog and TimingsTraceAndSlog to be less spammy. 2p: bd3271d162
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17144854

Bug: 223642864
Change-Id: I7362998367d1a3b052eec3242eb51bff2106d421
2022-03-10 03:16:01 +00:00
Felipe Leme
bd3271d162 Changes TimingsTraceLog and TimingsTraceAndSlog to be less spammy.
Also adds unit tests for TimingsTraceAndSlog.

Test: atest FrameworksMockingCoreTests:TimingsTraceLogTest FrameworksMockingServicesTests:TimingsTraceAndSlogTest

Bug: 223642864

Change-Id: I3a2b259fca7c4fbab08bc4212d850fee3ac2f037
2022-03-09 19:15:01 -08:00
Neil Fuller
24753d5b6f Merge "Make NTP config configurable from cmd" am: 271dfbe8df am: 5c576e6d48
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007272

Change-Id: I84439877d8ade20e17f92acd1fb70034ca69da34
2022-03-04 12:30:16 +00:00
Neil Fuller
5c576e6d48 Merge "Make NTP config configurable from cmd" am: 271dfbe8df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007272

Change-Id: If16a743fc61890fd9e64856edc3bd8ccc9a4dd46
2022-03-04 12:08:06 +00:00
Neil Fuller
030a692189 Make NTP config configurable from cmd
Enable NTP failure / timeout testing by providing an ability for testers
to change the NTP configuration. Also improve debugging information from
dumpsys and logs.

Testing:

adb shell cmd network_time_update_service set_server_config --hostname localhost
adb shell dumpsys network_time_update_service
adb shell cmd network_time_update_service force_refresh
<observe false>

adb shell dumpsys network_time_update_service
adb shell cmd network_time_update_service set_server_config --hostname localhost --timeout_millis 1000
adb shell dumpsys network_time_update_service
adb shell cmd network_time_update_service force_refresh
<observe false, but faster>

adb shell cmd network_time_update_service set_server_config --hostname localhost --timeout_millis 10000
adb shell dumpsys network_time_update_service
adb shell cmd network_time_update_service force_refresh
<observe false, but slower>

adb shell cmd network_time_update_service set_server_config
adb shell cmd network_time_update_service force_refresh
<observe true>

Bug: 213393821
Test: See above
Change-Id: Ic66c7fabe0b42a3d5c86f8b85f17096bf64a8209
2022-03-03 15:40:33 +00:00
Neil Fuller
f12a783920 Merge "Command-line interface: NetworkTimeUpdateService" am: 8ac370e63f am: 7b559562f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2002571

Change-Id: Ia2389b5e2018bc27a19e4a8bc057baaa37e544fe
2022-03-02 14:11:14 +00:00
Neil Fuller
7b559562f7 Merge "Command-line interface: NetworkTimeUpdateService" am: 8ac370e63f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2002571

Change-Id: I1cb528ea3740f8ac54a30f79c4b9aeb7abb6b229
2022-03-02 13:51:11 +00:00
Neil Fuller
b368bac149 Command-line interface: NetworkTimeUpdateService
Initial command-line interface for NetworkTimeUpdateService for use in
tests.

To be joined by more commands as they are identified.

Bug: 213393821
Test: adb shell cmd network_time_update_service help
Test: adb shell cmd network_time_update_service clear_time
      && adb shell dumpsys network_time_update_service
Test: adb shell cmd network_time_update_service force_refresh
      && adb shell dumpsys network_time_update_service
Change-Id: I033764a7df9759e9fd4da0b0776f6535a574ff59
2022-03-01 10:34:36 +00:00
Kanyinsola Fapohunda
3a94d5049b Merge "Add local logs to NetworkTimeUpdateService" am: 6bda795c2b am: 7e16f6e837
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1998851

Change-Id: I2b8f1b52565e59e87ba383a6cbf6f35257c8e10b
2022-02-28 13:11:15 +00:00
Kanyinsola Fapohunda
7e16f6e837 Merge "Add local logs to NetworkTimeUpdateService" am: 6bda795c2b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1998851

Change-Id: Iab9e06ca91d50bc156463fe11019c76950738173
2022-02-28 12:58:21 +00:00
Kanyinsola
faedb36fb7 Add local logs to NetworkTimeUpdateService
Bug: b/217357882
Test: Changes adds local logs. Existing unit tests still pass.
Change-Id: I2876a479c5219b6e4af6dfe25ba0942d82115ca5
2022-02-25 13:47:20 +00:00
Xin Li
a6a261b1be Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:30:12 +00:00
Treehugger Robot
232508395e Merge "Add OWNERS entries for Android time team" am: 5ec4a12947 am: 2187630b81
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984967

Change-Id: I66ca05bc759163ee12a10b2adad67f7b5300008b
2022-02-14 15:36:47 +00:00
Neil Fuller
e41149620d Add OWNERS entries for Android time team
Add entries for the files that the Android time team have to update
occasionally.

Bug: 218802673
Test: None
Change-Id: I1255ac04e91c37051bdf4f72acea5cae4aca99db
2022-02-14 10:17:34 +00:00
Xin Li
5ad6db7742 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I8cfa435bb6233818adb9cc99dadeeb06a03443d5
Change-Id: Ib93992d88fd1704179009a3872798b9e7b83a6d1
2022-02-11 07:25:43 +00:00
Treehugger Robot
d707b4d927 Merge "Adds OWNERS to com.androd.util.Dump*" am: adeac26d27 am: 8b2b5eb434 am: 5a0ab52de4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976775

Change-Id: I3c54539abad06a232a17a42b008d35d3f6c62e29
2022-02-09 04:56:11 +00:00
Treehugger Robot
5a0ab52de4 Merge "Adds OWNERS to com.androd.util.Dump*" am: adeac26d27 am: 8b2b5eb434
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976775

Change-Id: I64ffe6eac9439a3e67c01607d367a0978b5cae93
2022-02-09 04:45:48 +00:00
Felipe Leme
ab085b2792 Adds OWNERS to com.androd.util.Dump*
Test: no, thanks
Bug: 149254050

Change-Id: Ie7ca5bcba00177efde125246354a88cec29a38a4
2022-02-08 16:26:38 -08:00
Treehugger Robot
ed3eb039b8 Merge "Delete legacy fs-verity support" am: 81568fa22f am: b4661e274c am: b754030dbe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966068

Change-Id: If68ccff8bad40fd9c74f38a7cd935a00c1575ba8
2022-02-08 01:50:05 +00:00
Treehugger Robot
b754030dbe Merge "Delete legacy fs-verity support" am: 81568fa22f am: b4661e274c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966068

Change-Id: I797f197a29a811795fc5be5339be1afbde2e5fcd
2022-02-08 01:26:39 +00:00
Treehugger Robot
81568fa22f Merge "Delete legacy fs-verity support" 2022-02-08 00:48:19 +00:00
Treehugger Robot
d9666b1551 Merge "Remove asapperstein from OWNERS." am: 06a35d9039 am: fa7a88e8fb am: 9997a8e895
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973059

Change-Id: I2551415ff2e70cccf437377d4f4d1e691b40f235
2022-02-07 17:21:44 +00:00
Treehugger Robot
9997a8e895 Merge "Remove asapperstein from OWNERS." am: 06a35d9039 am: fa7a88e8fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973059

Change-Id: I8ef42c647324ee150af0a85603b2cbb7ad7510ea
2022-02-07 17:05:36 +00:00
Andrew Sapperstein
aea112fe32 Remove asapperstein from OWNERS.
No longer on Settings, which was a team using FeatureFlagUtils.

Change-Id: I9c1c05b023021defcbce19ef500ddb13159caa87
2022-02-04 17:34:32 +00:00
Victor Hsieh
e97a8700b0 Delete legacy fs-verity support
The "legacy" fs-verity was introduced in P in Pixel 3 kernel. During
fs-verity upstream to Linux, the API has changed. During Pixel 4 / Q
development, fs-verity was upstreamed to Linux kernel. By setting
ro.apk_verity.mode = 2, device vendors such as Pixel 4 can opt in to
enable the support. The feature has become mandatory for new devices
shipped with R.

Since Pixel 3 family is no longer supported, it's time to remove the
dead code.

Bug: 120629632
Test: m
Test: TH
Change-Id: I6dacd9bbd38b502ee510ff12970e76342d7b72dd
Merged-In: I6dacd9bbd38b502ee510ff12970e76342d7b72dd
2022-02-01 23:09:43 +00:00
TreeHugger Robot
bb93951990 Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a177e057 am: dd9121aaf6 am: 5150b2b56c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491

Change-Id: I7f5b843e8a7c1c944ffc088556c64889e781e84f
2022-01-27 19:05:33 +00:00
TreeHugger Robot
a325e1bd17 Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a177e057 am: dd9121aaf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491

Change-Id: Ibb755f0f754c230678d3bfecc41b6aa36f834c6b
2022-01-27 18:47:46 +00:00
TreeHugger Robot
5150b2b56c Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a177e057 am: dd9121aaf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491

Change-Id: I24513de281029178f2cdd9360ce87ed4d8eb210c
2022-01-27 18:47:46 +00:00
Jackal Guo
7172238add Move CtsContentTestCases to group presubmit-large
The test config takes longer than 900 seconds to run. Move it to a
dedicated group for running slow presubmit Test Mapping test.

Some more context is in the referenced bug, e.g, b/174495337
The group will work exactly the same as presubmit for now.

Bug: 174654670
Bug: 174495337
Fix: 215431363
Fix: 215549069
Test: treehugger
Change-Id: Id9769bbc625b42257af603d69098ae69c0fabb80
Merged-In: Id9769bbc625b42257af603d69098ae69c0fabb80
(cherry picked from commit ccc91c4fa9)
2022-01-24 23:45:31 +08:00
Jing Ji
162bf7f024 Merge "Add settings to toggle the phantom process monitoring in dev options" into sc-v2-dev am: 1a789dc532
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16463227

Change-Id: I88d048fb2f44aa1f838cad7935ad42f087f9487e
2021-12-14 23:26:48 +00:00
Jing Ji
09dcdad5eb Add settings to toggle the phantom process monitoring in dev options
For power users, the monitoring on phantom processes could be turned
off from the Settings->Developer Options->Feature flags.

Bug: 210353231
Bug: 205156966
Test: Manual
Test: atest AppChildProcessTest
Test: atest CtsAppTestCases:ActivityManagerTest
Change-Id: I05f5b43e281b98676c615d350c213620d3d72b5c
Merged-In: I05f5b43e281b98676c615d350c213620d3d72b5c
2021-12-14 06:42:43 +00:00
Jing Ji
e98ecfd6ac Add settings to toggle the phantom process monitoring in dev options
For power users, the monitoring on phantom processes could be turned
off from the Settings->Developer Options->Feature flags.

Bug: 210353231
Bug: 205156966
Test: Manual
Test: atest AppChildProcessTest
Test: atest CtsAppTestCases:ActivityManagerTest
Change-Id: I05f5b43e281b98676c615d350c213620d3d72b5c
Merged-In: I05f5b43e281b98676c615d350c213620d3d72b5c
2021-12-13 22:06:37 -08:00
Edward Savage-Jones
ba3ca9252b Redact key value from log when DEBUG is false
See bug for details

Bug: 184525194
Test: see bug
Change-Id: I713fd8c03444167faf35a170b885c38af5482e31
Merged-In: I713fd8c03444167faf35a170b885c38af5482e31
2021-12-11 01:25:02 +00:00
Neil Fuller
dfa18bff1b Merge "Use ISO 8601 format for LocalLog local timestamps" am: 172fd44b2f am: 22ed1a7a79 am: 218b1d80e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878440

Change-Id: I8848a0d7a1e256b3cb71188137ab51a8a1c829b3
2021-12-07 15:17:42 +00:00
Neil Fuller
172fd44b2f Merge "Use ISO 8601 format for LocalLog local timestamps" 2021-12-07 14:26:24 +00:00
Treehugger Robot
703f963cc4 Merge "[MS06] Add carrier template fields into cloud backup/restore" am: bf424ed534 am: 3ac404a52d am: 2a239d2ae6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892336

Change-Id: Ibfb26963222568f64670c4bc3983c242a8595a28
2021-11-26 05:55:16 +00:00
Treehugger Robot
bf424ed534 Merge "[MS06] Add carrier template fields into cloud backup/restore" 2021-11-26 05:07:26 +00:00
Junyu Lai
4af17682d4 [MS06] Add carrier template fields into cloud backup/restore
NetworkTemplate with MATCH_CARRIER can be created in NPMS,
and can be backup by SettingsBackupAgent. However, since
the meteredness is not stored in the backup. After incorrectly
deducing from match rule, meteredness always becomes
METERED_ALL after restoring from backup.

This change also adds debug log if any non-persistable template
is being backed up.

Test: TH, dedicated test is included in the follow-up CL.
Bug: 204830222

Change-Id: I865b1d6e571ed998a75b776f01afc7c2534af2dc
2021-11-26 03:04:37 +00:00
Jonathan Lepage
4e0b4bc2ce Merge "Document that Log can quietly swallow UnknownHostExceptions." am: 9d01845696 am: fc60d843e6 am: 2bf9cccba6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873073

Change-Id: If5276716a304cfc0e795e74d3457f2bf9b4f0f17
2021-11-16 00:55:37 +00:00
Neil Fuller
c4b75122e7 Use ISO 8601 format for LocalLog local timestamps
Change to using ISO 8601 duration formatting for LocalLog local
timestamps, which makes it consistent with other time / time zone
detection dumpsys for easier comparison.

LocalLog is used by NetworkStack code as a standalone library, so
therefore has to depend on public SDK APIs, hence the use of Duration.

The local timestamp logging mode is only currently used for time / time
zone detection, which is low-frequency logging.

Bug: 204855374
Test: atest core/tests/coretests/src/android/util/LocalLogTest.java
Change-Id: Idce0d39c59670facdf48deca852b862ff0d71991
2021-11-15 17:30:27 +00:00
TreeHugger Robot
d9cbb79988 Merge "Enable large screen flag in the Settings app" into sc-v2-dev am: a67a07e2fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16187602

Change-Id: I001ac219364f4293d55739d8ce0579dd4d81dbd4
2021-11-05 08:13:58 +00:00
Tsung-Mao Fang
d5c2afc91c Enable large screen flag in the Settings app
Test: Rebuilt rom and see flag enable.
Bug: 197829997
Change-Id: Ib2490a58c39cfeddc588c5355b652fcb86d391bd
Merged-In: Ib2490a58c39cfeddc588c5355b652fcb86d391bd
2021-11-05 06:31:19 +00:00
Jonathan Lepage
ff42a9938b Document that Log can quietly swallow UnknownHostExceptions.
Change-Id: I7d3239eadf7dd73dd1ff12d2924bb43d3e357299
2021-11-04 00:53:34 +00:00
Suprabh Shukla
0708411189 Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4 am: 694cf0f6af am: 23315f8003 am: fefc7f08be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458401

Change-Id: I00953ab4617fb631f792694e43376c67f421e705
2021-09-30 00:13:12 +00:00
Suprabh Shukla
694cf0f6af Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458401

Change-Id: Iea902e93f038cd3a06d63cf6c6cdd149c873df79
2021-09-29 23:39:49 +00:00
Suprabh Shukla
17a7d79ff4 Merge "Redact key value from log when DEBUG is false" 2021-09-29 23:25:21 +00:00
Jordan Demeulenaere
6bd5b1160a Merge changes from topics "dialog-launch", "launch-animator" into sc-v2-dev am: 3bf72bd3f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15663086

Change-Id: If7f060b1c162f27d9659a0f71448d9622cbe25f8
2021-09-29 12:09:45 +00:00