Commit Graph

631947 Commits

Author SHA1 Message Date
Sergey Volnov
f4df342133 Merge "Enhance AlwaysOnHotwordDetector.EventPayload with more fields." into sc-dev 2021-03-24 23:28:11 +00:00
Benedict Wong
d240e2be34 Merge "Trigger re-evaluation of privileged apps upon app install/uninstall" am: 01a61615d8 am: 4ac91d35ca am: ff9814bf7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649653

Change-Id: Ie9b3a50396f2e36fd15e34f0ef0071f9b30f9431
2021-03-24 23:14:43 +00:00
Nikita Dubrovsky
f5386796a8 Merge "Fix debug logcat message in AugmentedAutofillService" into sc-dev 2021-03-24 22:36:20 +00:00
Benedict Wong
ff9814bf7d Merge "Trigger re-evaluation of privileged apps upon app install/uninstall" am: 01a61615d8 am: 4ac91d35ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649653

Change-Id: Iea48b29a4f88a50345d147239fc0927d852812ac
2021-03-24 22:33:56 +00:00
Hui Wang
cfae37d992 [automerger skipped] Merge "Integrate RCS provisioning updates into SipTransport" am: 11149deba4 am: 2d9c051d65 am: 85badc52ca -s ours
am skip reason: skip tag Change-Id Ifabbe6a4c4cccef85c5c1b43fcb7876bad33e226 with SHA-1 840afdd0bd is already in history

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

Change-Id: I3458ec299fca2b7aaac80af05d41c740fdc846cf
2021-03-24 22:19:11 +00:00
Benedict Wong
4ac91d35ca Merge "Trigger re-evaluation of privileged apps upon app install/uninstall" am: 01a61615d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649653

Change-Id: Ie851b2e0ba790562515f719e1475c88b7eeb312b
2021-03-24 22:11:14 +00:00
Hui Wang
85badc52ca Merge "Integrate RCS provisioning updates into SipTransport" am: 11149deba4 am: 2d9c051d65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651543

Change-Id: Ia905a6c97f963def63902e8ff600332bae335478
2021-03-24 21:55:02 +00:00
Sean Stout
00dcff88e8 Merge "Enable per-DisplayGroup timeouts" into sc-dev 2021-03-24 21:46:38 +00:00
SongFerng Wang
a070a64f80 Merge "[Telephony] Remove the permission from TelephonyDisplayInfo" into sc-dev 2021-03-24 21:44:09 +00:00
Jayant Chowdhary
fc314c712b Merge "camera2: Add support for quad bayer sensors." into sc-dev 2021-03-24 21:37:01 +00:00
Hui Wang
2d9c051d65 Merge "Integrate RCS provisioning updates into SipTransport" am: 11149deba4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651543

Change-Id: I4388800ef10022c3ae1aa849e9964c9f5086ee81
2021-03-24 21:34:57 +00:00
TreeHugger Robot
6951fcff48 Merge "Ensure updateActiveUser is called before generateChallenge" into sc-dev 2021-03-24 21:33:56 +00:00
TreeHugger Robot
ddd5bd8318 Merge "Disallow domain user selector from querying autoVerify domains" into sc-dev 2021-03-24 21:15:41 +00:00
Benedict Wong
01a61615d8 Merge "Trigger re-evaluation of privileged apps upon app install/uninstall" 2021-03-24 21:09:19 +00:00
Hui Wang
11149deba4 Merge "Integrate RCS provisioning updates into SipTransport" 2021-03-24 21:05:46 +00:00
Sooraj Sasindran
a390714daf Merge "Add more documentation to PROPERTY_CROSS_SIM" into sc-dev 2021-03-24 21:02:56 +00:00
Zoey Chen
f163bf9c6a [Telephony] Remove the permission from TelephonyDisplayInfo
Bug: 183164979
Test: make
Change-Id: I5b1b4fea5feef3ba53603f24d88246d40322e2ff
2021-03-24 14:00:21 -07:00
Eugene Susla
14c9afbe6f Merge "Extend permission pregrant tracing utility" into sc-dev 2021-03-24 20:58:07 +00:00
Eugene Susla
4af392fe39 Merge "Provide CDM API to associate without prompt" into sc-dev 2021-03-24 20:56:54 +00:00
Alex Johnston
8d95267eea Merge "Update QS network logging string" into sc-dev 2021-03-24 20:54:13 +00:00
Michael Wachenschwanz
522bb3d9cc Merge "Accumulate Mobile Radio and Gnss measured energy in BatteryStats" into sc-dev 2021-03-24 20:46:34 +00:00
Wonsik Kim
f97b6e5a47 Merge "MediaCodec: add methods to query/subscribe vendor parameters" into sc-dev 2021-03-24 20:40:47 +00:00
Janis Danisevskis
048f9ac0b4 Merge "Keystore 2.0: Disable BackendBusyException." am: 11c25156a2 am: 5c1c388b7e am: 5f23e40e43
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651535

