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

629880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michele Berionne
ea591f8914 Merge "Clarification for PREPARE_UNATTENDED_REBOOT_ERROR" am: 11773facb7 am: 8e7f7303cf am: a3e52d2724 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613109

Change-Id: I9fde6ebeeb2dd5ad38847317198cd05a8b29c0f1
 2021-03-17 16:07:58 +00:00
Paul Hu
38ea30a5a4 Merge "Replace interal okhttp APIs" am: 96a89d8f43 am: 2989d99072 am: 542786989d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622669

Change-Id: Ida687a8987385ef4525e41e609d7c8fedda9f1da
 2021-03-17 16:07:31 +00:00
Lucas Lin
1e206c6a67 Merge "Remove NETWORK_STACK_UID check" am: 7044a8f3c7 am: 9b45108b82 am: e64e4d52e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635323

Change-Id: Icade0541f309622e39c9b02d86fbb6822c378fb1
 2021-03-17 16:06:56 +00:00
Automerger Merge Worker
597bef12ec Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." into rvc-qpr-dev am: 7874170373 -s ours" into rvc-qpr-dev-plus-aosp am: d29ed707b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7be07339caa5fc7411c5d530c3909f749b8ad870
 2021-03-17 16:06:33 +00:00
Lucas Lin
f659303e92 Merge "Add comments to describe the value of converting hex to decimal" am: 5b30e438de am: 9307980e95 am: 172cce09da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221

Change-Id: I0f978fd5fa0283a40db2897478483d680d44e9e9
 2021-03-17 16:05:47 +00:00
Lucas Lin
f8de58f992 [automerger skipped] Merge "Have a new API to get private DNS mode" am: 179ecda65f am: 114103eaf2 am: 3373b94c0d -s ours 
am skip reason: skip tag Change-Id I02a1e91b4eafb5f5df3eada1c07b99849a050c3c with SHA-1 b19b657309 is already in history

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

Change-Id: I45f348a3d0105f07441c8aabc226a12ee6a9e89c
 2021-03-17 16:05:23 +00:00
Chalard Jean
320315ac8c Merge "[NS01] Add NetworkScore" am: 1a645067e5 am: 8cde8bbe9a am: 2d07595731 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556099

Change-Id: I953a773f8914152578a98d71b43d0a2e30a51aba
 2021-03-17 16:04:22 +00:00
Remi NGUYEN VAN
34868e5de3 Merge "Add ParseException constructors to API" am: 9deb79f959 am: 7fc99816ce am: a375a561a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635044

Change-Id: I4e4b1f4a70fcfaa43fa9b612e7fbd151093fd8fe
 2021-03-17 16:03:23 +00:00
Youngjun Kwak
bcc2755295 [automerger skipped] Merge "DO NOT MERGE Delete superfluous call of mInsetsController.onControlsChanged." into rvc-qpr-dev am: 138fdb88cd am: f3dacb4e98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieecf116869ee837bdddbc45ddec1d31e1fb21365
 2021-03-17 16:03:02 +00:00
kwaky
8254f64259 [automerger skipped] DO NOT MERGE Delete superfluous call of mInsetsController.onControlsChanged. am: 1f2cb484f9 am: 4aa44211f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a64c4049cf995f46ffd32adc47fd229b7ca8b90
 2021-03-17 16:02:52 +00:00
Remi NGUYEN VAN
ed81edf21a [automerger skipped] Merge "Create ServiceConnectivityResources" am: 03aeadc030 am: 54c7dc1600 am: 1154393902 -s ours 
am skip reason: skip tag Change-Id I77ac6f4303c54acc96f16e18ef02add30298ff3d with SHA-1 9e8264dc32 is already in history

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

Change-Id: I95598f3c3fae16b5d2ec5dd314530649aee5e9b6
 2021-03-17 16:02:18 +00:00
Josh Gao
aa3594c724 Merge "fdtrack: emit the most common stack in the abort message." am: 3a95fb9b50 am: 5a762e7d9d am: 97805c051c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633025

Change-Id: Id226358f189792d861917817c7c6be49aaf52a9d
 2021-03-17 16:01:28 +00:00
Yan Wang
9836262d8b [automerger skipped] Merge "Add support to report ART metrics to statsd." am: 2d7f8bcdf4 am: 29d87fc490 am: f30c9c80c8 -s ours 
am skip reason: skip tag Change-Id Ic167e250a74e29dee0c8dc628d1cc731d778fa26 with SHA-1 57575ab883 is already in history

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

Change-Id: I7d18c0ae1388ab039777aa54c7b904cfd36352a7
 2021-03-17 15:59:47 +00:00
Treehugger Robot
d4e9242719 Merge "Emulator cleanup in ClipboardService.java" am: f97ab8c413 am: 3b0eafc236 am: 921af43bf8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634486

Change-Id: I19f4bd5a1c92009ca1531853fad1c07f729a03d6
 2021-03-17 15:59:23 +00:00
TreeHugger Robot
6efdd07be9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 5a5aad0c5b -s ours am: 1968fecd2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcdf08b8e9881b2158fef10f4240dcfa912328be
 2021-03-17 15:59:07 +00:00
TreeHugger Robot
82b3a28f68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 788527c931 -s ours am: acb2a488fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d89afafed66c384a254455997e8cdae58385344
 2021-03-17 15:58:53 +00:00
Treehugger Robot
b45183758e Merge "Adds OWNERS file" am: fa31d37ac7 am: f690d62fa2 am: 25c0656b54 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635326

Change-Id: I497f2eff5c6f6d95345ba59e4e144fe9bd6d324a
 2021-03-17 15:58:34 +00:00
Nicolas Geoffray
f920684a60 Merge "Make libsigchain a regular shared library dependency of app_process." am: 2fea6f3f77 am: 5040afaa3e am: 07618a5539 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621159

Change-Id: Ide62fa6706d8d473f00372864e989c8579d3bf44
 2021-03-17 15:57:46 +00:00
Julia Reynolds
c0aa79dece Vibrate as system instead of as an app am: aec7cbecdc am: 8e7d5e0889 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13875192

Change-Id: Ib943ec47a320bd0ce8ae1dba0e4b330b3035f1bc
 2021-03-17 15:56:28 +00:00
Treehugger Robot
7c1b2ff500 [automerger skipped] Merge changes from topic "b174856119_aosp" am: 53455cd150 am: 600d28c281 am: f621a3956a -s ours 
am skip reason: skip tag Change-Id Ib3643adfe18a8c4a54328f5a1737a480ea4cfadd with SHA-1 5fbdc85d1d is already in history

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

Change-Id: Ic3157270854ff453d6e7f6f2099a794e3c1fa06b
 2021-03-17 15:56:12 +00:00
Jackal Guo
03c5aa3640 [automerger skipped] Update CTS shim am: f7919a20ea am: b37e4bcc7d am: f422095147 -s ours 
am skip reason: skip tag Change-Id If280d558b687d3b34d28a2857748fda2dece18dd with SHA-1 749557e93f is already in history

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

Change-Id: If93f43c7603a7d2064477f9972da23262f8d52f0
 2021-03-17 15:56:02 +00:00
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