Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
676,841 Commits 3 Branches 0 Tags
055239762b8523377d370be75bdb8658efceffc0
Commit Graph

676841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Song Hu
055239762b Merge "Send registerPredictionUpdates request immediately instead of pushing it to the main thread Looper queue." into sc-v2-dev am: f75df97500 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16133047

Change-Id: I5ab959598150988bdcbe23ee20752ac37e959706
 2021-11-01 23:30:14 +00:00
Guojing Yuan
5a093c5a74 Merge "Fix NPE during restartBleScan() when scanner is null" into sc-v2-dev am: e5e42892c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16166922

Change-Id: I10eda75d84c2226376bebb0f1463cce2a58eb12a
 2021-11-01 23:29:12 +00:00
Song Hu
f75df97500 Merge "Send registerPredictionUpdates request immediately instead of pushing it to the main thread Looper queue." into sc-v2-dev 2021-11-01 23:25:12 +00:00
Guojing Yuan
e5e42892c5 Merge "Fix NPE during restartBleScan() when scanner is null" into sc-v2-dev 2021-11-01 23:13:21 +00:00
Treehugger Robot
7d384d46d4 Merge "Adjust the OWNERS file for attestation verification" am: 99d0fd69cb am: af0e10c87a am: ff8419f033 am: 7977f19d26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1874147

Change-Id: I64bd3043000d71ef79312b7367b5fda0dfc9ad83
 2021-11-01 21:52:48 +00:00
Treehugger Robot
7977f19d26 Merge "Adjust the OWNERS file for attestation verification" am: 99d0fd69cb am: af0e10c87a am: ff8419f033 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1874147

Change-Id: I8e2cf8541c2af59f709636a97197893ff221b9f7
 2021-11-01 21:35:47 +00:00
Treehugger Robot
ff8419f033 Merge "Adjust the OWNERS file for attestation verification" am: 99d0fd69cb am: af0e10c87a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1874147

Change-Id: I8269f7cb95953af5636753175332d7c8276dce8a
 2021-11-01 21:23:04 +00:00
Treehugger Robot
af0e10c87a Merge "Adjust the OWNERS file for attestation verification" am: 99d0fd69cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1874147

Change-Id: Ie6fc9cf66f2222814e4b03f1a56a8133f65a7dff
 2021-11-01 21:09:35 +00:00
Hongwei Wang
096a5c5a8e Merge "Avoid conflict surface reset on auto-enter-pip" into sc-v2-dev am: fdf6eedb10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16150706

Change-Id: Ieaaa85134e0f31cc322d63d4974aee8e3596ec6e
 2021-11-01 20:54:56 +00:00
TreeHugger Robot
62c0e2020e Merge "Do not use shared lib resources" into sc-v2-dev am: cd12f1b260 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16163399

Change-Id: I5a5d210e9847908546c950305ab9115029576ba7
 2021-11-01 20:53:51 +00:00
Evan Chen
0a76831174 Merge "Make sure sendresult after association was created" into sc-v2-dev am: e1211c6726 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16132112

Change-Id: I57376842363715ca36596d814a06f28acc8e9b54
 2021-11-01 20:52:57 +00:00
Hongwei Wang
fdf6eedb10 Merge "Avoid conflict surface reset on auto-enter-pip" into sc-v2-dev 2021-11-01 20:51:41 +00:00
Treehugger Robot
99d0fd69cb Merge "Adjust the OWNERS file for attestation verification" 2021-11-01 20:48:31 +00:00
TreeHugger Robot
cd12f1b260 Merge "Do not use shared lib resources" into sc-v2-dev 2021-11-01 20:40:43 +00:00
Guojing Yuan
6e7bf2578f Fix NPE during restartBleScan() when scanner is null 
Fix: 204533528

Test: N/A
Change-Id: If242e01979c381aab5538e93bdf889ea95e16a20
 2021-11-01 20:39:56 +00:00
Evan Chen
e1211c6726 Merge "Make sure sendresult after association was created" into sc-v2-dev 2021-11-01 20:34:13 +00:00
Treehugger Robot
5ea0e6484b Merge "Use static utils from f/l/n instead of the networkstack" am: 1b05dfe00d am: a2e71597bf am: be2b59b841 am: 8289d0432d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873995

Change-Id: I61451ebe5f6ed25a0d3f75f939c73efb9f942c8b
 2021-11-01 20:28:15 +00:00
