Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
753,006 Commits 3 Branches 0 Tags
d2185bf42cfc567ccdda9b7bb3cc640afbfbd7b2
Commit Graph

753006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ytai Ben-Tsvi
d2185bf42c Check for null callback 
The modelData callback may be nullified before actually being invoked,
e.g. when calling startRecognition() on an already running model, with
a different callback.

Fixes: 225768984
Test: Manual reproduction on the issue and then applying the fix and
      verifying that it works.
Change-Id: I089061123c8cf12eef19fdf16bb3a2c106ea2438
 2022-03-21 15:10:04 -07:00
Taran Singh
4cff41a3f2 Merge "Finish handwriting session for recents gesture" into tm-dev 2022-03-21 20:54:31 +00:00
Alex Buynytskyy
3edaff19fc Merge "Mark all installations using PMSC as "ADB"." into tm-dev 2022-03-21 20:46:49 +00:00
Yohei Yukawa
63e7675117 Merge "Offload IMMS#mImeDrawsImeNavBarRes initialization" into tm-dev 2022-03-21 20:46:12 +00:00
James O'Leary
79e56b5dfb Merge "Update styles to match latest specs" into tm-dev 2022-03-21 20:34:01 +00:00
Haoyu Zhang
b3c1d1984e Merge "Scribe in View: disable cursor drag when handwriting is enabled" into tm-dev 2022-03-21 20:11:46 +00:00
Long Ling
6cd9dd1956 Merge "display: move hbm stats report to handler thread" into tm-dev 2022-03-21 20:09:54 +00:00
Tom Natan
f3811f7f22 Merge "Fix letterbox flickering rounded corners." into tm-dev 2022-03-21 20:03:37 +00:00
Antoan Angelov
e235e7f579 Merge "Check the managed profile for PO" into tm-dev 2022-03-21 20:02:54 +00:00
Automerger Merge Worker
0581af174c Merge changes from topic "am-53a9f1d72dd747f68e6524ac203eb8cd" into tm-dev 
* changes:
  [automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-dev am: 13de1bee05 -s ours am: 2fc134a763 -s ours am: 3f0d2e8c2b -s ours am: 8b8b360a36 -s ours
  [automerger skipped] Add an OEM configurable limit for zen rules am: 75bd0edd7b -s ours am: 87a7cd48df -s ours am: bdddc65519 -s ours am: fa4e0e36a4 -s ours
 2022-03-21 20:01:56 +00:00
Julia Reynolds
3d710fc7f6 [automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-dev am: 13de1bee05 -s ours am: 2fc134a763 -s ours am: 3f0d2e8c2b -s ours am: 8b8b360a36 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 0531027915 is already in history

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

Change-Id: I3cbbdf08fa3773a80f2f10ee4c19aaa60552d53f
 2022-03-21 20:01:26 +00:00
Matt Casey
a127b9c0d3 Merge "Remove "Copied" toast from sharesheet." into tm-dev 2022-03-21 20:01:06 +00:00
Julia Reynolds
ee47b259c7 [automerger skipped] Add an OEM configurable limit for zen rules am: 75bd0edd7b -s ours am: 87a7cd48df -s ours am: bdddc65519 -s ours am: fa4e0e36a4 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 0531027915 is already in history

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

Change-Id: I556da84122a7525baa89b0c3f309473b2cae0d1e
 2022-03-21 20:00:56 +00:00
Greg Kaiser
45e7a34c89 Merge "Revert "Replace VRI and SV sync logic with SurfaceSyncer"" into tm-dev 2022-03-21 20:00:42 +00:00
arangelov
a107680e22 Check the managed profile for PO 
Fixes: 225938013
Test: manual
Test: CTS test to be added in a follow-up CL
Change-Id: Ic43bf774d89f89947f7377bae47b6dfbd1e62ea1
 2022-03-21 19:44:23 +00:00
Aaron Liu
5423eb462b Merge "Bouncer: Remove flicker of KeyguardMessageArea" into tm-dev 2022-03-21 19:42:28 +00:00
Ling Ma
4cfefc343e Merge "Revert^2 "Enable new data stack by default"" into tm-dev 2022-03-21 19:41:08 +00:00
Julia Reynolds
8b8b360a36 [automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-dev am: 13de1bee05 -s ours am: 2fc134a763 -s ours am: 3f0d2e8c2b -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 0531027915 is already in history

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

Change-Id: Ib2d02e7d2f5f882eee90d956e6ce66d8cec2644a
 2022-03-21 19:34:37 +00:00
Julia Reynolds
fa4e0e36a4 [automerger skipped] Add an OEM configurable limit for zen rules am: 75bd0edd7b -s ours am: 87a7cd48df -s ours am: bdddc65519 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 0531027915 is already in history

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

Change-Id: I867f582c4586916517d83165d8bbf02cf0973b17
 2022-03-21 19:34:11 +00:00
Dave McCloskey
c5a7ed29de Merge "Changes to support reducing noise in active unlock notifications." into tm-dev 2022-03-21 19:15:01 +00:00
Leon Scroggins
bdf11a99be Merge "ScreenDecorHwcLayer: better debugging for the transparent region" into tm-dev 2022-03-21 18:59:12 +00:00
Julia Reynolds
fe6bf4186a [automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-dev am: 13de1bee05 -s ours am: 0ee5e26aaf -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 413f74422c is already in history

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

Change-Id: Ib2c4272372f7d4a7b9a87e03d7cb472d3b4e4e1c
 2022-03-21 18:29:56 +00:00
Julia Reynolds
3f0d2e8c2b [automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-dev am: 13de1bee05 -s ours am: 2fc134a763 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 0531027915 is already in history

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

Change-Id: Ia86b477cf441ffc22596343a9718781396370d84
 2022-03-21 18:29:53 +00:00
Julia Reynolds
bdddc65519 [automerger skipped] Add an OEM configurable limit for zen rules am: 75bd0edd7b -s ours am: 87a7cd48df -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 0531027915 is already in history

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

Change-Id: I53040b16f909887fed1b2332039224b007d7b40e
 2022-03-21 18:29:45 +00:00
Julia Reynolds
e6cad3282d [automerger skipped] Add an OEM configurable limit for zen rules am: 75bd0edd7b -s ours am: 70aa4da80a -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 413f74422c is already in history

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

Change-Id: I4581c26d128884f19f4a4978e33de466b42e8bb3
 2022-03-21 18:29:39 +00:00
Yi-an Chen
75e09d14c9 Merge "Add PbA branding API" into tm-dev 2022-03-21 18:15:31 +00:00
Julia Reynolds
2fc134a763 [automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-dev am: 13de1bee05 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 0531027915 is already in history

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

Change-Id: I48e962525d7e0a6f32d0a88d3134c1aa30aca619
 2022-03-21 18:02:51 +00:00
Julia Reynolds
87a7cd48df [automerger skipped] Add an OEM configurable limit for zen rules am: 75bd0edd7b -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 0531027915 is already in history

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

Change-Id: Icc93aefbb8934f675ebe57c875898e39eca5004e
 2022-03-21 18:02:49 +00:00
Jayachandran C
605e24d707 [automerger skipped] Merge "Added carrier_id support to the carrier_key table in CarrierInformation DB" am: c2e89bd300 am: d79eecc8ae am: 8585f211f0 -s ours 
am skip reason: Merged-In Ib51d6eb5231ceb65fffa8e83706c47ce17afd640 with SHA-1 7792574ad0 is already in history

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

Change-Id: I4aa0b9d12d21e9de61437c3941a707f3f038d89a
 2022-03-21 18:02:42 +00:00
Julia Reynolds
0ee5e26aaf [automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-dev am: 13de1bee05 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 413f74422c is already in history

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

Change-Id: Ibcb3d72b6a2d5ea8eedb7195440cc5cd84350eec
 2022-03-21 18:02:05 +00:00
Julia Reynolds
70aa4da80a [automerger skipped] Add an OEM configurable limit for zen rules am: 75bd0edd7b -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 413f74422c is already in history

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

Change-Id: I8f9f650d608f30feb832315de5ef9ef4775ddf92
 2022-03-21 18:01:55 +00:00
Evan Laird
77e0b15d43 [automerger skipped] Merge "SystemUI: res array for statusbar blocked icons" am: 1c631a92ab am: b3b8b9165d -s ours am: d377712537 -s ours 
am skip reason: Merged-In I9a04a67a9c0914989d34c8c53ceee97788e7ba6c with SHA-1 d62853c979 is already in history

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

Change-Id: I1fa8d57d99c3f24794d57ca20e457fe90e525e51
 2022-03-21 18:01:46 +00:00
Jayachandran C
8585f211f0 Merge "Added carrier_id support to the carrier_key table in CarrierInformation DB" am: c2e89bd300 am: d79eecc8ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033051

Change-Id: Ia714ed59de5d7c4ce38860f7e8f2fdd5e5513761
 2022-03-21 17:48:04 +00:00
Evan Laird
d377712537 [automerger skipped] Merge "SystemUI: res array for statusbar blocked icons" am: 1c631a92ab am: b3b8b9165d -s ours 
am skip reason: Merged-In I9a04a67a9c0914989d34c8c53ceee97788e7ba6c with SHA-1 d62853c979 is already in history

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

Change-Id: Id4f3d764f5365dda89db8bed6ac051d0fd45acff
 2022-03-21 17:46:56 +00:00
TreeHugger Robot
43d732feb3 Merge "Update fields for SecurityLog WiFi events." into tm-dev 2022-03-21 17:45:57 +00:00
TreeHugger Robot
f0a312d294 Merge "Register KeyguardNotifVisProvider CoreStartable" into tm-dev 2022-03-21 17:42:59 +00:00
Julia Reynolds
13de1bee05 Merge "Add an OEM configurable limit for zen rules" into sc-dev 2022-03-21 17:41:36 +00:00
Pinyao Ting
79c23b7c16 Merge "Gracefully handle system error from AppSearch" into tm-dev 2022-03-21 17:32:32 +00:00
Jayachandran C
d79eecc8ae Merge "Added carrier_id support to the carrier_key table in CarrierInformation DB" am: c2e89bd300 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033051

Change-Id: I54498fc57844f3536366fb3639bdc04d8b74bff0
 2022-03-21 17:25:44 +00:00
Evan Laird
b3b8b9165d Merge "SystemUI: res array for statusbar blocked icons" am: 1c631a92ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882062

Change-Id: Ia4ea8d18c107c5dbde4d769bc61b35567be639b1
 2022-03-21 17:23:12 +00:00
TreeHugger Robot
8ecedcea5a [automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-qpr1-dev am: 2233167c68 -s ours am: 08cb28d231 -s ours am: 37a200b5e2 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 c697475781 is already in history

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

Change-Id: I11ca92991df07a56f54de73f5298b0e6b5a4ba50
 2022-03-21 17:22:12 +00:00
Julia Reynolds
546316cea8 [automerger skipped] Add an OEM configurable limit for zen rules am: 0531027915 -s ours am: 97628051a2 -s ours am: 2681f78ca5 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 c697475781 is already in history

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

Change-Id: Ica5452a4985e56fa10556603d7771423caa6b527
 2022-03-21 17:21:59 +00:00
TreeHugger Robot
061283ce5e [automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-v2-dev am: 651401d243 am: bf6f0aa027 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 413f74422c is already in history

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

Change-Id: I9fa37a4525d33d3c439e8f6e76ac88ea41c1ee3c
 2022-03-21 17:21:08 +00:00
TreeHugger Robot
37a200b5e2 [automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-qpr1-dev am: 2233167c68 -s ours am: 08cb28d231 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 c697475781 is already in history

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

Change-Id: I8e0dc4eab9cc8283ed75b9b21c57a279546c38a2
 2022-03-21 17:20:34 +00:00
Julia Reynolds
2681f78ca5 [automerger skipped] Add an OEM configurable limit for zen rules am: 0531027915 -s ours am: 97628051a2 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 c697475781 is already in history

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

Change-Id: I45b68fcef51ef4a6783a3c658e07edbabbc8802d
 2022-03-21 17:20:11 +00:00
Jayachandran C
c2e89bd300 Merge "Added carrier_id support to the carrier_key table in CarrierInformation DB" 2022-03-21 17:05:19 +00:00
TreeHugger Robot
08cb28d231 [automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-qpr1-dev am: 2233167c68 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 c697475781 is already in history

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

Change-Id: I23ae23510b68590baf72573998e1bdef153a0e7a
 2022-03-21 17:04:36 +00:00
Julia Reynolds
97628051a2 [automerger skipped] Add an OEM configurable limit for zen rules am: 0531027915 -s ours 
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 c697475781 is already in history

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

Change-Id: I1c62072b68b165b19acf32ea34931040e4c75cf3
 2022-03-21 17:04:34 +00:00
Jay Aliomer
973fc119c5 Merge "Fix faint ripple" into tm-dev 2022-03-21 17:03:41 +00:00
TreeHugger Robot
bf6f0aa027 Merge "Add an OEM configurable limit for zen rules" into sc-v2-dev am: 651401d243 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046148

Change-Id: I23f696c03295021aca9de11f4c1256b393e43a0c
 2022-03-21 17:02:32 +00:00