Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
629,784 Commits 3 Branches 0 Tags
bfc7480dc50df7cb025a6f5ab151f2a21c5bbf26
Commit Graph

629784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
bfc7480dc5 Merge "Rename DiagnosticCall to CallDiagnostics." into sc-dev 2021-03-17 15:42:38 +00:00
Nataniel Borges
5ec748f76e Merge "3-button mode tests close app tests" into sc-dev 2021-03-17 15:21:41 +00:00
Chiachang Wang
11222736c5 Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev 2021-03-17 15:21:17 +00:00
Bernardo Rufino
689a571110 Merge "Shorten trampoline toast text" into sc-dev 2021-03-17 14:31:44 +00:00
Beverly Tai
8b685d078e Merge "Add AUTH_SCRIMMED state to ScrimControllerTest" into sc-dev 2021-03-17 14:03:53 +00:00
Jay Aliomer
93b3622bc6 Merge "Inline reply text" into sc-dev 2021-03-17 14:02:21 +00:00
TreeHugger Robot
0bbe29b6c4 Merge "Always use Slog in InputMethodSubtypeSwitchingController" into sc-dev 2021-03-17 13:53:59 +00:00
Beverly
fd47ec35bf Add AUTH_SCRIMMED state to ScrimControllerTest 
Fixes: 182942630
Test: atest ScrimControllerTest
Change-Id: I37860f83c3c81b4ff2d3b5fb9c6091008bd2eda3
 2021-03-17 09:53:08 -04:00
Wu Ahan
224131da03 Merge "Instrument jank between lockscreen and AoD" into sc-dev 2021-03-17 13:50:29 +00:00
Nataniel Borges
e52c38f750 3-button mode tests close app tests 
Tests now run in:
  - Portrait + 3 Button
  - Landscape + 3 Button
  - Portrait + Gestural
  - Landscape + Gestural

Moreover, the tests now share the code and assertions because they should behave exactly the same (except for the transition)

Test: atest FlickerTests
Bug: 167521849
Change-Id: Id88514d83e40c04bce3135cccdc142a2b2745597
 2021-03-17 14:42:56 +01:00
Nataniel Borges
765f55d9b7 Merge "3-button mode tests app launch tests" into sc-dev 2021-03-17 13:41:57 +00:00
Nataniel Borges
fa07ea401b Merge "3-button mode tests for rotation tests" into sc-dev 2021-03-17 13:41:50 +00:00
Nataniel Borges
5b0f9fa4f5 3-button mode tests for rotation tests 
Tests now run in:
  - Portrait to Landscape + 3 Button
  - Landscape to Portrait + 3 Button
  - Portrait to Landscape + Gestural
  - Landscape to Portrait + Gestural

Test: atest FlickerTests
Bug: 167521849
Change-Id: I997c7af9c4895452aafb1f8e3b13b15168697963
 2021-03-17 14:28:48 +01:00
Nataniel Borges
006fbdea31 3-button mode tests app launch tests 
Tests now run in:
  - Portrait + 3 Button
  - Landscape + 3 Button
  - Portrait + Gestural
  - Landscape + Gestural

Test: atest FlickerTests
Bug: 167521849
Change-Id: I12137d9a41e36e48263e81d8d8318d21f32f8384
 2021-03-17 14:28:42 +01:00