TreeHugger Robot
dddddb6e3b Merge "Rewrite dumping NSSL hierarchy" into sc-v2-dev am: 2bb5aa5527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16150081

Change-Id: Ic5697690cde94bcef6ad16e4ffb6d28e200f5833
 2021-11-01 20:12:47 +00:00
TreeHugger Robot
2bb5aa5527 Merge "Rewrite dumping NSSL hierarchy" into sc-v2-dev 2021-11-01 20:08:58 +00:00
Treehugger Robot
8289d0432d Merge "Use static utils from f/l/n instead of the networkstack" am: 1b05dfe00d am: a2e71597bf am: be2b59b841 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873995

Change-Id: Ic1446a482f4a515d9ac16f76d0b8c3ebf73fe187
 2021-11-01 20:06:40 +00:00
Jeff DeCew
c35b3fedf9 Merge "New Pipeline: Add Trace calls to measure performance." into sc-v2-dev am: 8201c87afc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16162917

Change-Id: I7ffb273467b9033b37cf2f7db95cd87fabc882f5
 2021-11-01 20:06:33 +00:00
Jeff DeCew
8201c87afc Merge "New Pipeline: Add Trace calls to measure performance." into sc-v2-dev 2021-11-01 20:03:28 +00:00
Treehugger Robot
be2b59b841 Merge "Use static utils from f/l/n instead of the networkstack" am: 1b05dfe00d am: a2e71597bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873995

Change-Id: Ic60a1f3ea4df4179669bc65cf6b20cc9f27217d5
 2021-11-01 19:51:11 +00:00
TreeHugger Robot
9231b6726c Merge "[RemoteInputView] Reorder fields + clean listener registration APIs" into sc-v2-dev am: 6afd143ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15950145

Change-Id: Iadec09eb6433a38136eeb531a2530aeeeac1725d
 2021-11-01 19:50:48 +00:00
TreeHugger Robot
6afd143ea0 Merge "[RemoteInputView] Reorder fields + clean listener registration APIs" into sc-v2-dev 2021-11-01 19:45:05 +00:00
TreeHugger Robot
39258b6945 Merge "New Pipeline: Show group count" into sc-v2-dev am: 76292931f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16159682

Change-Id: I49001485a4810d17fc8eb29af521aecf6f0c16b8
 2021-11-01 19:40:21 +00:00
Jeff DeCew
d2905c5821 Merge changes from topic "b204127880_pipeline_backport_2" into sc-v2-dev am: 2657c08a78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16155305

Change-Id: I5d469e512d3964233b4ff5706637112c2894dc57
 2021-11-01 19:39:54 +00:00
Steve Elliott
38175f4a6f Enforce Coordinator encapsulation w/ Dagger am: caeb5d278d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16155303

Change-Id: Ibf56167e7ebd2378587524a30d6b2944253a552b
 2021-11-01 19:39:44 +00:00
Steve Elliott
a1cc90e082 Add sensitive content redaction to notif pipeline am: 9a4112bfbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16155302

Change-Id: I2162d6de219bc8f584fde217530a27657686df6e
 2021-11-01 19:39:20 +00:00
Treehugger Robot
a2e71597bf Merge "Use static utils from f/l/n instead of the networkstack" am: 1b05dfe00d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873995

Change-Id: Idd1e824054842eff893dfe650fc17147515ddcf1
 2021-11-01 19:33:01 +00:00
TreeHugger Robot
76292931f4 Merge "New Pipeline: Show group count" into sc-v2-dev 2021-11-01 19:31:12 +00:00
Evan Chen
404168a4f0 Make sure sendresult after association was created 
Add a new method to send activity result in
CompanionDeviceDiscoveryService and make sure
CDMService to call it before addAssociation.

Bug: 203418937
Test: Test: CTS Verifier test: Companion Device Service Test, Companion Device
Test and cts test: atest CtsOsTestCases:android.os.cts.CompanionDeviceManagerTest
Change-Id: Ied7d705934418869287a8be6cd44abe3b806db00
Merged-In: Ied7d705934418869287a8be6cd44abe3b806db00
 2021-11-01 19:22:58 +00:00
Jeff DeCew
2657c08a78 Merge changes from topic "b204127880_pipeline_backport_2" into sc-v2-dev 
* changes:
  New Pipeline: Disable legacy dynamic privacy listener
  Fix Coordinators failing to build with gradle build in sysui-studio
  Enforce Coordinator encapsulation w/ Dagger
  Add sensitive content redaction to notif pipeline
 2021-11-01 19:21:51 +00:00
