drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
677,009 Commits 1 Branch 0 Tags
Commit Graph

677009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Serokurov
9843ab96af Merge "Hide bubbles when focus mode is enabled" into sc-v2-dev am: 1837681488 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16155724

Change-Id: I873f4e2e45b61daed35a0d5fe73031d26afc229e
 2021-11-02 00:48:35 +00:00
TreeHugger Robot
9dfb8e06d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c99378b0f1 -s ours am: 8439fe32aa -s ours am: a3322b64ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8454f74ca80f456df0e9d1401d285e45378fe3d4
 2021-11-02 00:48:09 +00:00
Automerger Merge Worker
5d65561085 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c99378b0f1 -s ours am: 8439fe32aa -s ours" into sc-qpr1-dev-plus-aosp am: a61316757d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b82f7f8793b074ce8ef0bc75becec8e1b4ed0ea
 2021-11-02 00:47:09 +00:00
Nagendra Prasad Nagarle Basavaraju
4081a98aa6 Merge "Support encoding/decoding IkeSessionParams with IKE_OPTION_INITIAL_CONTACT" am: 839597dea5 am: b816eaa304 am: ed6d6ca424 am: 53661b61bd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1868646

Change-Id: I5af4e772a85d856a0e8fcaa38be32ae781ad4cc7
 2021-11-02 00:46:44 +00:00
TreeHugger Robot
a7f12a15a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c99378b0f1 -s ours am: 4724cd2054 -s ours am: 81b45aacbd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I247b2c59826d88c0d7a7ea32c216ccadc0d796e3
 2021-11-02 00:46:21 +00:00
Sergey Serokurov
1837681488 Merge "Hide bubbles when focus mode is enabled" into sc-v2-dev 2021-11-02 00:31:23 +00:00
Automerger Merge Worker
a61316757d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c99378b0f1 -s ours am: 8439fe32aa -s ours" into sc-qpr1-dev-plus-aosp 2021-11-02 00:30:16 +00:00
TreeHugger Robot
801077a68a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c99378b0f1 -s ours am: 8439fe32aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib801d9403c961023f6b012d7fb55afe286de8295
 2021-11-02 00:29:58 +00:00
Nagendra Prasad Nagarle Basavaraju
53661b61bd Merge "Support encoding/decoding IkeSessionParams with IKE_OPTION_INITIAL_CONTACT" am: 839597dea5 am: b816eaa304 am: ed6d6ca424 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1868646

Change-Id: I7f58c7a096592576789e2cbcb56d940053d6222c
 2021-11-02 00:29:57 +00:00
TreeHugger Robot
a3322b64ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c99378b0f1 -s ours am: 8439fe32aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8898fc8bf83546ac88bbb96132c7feb617731cc8
 2021-11-02 00:29:56 +00:00
Nagendra Prasad Nagarle Basavaraju
ed6d6ca424 Merge "Support encoding/decoding IkeSessionParams with IKE_OPTION_INITIAL_CONTACT" am: 839597dea5 am: b816eaa304 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1868646

Change-Id: Id248ed1b2389b9bdeda7aea9ebff59307366c65a
 2021-11-02 00:29:39 +00:00
TreeHugger Robot
81b45aacbd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c99378b0f1 -s ours am: 4724cd2054 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5060b223498a686bfa843586aa3168e59d3d4afb
 2021-11-02 00:29:34 +00:00
TreeHugger Robot
8439fe32aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c99378b0f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8a2e0991a44df13b61a000075ac07f22fb94e9b
 2021-11-02 00:18:25 +00:00
TreeHugger Robot
4724cd2054 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c99378b0f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If74ad391bdde59767be8daa5e275c0b60a4e0577
 2021-11-02 00:16:14 +00:00
Nagendra Prasad Nagarle Basavaraju
b816eaa304 Merge "Support encoding/decoding IkeSessionParams with IKE_OPTION_INITIAL_CONTACT" am: 839597dea5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1868646

Change-Id: I7d084f653c30257c30e660dda4d5681cd8164a48
 2021-11-02 00:12:14 +00:00
Treehugger Robot
12cfe44641 [automerger skipped] Merge "Supported minimum aggregated bandwidth and roaming for 5G+" am: a0e2ccc173 am: a1eddb7c62 am: ab893f1748 am: 6480dd22aa -s ours 
am skip reason: Merged-In I1f40de5ee559a6d703806e74d305267bde295dcc with SHA-1 5e7b8533ef is already in history

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

Change-Id: I57e0016bd1543e260e0e6a0a6f462e9501520d56
 2021-11-02 00:06:25 +00:00
Treehugger Robot
16af59d49d Merge "Add OWNERS for the health package." am: 9ea37fe982 am: 7d3969057a am: 75c63d3914 am: c73b53cf5e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1876124