Jeff DeCew
7003e6d3c1 Merge "Fix notification colors on theme change." into sc-dev 2021-03-17 12:53:16 +00:00
Jeff DeCew
2577558bb2 Merge "Do not use getPackageContext where Icon.createWithResource just extracts the packageName" into sc-dev 2021-03-17 12:43:47 +00:00
Santos Cordon
c6c86d83fa Merge "Fix AutomaticBrightnessControllerTest" into sc-dev 2021-03-17 12:22:35 +00:00
Bernardo Rufino
b5c1bd7b0d Merge "Remove collapsePanels() publicAlternatives" into sc-dev 2021-03-17 11:30:15 +00:00
TreeHugger Robot
6681a15237 [automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332 am: 57ac59568c -s ours 
am skip reason: skip tag Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 5b90ebaf4d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425320

Change-Id: I0d9e8484e30a9cc730897841779b454a86a4ca52
 2021-03-17 09:41:45 +00:00
Lorenzo Colitti
0c1166b298 [automerger skipped] Backport test coverage from aosp/1547496. am: 1255ddbc76 am: 134a538d0b -s ours 
am skip reason: skip tag Change-Id Ibf376a6fa4b34d1c96f8506fa8abbb7595a8c272 with SHA-1 a1c896e22e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425319

Change-Id: Id9d9f9db4bbed35bea8599a33a94c4248463364c
 2021-03-17 09:41:36 +00:00
Lorenzo Colitti
8012af4022 [automerger skipped] Backport some helpers in ConnectivityServiceTest. am: be317557fe am: 04daf7b175 -s ours 
am skip reason: skip tag Change-Id I827543751dbf5e626a24ec02cd6f50b423f5f761 with SHA-1 4d3a0c2435 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425318

Change-Id: Ia26d7b281695355b9d96a4689fa6edd28b9355b0
 2021-03-17 09:41:26 +00:00
Lorenzo Colitti
e1bc643b8d [automerger skipped] Test for bugs with suspended VPN underlying networks. am: 9687fd7c3b am: 6056ae9588 -s ours 
am skip reason: skip tag Change-Id Ia52f9cafef3f49ae70ad135d017e207eb57fddfe with SHA-1 27ecde9373 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425317

Change-Id: Id04bcd50ea4c343e014de1babee8b5e71f18f422
 2021-03-17 09:41:17 +00:00
Lorenzo Colitti
eb88c72ffb [automerger skipped] Add a test for getDefaultNetworkCapabilitiesForUser. am: cb2feba0fb am: 53603b1210 -s ours 
am skip reason: skip tag Change-Id I210284578e38cd25b8b95235d3390d5bd66a5a70 with SHA-1 a9aca97447 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425316

Change-Id: If447c6692f3fd150aa67c1db98560995e3335294
 2021-03-17 09:41:04 +00:00
Lorenzo Colitti
3f6e626c69 [automerger skipped] Improve testing of CONNECTIVITY_ACTION broadcasts. am: 4a66aedf09 am: 585faca059 -s ours 
am skip reason: skip tag Change-Id Ibada8b4215625e1016d9fd170526206920af76f5 with SHA-1 d39cfb8de7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425315

Change-Id: Ic26cfc92ad7e9a600ee22060f78a5a29a37ede52
 2021-03-17 09:40:54 +00:00
Lorenzo Colitti
92c8cb18c9 [automerger skipped] Test passing an underlying network array with null network in it. am: 1a05734c87 am: 17bbcba339 -s ours 
am skip reason: skip tag Change-Id Id4632e1b004c09910b4b7613f7233d2c19e2f0ac with SHA-1 eccd262390 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425314

Change-Id: If8e2cbbde74be7a8424da2b14af3d2948231bd0b
 2021-03-17 09:40:44 +00:00
Lorenzo Colitti
e17d45f49d [automerger skipped] Make testVpnNetworkActive more deterministic. am: d2adbfbf40 am: 287207c923 -s ours 
am skip reason: skip tag Change-Id I319858228e8d097c0b60a107029f296385f91269 with SHA-1 0b53357c1a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425313

Change-Id: Ie0c2945a894d0fb39ae5499d1b55293c604a7ca5
 2021-03-17 09:40:34 +00:00
Lorenzo Colitti
34d15e3019 [automerger skipped] Make MockVpn more realistic and easier to use. am: f3d35fdeaa am: 635e063857 -s ours 
am skip reason: skip tag Change-Id I749ff325bc13ac96f512270b86d1f67686eec378 with SHA-1 a083cb1ffe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425312

Change-Id: Ie847fa29d101d3c248c091bbeab6b1d30178a2d5
 2021-03-17 09:40:23 +00:00
Lorenzo Colitti
c9a31c03d3 [automerger skipped] Increase test coverage for VPN info sent to NetworkStatsService. am: d10299582a am: f4c6750cd4 -s ours 
am skip reason: skip tag Change-Id I3711b362f31cb92b759e9f5c9d244fb88d9bd5e7 with SHA-1 04314f147d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425311

Change-Id: Ib0939855e528d7c8268d290cd511deeb7c247192
 2021-03-17 09:40:14 +00:00
Lorenzo Colitti
46e9003506 [automerger skipped] Simplify MockVpn. am: 7c4ae16b94 am: 401dd1cfd4 -s ours 
am skip reason: skip tag Change-Id I49421183538ba61ca790af71e309ece36b653bf9 with SHA-1 9ededd8476 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425310

Change-Id: I61d9213a4448374d899d8cd350cfaf3063e0b8be
 2021-03-17 09:40:04 +00:00
Lorenzo Colitti
90c50552b6 [automerger skipped] Test a VPN with an underlying network that does not yet exist. am: 334a66342c am: d66f3623f6 -s ours 
am skip reason: skip tag Change-Id Icc0701cb4cea7d91f7738c1e426e94cd26686b74 with SHA-1 a21b2252e0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425309

Change-Id: I843ca49b6d850c234e155a9cd06b1d246981d72a
 2021-03-17 09:39:51 +00:00
TreeHugger Robot
57ac59568c Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425320

Change-Id: Id5810e50b56389fe53f739f84ad79d8ef878e4f6
 2021-03-17 09:15:05 +00:00
Lorenzo Colitti
134a538d0b Backport test coverage from aosp/1547496. am: 1255ddbc76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425319

Change-Id: I559be41c77cc6348e745324ab675c603b1f3ad1d
 2021-03-17 09:15:02 +00:00
Lorenzo Colitti
04daf7b175 Backport some helpers in ConnectivityServiceTest. am: be317557fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425318

Change-Id: I7ffa0faf61ccc7238b65e0f9ed863939e5089f06
 2021-03-17 09:14:59 +00:00
Lorenzo Colitti
6056ae9588 Test for bugs with suspended VPN underlying networks. am: 9687fd7c3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425317

Change-Id: I28f2b0f682d8ee2982b8669267efe43ae0805778
 2021-03-17 09:14:57 +00:00
Lorenzo Colitti
53603b1210 Add a test for getDefaultNetworkCapabilitiesForUser. am: cb2feba0fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425316

Change-Id: Ic3b3584c25a0703aa273b47d042b2b339f1de2e7
 2021-03-17 09:14:54 +00:00
Lorenzo Colitti
585faca059 Improve testing of CONNECTIVITY_ACTION broadcasts. am: 4a66aedf09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425315

Change-Id: I889026eec095745be2e88f0c38392619c8ae6cfd
 2021-03-17 09:14:49 +00:00
Lorenzo Colitti
17bbcba339 Test passing an underlying network array with null network in it. am: 1a05734c87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425314

Change-Id: I7c78a186187db9c77c8980b670f802f9fd2e42ce
 2021-03-17 09:14:46 +00:00
Lorenzo Colitti
287207c923 Make testVpnNetworkActive more deterministic. am: d2adbfbf40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425313

Change-Id: I5b7901958bf96b0cee80c6124e004e57da0992cd
 2021-03-17 09:14:44 +00:00
Lorenzo Colitti
635e063857 Make MockVpn more realistic and easier to use. am: f3d35fdeaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425312

Change-Id: I0e1ff975206ed180744c4c7a6f42e00b95589424
 2021-03-17 09:14:41 +00:00
Lorenzo Colitti
f4c6750cd4 Increase test coverage for VPN info sent to NetworkStatsService. am: d10299582a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425311

Change-Id: Ibea98977b36f0e9a71d47f0ec3fe4926516842f7
 2021-03-17 09:14:38 +00:00
Lorenzo Colitti
401dd1cfd4 Simplify MockVpn. am: 7c4ae16b94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425310

Change-Id: Iff91a12ced969b34ba28b792e476c945eecdb817
 2021-03-17 09:14:36 +00:00
Lorenzo Colitti
d66f3623f6 Test a VPN with an underlying network that does not yet exist. am: 334a66342c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425309

Change-Id: Iac0a5305600fc70e05de90e4552258a0225d7f94
 2021-03-17 09:14:32 +00:00
Jeff Chang
0c6e87b13f Merge "Make documentLaunchMode="never" activity don’t create task" into sc-dev 2021-03-17 08:57:57 +00:00
TreeHugger Robot
65eb4a4332 Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev 
* changes:
  Fix legacy APIs when VPN switches to suspended underlying network.
  Backport test coverage from aosp/1547496.
  Backport some helpers in ConnectivityServiceTest.
  Test for bugs with suspended VPN underlying networks.
  Add a test for getDefaultNetworkCapabilitiesForUser.
  Improve testing of CONNECTIVITY_ACTION broadcasts.
  Test passing an underlying network array with null network in it.
  Make testVpnNetworkActive more deterministic.
  Make MockVpn more realistic and easier to use.
  Increase test coverage for VPN info sent to NetworkStatsService.
  Simplify MockVpn.
  Test a VPN with an underlying network that does not yet exist.
 2021-03-17 08:14:50 +00:00
Nathalie Le Clair
30664e5ebd Merge "Document intents triggering CEC power control messages" into sc-dev 2021-03-17 08:01:39 +00:00
Jacky Kao
fb33610cdd Merge "Logs magnification feature behavior. (1/2)" into sc-dev 2021-03-17 07:19:14 +00:00
Chiachang Wang
104cd7c155 Replace hidden CM#isNetworkSupported() usage 
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settingslib use it to
check if device support telephony service. Use alternative
method to check if device supports such feature.

Bug: 172183305
Test: make RunSettingsLibRoboTests
Change-Id: I713c6410fcf9543d54d9b0057ed7b2ecdab201ee
 2021-03-17 15:15:26 +08:00
Hyundo Moon
a85407a4cb Merge "System MR2: Set clientPackageName on system routing session" into sc-dev 2021-03-17 06:29:55 +00:00
Shinru Han
40c904fb8b Merge "Add comment for getMagnitude in CorrelationVector" into sc-dev 2021-03-17 06:27:27 +00:00
TreeHugger Robot
305cd29da5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 800dbab181 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13891792

Change-Id: I1f99d8873b5b347844c86d64e0ec909305df6224
 2021-03-17 06:24:30 +00:00