Treehugger Robot
1b05dfe00d Merge "Use static utils from f/l/n instead of the networkstack" 2021-11-01 19:17:40 +00:00
Jeff DeCew
88b09db1e0 Rewrite dumping NSSL hierarchy 
* Adds DumpUtils which make it easier to efficiently build nested dumps
* Adds a function to dump visibility to a string

Fixes: 204583447
Test: perform dump, read output
Change-Id: I1af2cff8a2add555e9190f719150586780b55c18
 2021-11-01 14:14:10 -04:00
TreeHugger Robot
67dab1ccba Merge "Turn on Prox Logging for all debuggable builds." into sc-v2-dev am: 585e55f5c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16095049

Change-Id: Ica29d28fce1a4e1015daedc4e9e38ee40342788b
 2021-11-01 18:09:24 +00:00
TreeHugger Robot
390ae48e28 [automerger skipped] Merge "Ensure that ScanInfo is cached before callbacks fire" into sc-v2-dev am: 328b8f6c87 -s ours 
am skip reason: Merged-In I4670da109256170121ceb6d8fbad0efda310335f with SHA-1 1fe18a79d5 is already in history

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

Change-Id: Id2c62e133bbe6ef88893d8a2d39cbc451305725f
 2021-11-01 18:08:35 +00:00
Steve Elliott
76bdf2faba [RemoteInputView] Reorder fields + clean listener registration APIs 
Bug: 193539698
Test: manual, atest
Change-Id: I5791b406740d8b72d356588d65696addf53cada4
 2021-11-01 13:55:09 -04:00
TreeHugger Robot
585e55f5c0 Merge "Turn on Prox Logging for all debuggable builds." into sc-v2-dev 2021-11-01 17:51:55 +00:00
TreeHugger Robot
328b8f6c87 Merge "Ensure that ScanInfo is cached before callbacks fire" into sc-v2-dev 2021-11-01 17:48:24 +00:00
Nick Chameyev
d1d534031d Do not use shared lib resources 
Temporary removes usages of SysUI shared
resources as it leads to crashes in Launcher
tests.

Bug: 204727471
Test: install launcher, try autorotate suggestion
Change-Id: I82dae0b2f5a9d2cb83f8a60e3c08353dc1bb60b6
 2021-11-01 17:04:52 +00:00
Jeff DeCew
6ef026a249 Merge "Make gradle build use debuggable FeatureFlagManager" into sc-v2-dev am: d2984e95cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16150895

Change-Id: I06eb2601dc83064f0cef69f0e9c2aca123523b9d
 2021-11-01 17:02:36 +00:00
Jeff DeCew
d2984e95cf Merge "Make gradle build use debuggable FeatureFlagManager" into sc-v2-dev 2021-11-01 16:53:31 +00:00
TreeHugger Robot
67cc8293aa Merge "[Ongoing Call Chip] Add 5dp of start margin." into sc-v2-dev am: e87ac876cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16156036

Change-Id: Ic3b238733990b4845ac138b4dc7b0a3162327f5f
 2021-11-01 16:43:00 +00:00
TreeHugger Robot
e87ac876cb Merge "[Ongoing Call Chip] Add 5dp of start margin." into sc-v2-dev 2021-11-01 16:20:20 +00:00
Fabian Kozynski
336ee378c5 Merge "Pass configuration changes to all pages" into sc-v2-dev am: 4cf8359556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16149756

Change-Id: Idf1c4ae6680c93e8355121d0dd0fce3659c36318
 2021-11-01 15:42:39 +00:00
TreeHugger Robot
b4bd99c02d Merge "Moving keyguard indicator text lower in split shade" into sc-v2-dev am: 4b75032d05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16163394

Change-Id: I3c20392a03e7eeceef6a32601a6ac0e2b3795280
 2021-11-01 15:41:48 +00:00
Charles Chen
0f81c600b1 Merge "Add isEmpty info in SplitInfo" into sc-v2-dev am: e88d0b2ebb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16093494

Change-Id: I1ad2fca646fdde01a4dcf00ce99414639b2c849e
 2021-11-01 15:40:55 +00:00
Fabian Kozynski
4cf8359556 Merge "Pass configuration changes to all pages" into sc-v2-dev 2021-11-01 15:36:50 +00:00
TreeHugger Robot
4b75032d05 Merge "Moving keyguard indicator text lower in split shade" into sc-v2-dev 2021-11-01 15:27:43 +00:00