Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
757,048 Commits 3 Branches 0 Tags
499455169cf88ca71a007e215201901bc7475cd4
Commit Graph

757048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ameer Armaly
499455169c Merge changes from topic "presubmit-am-5b208f5d997e40cd88391981653ea568" into tm-mainline-prod 
* changes:
  [automerge] Service Gesture Detection: copy motion events when sending to the service. 2p: 2a7ab6e857
  Service Gesture Detection: copy motion events when sending to the service.
 2022-03-28 20:21:46 +00:00
TreeHugger Robot
825609d299 Merge changes from topic "presubmit-am-6fdfbe39c42b4f2494a48e8d3918acc0" into tm-mainline-prod 
* changes:
  [automerge] Changes to reduce flakiness of TrustTests 2p: c7dd3cabf3
  Changes to reduce flakiness of TrustTests
 2022-03-28 20:13:04 +00:00
Andy Hung
183ad1f715 Merge "SoundPool: Clean up JNI weak reference handling" into tm-dev am: 6a1b6bc9da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17260888

Change-Id: I113feb94de2085399e508f90883446e5d4179cde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:47:32 +00:00
Yuri Lin
e5d457f9af Merge "Write ZenPolicy conversation settings out to XML" into tm-dev am: 1a9c4a2a3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17355880

Change-Id: If848fadb474148ad82fda2a1f47bd18e32685edb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:47:10 +00:00
Prabir Pradhan
e871ce1410 Merge "Ensure handwriting session can only be started from inside app bounds" into tm-dev am: a4f617f451 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071330

Change-Id: Id5821cce58edce608a9eb8d38d8001c2196d4b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:46:45 +00:00
Andy Hung
6a1b6bc9da Merge "SoundPool: Clean up JNI weak reference handling" into tm-dev 2022-03-28 19:43:21 +00:00
Yuri Lin
1a9c4a2a3d Merge "Write ZenPolicy conversation settings out to XML" into tm-dev 2022-03-28 19:41:22 +00:00
Prabir Pradhan
a4f617f451 Merge "Ensure handwriting session can only be started from inside app bounds" into tm-dev 2022-03-28 19:24:20 +00:00
TreeHugger Robot
b8d744f47e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2ec1d951f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33f75455a5f5ec16fbae53e87593f70bdc0a3a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:10:05 +00:00
Vadim Caen
cca4bab205 Merge changes from topic "presubmit-am-b87ddd3bbf2947f1aa639cddcee6ecb8" into tm-dev am: 09f7f6f69b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17319805

Change-Id: I4dc7b1e71c736a37eb200f12eb0ff3ef1c5349bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:08:50 +00:00
Andy Hung
043307a28f Merge "SoundPool: Clean up JNI AudioAttribute handling" into tm-dev am: fdf11ed6f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17260690

Change-Id: Ic370313182a8c4ab9e021f1817d25997d2f914e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:08:13 +00:00
Vinit Nayak
454e6b1131 Merge "Fix issue with wrong mode when adding appeared task" into tm-dev am: d9a4f1cdb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17395339

Change-Id: Icf80401057fe0233a5d65ff3bb2fc68b7a81de42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:07:57 +00:00
TreeHugger Robot
2ec1d951f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-28 18:56:57 +00:00
TreeHugger Robot
f95cc09973 Merge changes from topic "presubmit-am-f9781add2dec454ebf3ee9188c9c8bf7" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4b67e7e511
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-28 18:56:57 +00:00
Vadim Caen
09f7f6f69b Merge changes from topic "presubmit-am-b87ddd3bbf2947f1aa639cddcee6ecb8" into tm-dev 
* changes:
  Remove callback before WindowState removal
  Improve startBackNavigation stability
 2022-03-28 18:53:26 +00:00
Vadim Caen
9f79320326 Merge changes from topic "presubmit-am-b87ddd3bbf2947f1aa639cddcee6ecb8" into tm-mainline-prod 
* changes:
  [automerge] Improve startBackNavigation stability 2p: 6a074eca5c
  Improve startBackNavigation stability
 2022-03-28 18:53:26 +00:00
Andy Hung
fdf11ed6f1 Merge "SoundPool: Clean up JNI AudioAttribute handling" into tm-dev 2022-03-28 18:51:22 +00:00
Vinit Nayak
d9a4f1cdb4 Merge "Fix issue with wrong mode when adding appeared task" into tm-dev 2022-03-28 18:42:59 +00:00
TreeHugger Robot
52c640ba3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b239ef345 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb3d7cff7a0d38aa5c771fc451a7ead767443660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 18:38:11 +00:00
Ganesh Olekar
20a08bdca6 Merge "Add broadcast receiver to listen for safety center flag changes" into tm-dev am: 3795120659 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17354941

Change-Id: I82166302d98bc261e129a1e30db87874c0d00335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 18:37:08 +00:00
TreeHugger Robot
24117d22a6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 93b65eaaac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f35c9388e2e16c7cae13d98ff3d86f30c84d106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 18:36:48 +00:00
Matt Pietal
fe824ad173 Merge "Consolidate occlusion events into KeyguardStateController" into tm-dev am: 68d2fdfde6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17391821

Change-Id: I35c9467cadd2a37dea07df78e5c8d1dce259984d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 18:36:36 +00:00
Andy Hung
c579970d2b Merge "SoundPool: Fix WeakRef lifetime" into tm-dev am: 62e9478875 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17225466