Change-Id: I2a76132c29884b60c5132736e60d4ea8c23436cc
 2021-11-02 00:05:00 +00:00
TreeHugger Robot
c99378b0f1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-02 00:01:34 +00:00
Nagendra Prasad Nagarle Basavaraju
839597dea5 Merge "Support encoding/decoding IkeSessionParams with IKE_OPTION_INITIAL_CONTACT" 2021-11-01 23:55:56 +00:00
Treehugger Robot
6480dd22aa Merge "Supported minimum aggregated bandwidth and roaming for 5G+" am: a0e2ccc173 am: a1eddb7c62 am: ab893f1748 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1875736

Change-Id: Iaf06884959bcb99aa15577415975a4cc4bd78869
 2021-11-01 23:48:06 +00:00
Treehugger Robot
c73b53cf5e Merge "Add OWNERS for the health package." am: 9ea37fe982 am: 7d3969057a am: 75c63d3914 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1876124

Change-Id: Iaac683ac2bb13b1c69f5f89e0474c1d797e04920
 2021-11-01 23:47:34 +00:00
Treehugger Robot
ab893f1748 Merge "Supported minimum aggregated bandwidth and roaming for 5G+" am: a0e2ccc173 am: a1eddb7c62 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1875736

Change-Id: I532a75d9be876e9f002df65f74411e9e013cf66e
 2021-11-01 23:30:14 +00:00
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
Treehugger Robot
75c63d3914 Merge "Add OWNERS for the health package." am: 9ea37fe982 am: 7d3969057a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1876124

Change-Id: I1a54a548c1e8bad2f887083772c7e4f6f73d682e
 2021-11-01 23:29:50 +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
Treehugger Robot
a1eddb7c62 Merge "Supported minimum aggregated bandwidth and roaming for 5G+" am: a0e2ccc173 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1875736

Change-Id: I889d1bc41e8b9ec31862a327727a68ccebe511cb
 2021-11-01 23:13:53 +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
7d3969057a Merge "Add OWNERS for the health package." am: 9ea37fe982 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1876124

Change-Id: I3c1d19ba5d1a94725243dc2d4acd206ac44e0f6f
 2021-11-01 23:11:46 +00:00
Treehugger Robot
a0e2ccc173 Merge "Supported minimum aggregated bandwidth and roaming for 5G+" 2021-11-01 23:07:21 +00:00
Treehugger Robot
9ea37fe982 Merge "Add OWNERS for the health package." 2021-11-01 22:54:08 +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
Jeff DeCew
f744d23a2e New Pipeline: Remote Input 3/4: Extract notification rebuilder methods to a utility 
Fixes: 204127880
Bug: 203938360
Test: atest RemoteInputNotificationRebuilderTest
Merged-In: I80ace34e5e97e5ccc6135276b83102f5696dd23b
Change-Id: I80ace34e5e97e5ccc6135276b83102f5696dd23b
 2021-11-01 16:09:50 -04:00
Jeff DeCew
fac5da2f77 New Pipeline: Remote Input 2/4: Add ability to internally update notifications 
Fixes: 204127880
Bug: 203938360
Test: atest NotifCollectionTest
Merged-In: Ie15f7565b76e7314221d18e540d2ed8a5ce3e4a4
Change-Id: Ie15f7565b76e7314221d18e540d2ed8a5ce3e4a4
 2021-11-01 16:09:50 -04:00
Jeff DeCew
34c62de578 New Pipeline: Remote Input 4/4: Add RemoteInputCoordinator 
Fixes: 204127880
Bug: 203938360
Test: atest SelfTrackingLifetimeExtenderTest RemoteInputCoordinatorTest NotificationRemoteInputManagerTest
Merged-In: I342a09ef71a223b24db075e5f2ef68a6950ff32b
Change-Id: I342a09ef71a223b24db075e5f2ef68a6950ff32b
 2021-11-01 16:09:50 -04:00
Jeff DeCew
d4e9cfb087 New Pipeline: Remote Input 1/4: Extract legacy pipeline logic within NotificationRemoteInputManager 
Fixes: 204127880
Bug: 203938360
Test: atest NotificationRemoteInputManagerTest SmartReplyControllerTest
Merged-In: I5424d3525601fda2b217c3d13130769106d4f50d
Change-Id: I5424d3525601fda2b217c3d13130769106d4f50d
 2021-11-01 16:09:49 -04:00
Jeff DeCew
69c191b618 Make SmartReplyController a Dumpable 
Bug: 204127880
Test: dump and inspect
Merged-In: Id3e58ae6559ef1762496f46ff86ccd99886c8aaf
Change-Id: Id3e58ae6559ef1762496f46ff86ccd99886c8aaf
 2021-11-01 16:09:49 -04:00