Change-Id: If8e9025292ae3bcde4b1b8fe14f6bd93bd4e1dbc
2021-03-24 20:40:05 +00:00
Mark Renouf
9f554d2b15 Merge "Mark ViewGroupScrollCaptureTest as non-flaky" into sc-dev 2021-03-24 20:12:09 +00:00
TreeHugger Robot
a411746184 Merge "Preload font files based on device locale" into sc-dev 2021-03-24 19:52:50 +00:00
Janis Danisevskis
5f23e40e43 Merge "Keystore 2.0: Disable BackendBusyException." am: 11c25156a2 am: 5c1c388b7e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651535

Change-Id: Ic55e5ed4d434405958895616efbe8c1c60dbf3c8
2021-03-24 19:52:00 +00:00
Beverly Tai
3fc72b1c31 Merge "Introduce new colorful wallpaperTextColor" into sc-dev 2021-03-24 19:35:00 +00:00
Alison Cichowlas
eefa2ab02a Merge "Strings for mini-resolver UI. Not yet used - getting them in for string freeze." into sc-dev 2021-03-24 19:26:08 +00:00
Junyu Lai
4a8feb1558 Merge changes I6f5e22e3,I6c486303 into sc-dev
* changes:
  [SP31] Expose onSetWarningAndLimit System API
  [SP29] Send interface warning bytes to NetworkStatsProvider
2021-03-24 19:25:53 +00:00
Matt Casey
91e8c8694a Merge "Change scroll capture lable to "Capture more"" into sc-dev 2021-03-24 19:18:35 +00:00
Winson Chiu
635d5c7cf5 Merge "Skip domain verify broadcast if ActivityManager isn't ready" into sc-dev 2021-03-24 19:15:15 +00:00
Janis Danisevskis
5c1c388b7e Merge "Keystore 2.0: Disable BackendBusyException." am: 11c25156a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651535

Change-Id: I767994b96f563c5f32c295a88b0816a299f40343
2021-03-24 19:14:34 +00:00
Rob Carr
f803a76fc9 Merge "SurfaceView: Restore transaction application in useBLAST=false" into sc-dev 2021-03-24 19:04:34 +00:00
Janis Danisevskis
11c25156a2 Merge "Keystore 2.0: Disable BackendBusyException." 2021-03-24 19:02:46 +00:00
Janis Danisevskis
e8884d1aff Merge "Keystore 2.0: Add onDeviceOffBody to AndroidKeyStoreMaintenance." am: e36f515441 am: bbc3e7552a am: 79a4f2b785
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651545

Change-Id: Ie8034c409dfb4bb25eeca697723849309addbe8d
2021-03-24 19:00:49 +00:00
TreeHugger Robot
c374ad5d3c Merge "Add CollapsingToolbarBaseFragment for implementing collapsing toolbar." into sc-dev 2021-03-24 19:00:17 +00:00
Yi Kong
87aefc7890 Merge "profcollect: Broadcast intent when a profile report is ready to upload" am: 096f175b7f am: 5411289db2 am: 598eae0da4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649299

