Commit Graph

56356 Commits

Author SHA1 Message Date
android-build-team Robot
79f22d2b4d Merge cherrypicks of [11816540, 11816001, 11816620, 11816559, 11816541, 11816621, 11815640, 11816506, 11816507, 11816508, 11816586, 11816587, 11816588, 11816589, 11816520, 11816173, 11816590, 11816591, 11816395, 11816003, 11816698, 11815507] into qt-qpr3-release
Change-Id: I398e0d1f652bafc92f99b05d665cf1f9018cc6fa
2020-06-10 00:37:35 +00:00
Sunny Shao
33dd3187d0 Allows to launch only authenticator owned activities
- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f98844)
(cherry picked from commit 4b6e82fd5d)
2020-06-10 00:36:59 +00:00
Treehugger Robot
d6d12e558c Merge "Settings performance testing" am: cd85c64362
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1318235

Change-Id: I075f1b3774522494f34310f9fa81e8adf7896659
2020-06-08 16:03:31 +00:00
Xin Li
71f9ff258a [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours
am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1323651

Change-Id: Idec7ee3bd2c9166103a124a8e8d006e68e1ac62c
2020-06-08 15:56:45 +00:00
Treehugger Robot
cd85c64362 Merge "Settings performance testing" 2020-06-08 07:05:23 +00:00
Xin Li
64d2330914 Merge "Merge QQ3A.200605.002 into master" 2020-06-06 01:41:19 +00:00
youtengliang
c7cc312e0a Settings performance testing
1. Add percentile tags.
2. Fill 0 to avg, max, min and percnetiles when we detected result array
not equals to TEST_TIME.
3. Write error message to log when above situation occurred.

Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: I2fe72a9289d8d2c6cccd6ae52156df3b31934516
2020-06-04 14:49:07 +08:00
Xin Li
729c213fb7 Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: I614914b738e3af198fe21b881d2e475e2e8eda41
Change-Id: Idd585020a1fed163866339c09d614dca0ca6e55f
2020-06-03 10:45:09 -07:00
Paul Hu
cbebca9881 Merge "Forward the ResultReceiver to Tethering Entitlement app" am: 6045e9b90d
Change-Id: I614914b738e3af198fe21b881d2e475e2e8eda41
2020-05-29 21:26:52 +00:00
Paul Hu
6045e9b90d Merge "Forward the ResultReceiver to Tethering Entitlement app" 2020-05-29 11:54:20 +00:00
paulhu
a788a3190c Forward the ResultReceiver to Tethering Entitlement app
Bug: 156336264
Test: atest TetherProvisioningActivityTest
Change-Id: I37fcaddd5569223146ff9d6316d97f33312d8d24
Merged-In: I37fcaddd5569223146ff9d6316d97f33312d8d24
2020-05-29 00:06:52 +08:00
Edgar Wang
4d93ad694b Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207
Change-Id: I74e93eca610194d7251c596bb854446bbc3dc129
2020-05-28 06:45:04 +00:00
Edgar Wang
9bc3b6a207 Merge "Fix NPE if default supervisor is not defined" 2020-05-28 06:30:46 +00:00
Treehugger Robot
6ea2228e31 Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce
Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3
2020-05-27 01:52:00 +00:00
Treehugger Robot
d01838d8ce Merge "Fix NPE if CarrierConfigManager is not available" 2020-05-27 01:36:46 +00:00
Brad Ebinger
525a07ec7f Fix NPE if CarrierConfigManager is not available
Fixes: 155147094
Fixes: 155819375
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
Merged-In: Iecf3e385a88d18c7578eb520449f4042324e21f5
2020-05-26 15:50:41 -07:00
Treehugger Robot
9cfbb7fba3 Merge "Settings performance testing" am: 32ca9b270d
Change-Id: Id0f496b2c8709c2655eadccef900256d52a6a130
2020-05-25 13:44:32 +00:00
Treehugger Robot
32ca9b270d Merge "Settings performance testing" 2020-05-25 13:32:11 +00:00
youtengliang
bc1618f5d5 Settings performance testing
1. Enable airplane mode before start testing.
2. Reset airplane mode after testing.
3. Add all_results tag to track results we have.
4. Add result_count tag to track how many results we have.
5. Add shell command result details to log.

Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: I24ed167599b660b2aa94b4a3f8ddae1dcf3d04ff
2020-05-25 16:37:03 +08:00
Jeff Tinker
a5f7479f5a Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c
Change-Id: I980e0dba1556a28d683ffb3e5a40da52974c062e
2020-05-20 19:50:57 +00:00
Jeff Tinker
9e974afd4c Merge "Revert "[Settings] Remove mobile network v1"" 2020-05-20 19:37:56 +00:00
Jeff Tinker
9c657c34f4 Revert "[Settings] Remove mobile network v1"
This reverts commit daf6c9e85b.

Reason for revert: Broken build 6513883 on aosp-master on errorprone

Change-Id: I5e473863c2669a3c89014e12cc952c5c72a12cb7
bug:157138919
2020-05-20 19:14:57 +00:00
Bonian Chen
075a17c995 Merge "[Settings] Remove mobile network v1" am: 10799d12fd
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
2020-05-20 12:45:32 +00:00
Bonian Chen
10799d12fd Merge "[Settings] Remove mobile network v1" 2020-05-20 12:28:20 +00:00
Bonian Chen
daf6c9e85b [Settings] Remove mobile network v1
Cherry-pick of Ib365ba712af62729ca35abbc370aef087ce52a90

Fixes: 142920912
Test: rebuild, robolectric
Merged-In: Ib365ba712af62729ca35abbc370aef087ce52a90
Change-Id: I1554d475e0f34971381dcc42817573f98f958825
2020-05-20 07:49:33 +00:00
Treehugger Robot
d71f2b3f1a Merge "Preserve icon for "manage space"" am: c39b3dfd76
Change-Id: Ic24c59d88117a9e0a6f61e2c1b0e2726a1546487
2020-05-19 11:58:13 +00:00
Treehugger Robot
c39b3dfd76 Merge "Preserve icon for "manage space"" 2020-05-19 11:42:46 +00:00
Zoey Chen
6622ff7181 Merge "[Settings] Code refactor" am: f4d59078fb
Change-Id: I65a011ca26c574d53d7ae3c2551fe6aa44f9c861
2020-05-19 10:15:33 +00:00
Zoey Chen
f4d59078fb Merge "[Settings] Code refactor" 2020-05-19 09:51:16 +00:00
Bonian Chen
e9911c28cf [Settings] Code refactor
Code refactor.

Bug: 141833767
Test: manual
Merged-In: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
Change-Id: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
2020-05-19 16:48:11 +08:00
Zoey Chen
2673571d28 Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca
Change-Id: I1d486a18f7b0a9b7eb79ac3d28ebbdc0cdfa88c9
2020-05-19 08:23:13 +00:00
Zoey Chen
d7dbfe04ca Merge "[Settings] Code refactor for availability session" 2020-05-19 08:04:42 +00:00
Bonian Chen
cede995c5d [Settings] Code refactor for availability session
Code refactor for session design of availability status config.

Bug: 141833767
Test: manual
Merged-In: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657
Change-Id: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657
2020-05-19 11:41:59 +08:00
Zoey Chen
9cc7978d0a Merge "Improve the performance of displaying preference." am: f0322ab48e
Change-Id: I27fdfb879d8081ebd949f57799f10daa2d0f8c2d
2020-05-19 03:22:10 +00:00
Zoey Chen
f0322ab48e Merge "Improve the performance of displaying preference." 2020-05-19 03:03:26 +00:00
Zoey Chen
ad9b5c3b56 Merge "[Settings] Avoid rendering hidden preferences" am: b4b612a8e3
Change-Id: I75cf82d73c30583c5e7983e90af50da43246abfc
2020-05-18 08:58:01 +00:00
zoey chen
20d88eb2a8 Improve the performance of displaying preference.
- Set a variable to record the status then replace getAvailabilityStatus() with it.

Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 154061428
Merged-In: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
Change-Id: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
2020-05-18 16:51:13 +08:00
Zoey Chen
b4b612a8e3 Merge "[Settings] Avoid rendering hidden preferences" 2020-05-18 08:38:05 +00:00
Bonian Chen
cc6a88bf6c [Settings] Avoid rendering hidden preferences
Under dashboards with expand button, preferences are renderred even
not been expanded.
Avoid from rendering un-expanded preference can improve the performance
of dashboard display.

Bug: 141833767
Test: manual
Merged-In: I00c6f827a0b7b7cec6a6fd8c809b94ca1dce88bb
Change-Id: I00c6f827a0b7b7cec6a6fd8c809b94ca1dce88bb
2020-05-18 03:17:09 +00:00
Benedict Wong
63a1447508 Merge "Hide IKEv2 VPN options if not supported" am: 806523a7cd
Change-Id: I3e8b13b615bfc6c2095efd5bd7c2f61beebf7b3e
2020-05-16 00:25:53 +00:00
Benedict Wong
806523a7cd Merge "Hide IKEv2 VPN options if not supported" 2020-05-16 00:14:05 +00:00
Wang Han
719b573173 Fix NPE if default supervisor is not defined
* Checking for null does not work sadly. This fixes NPE at
   calling who.compareTo(supervisorComponent).

Change-Id: Ie49df625b1514b1d1e5f8063db66dce4a5050039
2020-05-15 14:06:11 +00:00
Treehugger Robot
5797829fa6 Merge "Settings performance testing" am: 9446266f4f
Change-Id: Ie761e966d27c4aaf7e28850b0a01fc06650c4738
2020-05-15 10:43:29 +00:00
Treehugger Robot
9446266f4f Merge "Settings performance testing" 2020-05-15 10:28:54 +00:00
youtengliang
1bf3f1c26a Settings performance testing
1. Change TEST_TIME to 10 to avoid timeout fail.

Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: Id1ec855196b3e8b5fdd28c0d683aa95b002a8462
2020-05-15 14:26:14 +08:00
Benedict Wong
ad2421fe5b Hide IKEv2 VPN options if not supported
This change hides the VPN type options if the FEATURE_IPSEC_TUNNELS is
not supported on the device.

Bug: 156681625
Test: Manually tested
Change-Id: I3ef2e6144371596380351341e58c4ee84d49f39d
2020-05-14 19:13:53 -07:00
Treehugger Robot
0780e5d581 Merge "Settings performance testing" am: 8683e38068
Change-Id: I9ebe2a1749a4279d66c987a724cddef02526bfd1
2020-05-11 04:18:19 +00:00
Treehugger Robot
8683e38068 Merge "Settings performance testing" 2020-05-11 04:02:55 +00:00
youtengliang
9de3878944 Settings performance testing
1. Add storage page as test target.
2. Set screen timeout to 2 hours to avoid screen timeout during testing.
3. Force close settings before launching each page.
4. Reset screen timeout after testing.
5. Increase test times from 10 to 100.

Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: I52c4f15e47a2a83219212de1262a13b3b196c21c
2020-05-08 20:30:42 +08:00
Bill Yi
4192f7f836 Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" am: a502c55a5c
Change-Id: I309b9093a6f18bbb88f2a1b6ae3c7dc71c17cc13
2020-05-06 16:15:39 +00:00