Change-Id: I9e9cd27f634e474104505681946ba3ea2cbbc7a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 18:35:57 +00:00
TreeHugger Robot
1b239ef345 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-28 18:32:56 +00:00
TreeHugger Robot
962095104e Merge changes from topic "presubmit-am-bfd35cff07c94970be738a923af0d67e" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8471122b85
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-28 18:32:56 +00:00
Ganesh Olekar
3795120659 Merge "Add broadcast receiver to listen for safety center flag changes" into tm-dev 2022-03-28 18:32:53 +00:00
TreeHugger Robot
93b65eaaac Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-28 18:32:11 +00:00
TreeHugger Robot
e76e4927ce Merge changes from topic "presubmit-am-f32a9ce9fda74f40a85b95c58d8bec40" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93244c939b
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-28 18:32:11 +00:00
Matt Pietal
68d2fdfde6 Merge "Consolidate occlusion events into KeyguardStateController" into tm-dev 2022-03-28 18:26:57 +00:00
Andy Hung
62e9478875 Merge "SoundPool: Fix WeakRef lifetime" into tm-dev 2022-03-28 18:25:29 +00:00
TreeHugger Robot
acd0d004fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c1741343c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a93ac8030d8eca1e9d7e40fe80d826bd30a0641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 18:22:26 +00:00
Bill Yi
80571e500b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 972c66dfbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0239d7e1882e3abb804c5ab59d303dd0cdbde8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 18:22:24 +00:00
TreeHugger Robot
fb5f393763 Merge "Fix concurrency limits." into tm-dev am: 89d773811e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17412405

Change-Id: I25315dfa989dc10cb1603464a71b56f19f3d538b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 18:22:00 +00:00
TreeHugger Robot
c1741343c2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-28 18:18:14 +00:00
TreeHugger Robot
a03b615404 Merge changes from topic "presubmit-am-b43ffe134bbc4d438135447b82cfeb07" into tm-mainline-prod 
* changes:
  [automerge] Fix concurrency limits. 2p: d05ed8c52c
  Fix concurrency limits.
 2022-03-28 18:17:26 +00:00
TreeHugger Robot
89d773811e Merge "Fix concurrency limits." into tm-dev 2022-03-28 18:17:26 +00:00
Andy Hung
2450182e8e Merge "SoundPool: Fix lifetime of SoundPool native object" into tm-dev am: fb19b74f92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17226626

Change-Id: I7549961afe15245b17f3d385b11f9ce18f5ca5db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 18:08:25 +00:00
Andy Hung
fb19b74f92 Merge "SoundPool: Fix lifetime of SoundPool native object" into tm-dev 2022-03-28 18:03:52 +00:00
Andy Hung
e2a3fcbdcf Merge changes from topic "presubmit-am-2c552ed4082b47299cc082dea673dc45" into tm-mainline-prod 
* changes:
  [automerge] SoundPool: Fix lifetime of SoundPool native object 2p: 48c0795054
  SoundPool: Fix lifetime of SoundPool native object
 2022-03-28 18:03:52 +00:00
TreeHugger Robot
83c2d58c33 Merge "Move passing postsubmit tests to presubmit" into tm-dev am: 83e668b241 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17449404

Change-Id: Id25e6f81ab63a87333c4891e5a8bb251f3ceff4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 18:00:56 +00:00
TreeHugger Robot
83e668b241 Merge "Move passing postsubmit tests to presubmit" into tm-dev 2022-03-28 17:57:59 +00:00
Nikita Ioffe
0c510e67a6 Merge "Don't allow sdk sandbox processes to register/unregister CPs" into tm-dev am: 4baae1f703 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17346984

Change-Id: I0701728ecdc4e5d83de62115e628e48e4caa750f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 17:52:59 +00:00
Gavin Corkery
1ad6ffcaa3 Merge "Enforce that sdk sandbox may only bind/start allowed services" into tm-dev am: 8f7bd454d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17239544

Change-Id: I9f96f8f400118c9acc8e8ff273bc98b4d82fddbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 17:52:39 +00:00
Nikita Ioffe
4baae1f703 Merge "Don't allow sdk sandbox processes to register/unregister CPs" into tm-dev 2022-03-28 17:41:13 +00:00
Gavin Corkery
8f7bd454d6 Merge "Enforce that sdk sandbox may only bind/start allowed services" into tm-dev 2022-03-28 17:37:48 +00:00
Gavin Corkery
d5dca74908 [automerge] Enforce that sdk sandbox may only bind/start allowed services 2p: 65a00767b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17239544

Bug: 209770510
Change-Id: I408fcc4f540df5344252c5465c6249294695a40b
 2022-03-28 17:19:36 +00:00
Bill Yi
6b817ab7b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 92ad3ae513 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0f7a05a57def06da6f88a0b9d3a31fff69d0a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 17:10:54 +00:00
Bill Yi
bd198f49ad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7380833cf3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05e1b0a18d64fa0e93d4528ba1aded04fcde64fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 17:10:51 +00:00
Aaron Liu
3ca545268d Merge "Home Controls: Add settings dialog" into tm-dev am: aa69987467 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17332611

Change-Id: Ia7d763b09cdde9ac757fb970762544099316dd5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 17:10:14 +00:00
Kholoud Mohamed
81558fb098 Merge "Persist bypassDevicePolicyMmanagementRoleQualification in global setting" into tm-dev am: bc16160052 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17384583

Change-Id: If2128dfc4ec312aa5ee31436a739dfd22acaaaa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 17:08:56 +00:00