Change-Id: Ief5ce6b055a0dbb42d106c85851fbc3ad9529f70
2021-03-24 18:59:59 +00:00
Jayachandran Chinnakkannu
89ff2a8ab6 Merge "Add 5G/NR QOS support" am: bd3a33ed9f am: 3e7751c427 am: 80f11bb5bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643762

Change-Id: I74c0d7d771d0b7e067dddc582389f77b8a899542
2021-03-24 18:58:50 +00:00
Treehugger Robot
7bbbb4f6b8 [automerger skipped] Merge "DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters" am: 59035dd21c am: de806ecda0 am: 21cf15bf5c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifa8d0321069dc04983d7cf8ab60d7ff9c7be3e73
2021-03-24 18:58:14 +00:00
Wonsik Kim
02f536d6a6 [automerger skipped] DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters am: 197e1a7f5e am: 309d58c0cb am: 50ce5087fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f0bea2ccaeb690b1aec8ef01716d994af6bbe19
2021-03-24 18:58:02 +00:00
Treehugger Robot
5e18c2101e [automerger skipped] Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: 8c03c2a82e am: 13b4d67d40 am: 90e1746fe1 -s ours
am skip reason: skip tag Change-Id I4c544415e12adf442fd2415c371b1b70a39c3aa4 with SHA-1 2e20a1a29e is already in history

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

Change-Id: If0f92d490fc903ba2037766a69365eb44af8027e
2021-03-24 18:57:34 +00:00
Hui Yu
abba59c47a [automerger skipped] Merge "Allow FGS started from MediaButtonReceiver to have while-in-use permissions." into rvc-qpr-dev am: 4221ca489c am: 51def1dc06 -s ours
am skip reason: skip tag Change-Id I32a14d675550cd262976bb8e16a48a070387d318 with SHA-1 cc8af26b01 is already in history

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

Change-Id: I18aafb34dbf9ff04c89b343f69af8456e6e382e7
2021-03-24 18:57:12 +00:00
Janis Danisevskis
79a4f2b785 Merge "Keystore 2.0: Add onDeviceOffBody to AndroidKeyStoreMaintenance." am: e36f515441 am: bbc3e7552a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651545

Change-Id: I00948f85fec91708609344c9d55f839edca457e7
2021-03-24 18:55:41 +00:00
Yi Kong
598eae0da4 Merge "profcollect: Broadcast intent when a profile report is ready to upload" am: 096f175b7f am: 5411289db2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649299

Change-Id: I0a79e53438f505c01b3eb9449ca94db6df933ff6
2021-03-24 18:55:19 +00:00
Jayachandran Chinnakkannu
80f11bb5bb Merge "Add 5G/NR QOS support" am: bd3a33ed9f am: 3e7751c427
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643762

Change-Id: If32e710cfea988dbaa438ffee547707aa06e6545
2021-03-24 18:54:17 +00:00
Treehugger Robot
21cf15bf5c Merge "DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters" am: 59035dd21c am: de806ecda0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646730

Change-Id: Idc486dfbfba3d04d27fb80acd8f31a897e59b01c
2021-03-24 18:53:56 +00:00
Wonsik Kim
50ce5087fd DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters am: 197e1a7f5e am: 309d58c0cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646730

Change-Id: Iaec49578abb040e62ab8e9718e2cbb5941888ebc
2021-03-24 18:53:54 +00:00
Treehugger Robot
90e1746fe1 Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: 8c03c2a82e am: 13b4d67d40
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651532

Change-Id: I99fe564e3fd7e6e92416a3d76054e62969cdd48f
2021-03-24 18:53:30 +00:00
Ahaan Ugale
63db0b7460 Merge "Add AutofillService#onSavedDatasetsInfoRequest." into sc-dev 2021-03-24 18:42:50 +00:00
Janis Danisevskis
bbc3e7552a Merge "Keystore 2.0: Add onDeviceOffBody to AndroidKeyStoreMaintenance." am: e36f515441
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651545

Change-Id: I8f32ec1e083dc17d51911d6a493c7a74a32e8cea
2021-03-24 18:39:28 +00:00