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

755845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Yu
2f0440e4fe Merge "Updated the owners" am: c22f798040 am: d7659e6014 am: 0d9d376b45 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052239

Change-Id: I2b0f3ca4b76ca656dde769ae1b26a9fe6a83d870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 06:06:57 +00:00
Jack Yu
0d9d376b45 Merge "Updated the owners" am: c22f798040 am: d7659e6014 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052239

Change-Id: I8b1d65513e60f7d12176bc08677f2e072c2cc9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 05:53:45 +00:00
Jack Yu
d7659e6014 Merge "Updated the owners" am: c22f798040 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052239

Change-Id: Icf59b227d3b37ba84874d9452b16762b47603649
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 05:40:33 +00:00
Jack Yu
c22f798040 Merge "Updated the owners" 2022-04-04 05:22:30 +00:00
Yunfan Chen
00c67a2569 Merge "Provide gesture and tappable element insets for caption" am: 268eff33ec am: 3cd3a85988 am: 0c0ed6f1c1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052567

Change-Id: I5507131ce08964e99dca2bfa4b416ff7010481a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 03:59:51 +00:00
Yunfan Chen
0c0ed6f1c1 Merge "Provide gesture and tappable element insets for caption" am: 268eff33ec am: 3cd3a85988 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052567

Change-Id: I72029e1a0de4026cfbf17604591433683e13b2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 03:45:19 +00:00
Yunfan Chen
3cd3a85988 Merge "Provide gesture and tappable element insets for caption" am: 268eff33ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052567

Change-Id: I1e6bf195c6783ba547915653fb3451598cfeb972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 03:30:58 +00:00
Yunfan Chen
268eff33ec Merge "Provide gesture and tappable element insets for caption" 2022-04-04 03:15:01 +00:00
Cecilia Hong
c921168aa3 Merge "Add the logging logic to distinguish the SS-reactivated resume media and user-activated one when there is no recommendation card." into tm-dev 2022-04-04 02:05:36 +00:00
Santiago Seifert
491e17f146 [automerger skipped] Merge "Reorganize exoplayer target names" into sc-mainline-prod am: cf608908b3 -s ours 
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history

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

Change-Id: I3883bec42dfa0d60d6f8affdf6a03fedf638eb04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 22:24:46 +00:00
Santiago Seifert
96e21df70a [automerger skipped] Reorganize exoplayer target names am: d56acd1a57 -s ours 
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history

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

Change-Id: Ia859b61c29f58d7446685c9c011869decdd3d2b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 22:24:24 +00:00
Josh Tsuji
d35b3ee16a Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into tm-dev 2022-04-03 22:20:23 +00:00
Santiago Seifert
cf608908b3 Merge "Reorganize exoplayer target names" into sc-mainline-prod 2022-04-03 22:04:29 +00:00
Xin Li
102cf242f3 Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e53132 am: 4624b52801 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544892

Change-Id: I11133c04efb98697b2eae596884c3fbcad68d300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:46:34 +00:00
Xin Li
ce51bea876 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0bb254bd3f -s ours am: 2a747fd030 -s ours 
am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb45 is already in history

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

Change-Id: Ib43ddd7c36e0c6bc4fc616471d10561898486e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:43:57 +00:00
Xin Li
4624b52801 Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e53132 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544892

Change-Id: I5c9d2124fff45b80d4c0c701f589b7fbd685ac59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:14:20 +00:00
Xin Li
2a747fd030 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0bb254bd3f -s ours 
am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb45 is already in history

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

Change-Id: I7cd17f0442bec0ea54aacfdf8bceac655ce39a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:11:57 +00:00
Xin Li
be28e53132 Merge changes from topic "merge_8391262" into stage-aosp-master 
* changes:
  Fixup OWNERS file merge conflicts.
  Merge Android 12 QPR3 ab/8391262
 2022-04-03 06:41:20 +00:00
Jing Ji
26f54bd162 Merge changes I08df6527,I16a5537e into tm-dev 
* changes:
  Improve the dumpsys output of the app battery tracker
  Coalesce the shared GID battery usage into its real UID
 2022-04-02 18:05:56 +00:00
Aaron Liu
706e0c7148 Merge "Bouncer: Add style in sim pin view." into tm-dev 2022-04-02 17:40:13 +00:00
Aaron Liu
f139385025 Merge "User Switcher: Prevent flickering for user switch." into tm-dev 2022-04-02 17:38:10 +00:00
Santos Cordon
ae92bca430 Merge "Add logging for AutomaticBrightness" into tm-dev 2022-04-02 14:37:32 +00:00
Beverly Tai
099fac63e3 Merge "Update UDFPS "press to unlock" strings" into tm-dev 2022-04-02 14:36:15 +00:00
Beverly Tai
603dfa7564 Merge "Trigger face auth on udfps-fingerdown, even on AOD" into tm-dev 2022-04-02 14:35:48 +00:00
Chris Li
cbc449164b Merge "Register remote animation per Task" into tm-dev 2022-04-02 10:36:24 +00:00
TreeHugger Robot
50d61a67fe Merge "Migrate AppDataHelper reconcileAppsData to snapshot" into tm-dev 2022-04-02 07:38:52 +00:00
Jing Ji
a496007df5 Merge "Don't load app restriction from saved files in test" into tm-dev 2022-04-02 04:40:17 +00:00
Shan Huang
bf8817d3f0 Merge "Remove OnBackInvokedDispatcherOwner interface." into tm-dev 2022-04-02 01:29:52 +00:00
TreeHugger Robot
901ab79568 Merge changes from topic "asynchronous_resetUsbPort" into tm-dev 
* changes:
  Modified the resetUsbPort command to Asynchronous
  Add resetUsbPort in svc usb command
 2022-04-02 01:12:15 +00:00
TreeHugger Robot
c7daca4990 Merge "Asynchronous the resetUsbPort" into tm-dev 2022-04-02 01:12:15 +00:00
Jing Ji
d469d2c83e Don't load app restriction from saved files in test 
As it interfers with testing.

Bug: 203105544
Test: atest FrameworksMockingServicesTests:BackgroundRestrictionTest
Change-Id: I6004f924c6e76fce1a9a20d2c26ddb9f4b960988
 2022-04-01 17:58:58 -07:00
Songchun Fan
6c319e05d2 [automerger skipped] Merge "[SettingsProvider] update API javadoc" am: ebcfe1c6e0 am: 9338b2de56 am: 8f9b80e5f2 -s ours 
am skip reason: Merged-In I3042be0671728d06bf1c7ae09baee538bb82fbe7 with SHA-1 c848cb7172 is already in history

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

Change-Id: I4ae6973370d5b82731ee87e443d71f7c83d69bdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-02 00:30:12 +00:00
Jiyong Park
118b6a3c8a Merge changes from topic "aidl_freeze_tm" into tm-dev 
* changes:
  Implement getInterfaceHash/Version for SoundTrigger
  Explicitly depend on V1 of soundtrigger.types
  Freeze AIDL APIs for TM
 2022-04-02 00:15:21 +00:00
Cecilia
393cc95c2d Add the logging logic to distinguish the SS-reactivated resume media and user-activated one when there is no recommendation card. 
Fixes: 213379423
Test: atest com.android.systemui.media
Change-Id: Ic5164ef5372654be9a049085aeea7ed559f3edd4
(cherry picked from commit 816553f62b8a16ae7efaeb619a59fa67d5fb7491)
 2022-04-02 00:11:56 +00:00
Songchun Fan
8f9b80e5f2 Merge "[SettingsProvider] update API javadoc" am: ebcfe1c6e0 am: 9338b2de56 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2053133

Change-Id: Ieb0676111a1dddf6a1126ecb2ef19ef1520188bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-02 00:10:54 +00:00
Joe Bolinger
3bc43d4396 Merge "Run biometric cleanup on user switch." into tm-dev 2022-04-02 00:01:38 +00:00
Benedict Wong
986b9fcaf5 Merge "Trigger revalidation of VCN, underlying networks" am: bd14581e6b am: 4755021eb1 am: 3e2628d028 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007972

Change-Id: Ic7d85b02a4df497e74f7a4d5273d7d9e2d820afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 23:49:30 +00:00
Songchun Fan
9338b2de56 Merge "[SettingsProvider] update API javadoc" am: ebcfe1c6e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2053133

Change-Id: I54001b5f330d4569fc5b9dc1db09bf409fa70017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 23:49:23 +00:00
Roger Hsieh
8864927bfa Merge "Fix unregisterReceiver in ClipboardOverlayController" into tm-dev 2022-04-01 23:43:57 +00:00
TreeHugger Robot
f8e43432fd Merge "Fix include location data to check for coarse location first." into tm-dev 2022-04-01 23:28:35 +00:00
Benedict Wong
3e2628d028 Merge "Trigger revalidation of VCN, underlying networks" am: bd14581e6b am: 4755021eb1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007972

Change-Id: I23ccd7dcf2eb98c91ed8ffab8f6b41cc3ffaef85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 23:25:31 +00:00
Songchun Fan
ebcfe1c6e0 Merge "[SettingsProvider] update API javadoc" 2022-04-01 23:25:15 +00:00
Jing Ji
96b980676a Improve the dumpsys output of the app battery tracker 
Also turn on the logging in debug builds.

Bug: 203105544
Test: atest FrameworksMockingServicesTests:BackgroundRestrictionTest
Test: dumpsys activity -a
Change-Id: I08df65278e228d75dc45c995326cf9cef91de59a
 2022-04-01 15:58:55 -07:00
Treehugger Robot
e1cbf0b117 Merge "Add context to error message." am: 0754714469 am: 82e2afb277 am: e210ca9e34 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052076

Change-Id: I4669a3e8ffd72d7591d4c6713942072f998b82f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 22:56:53 +00:00
Benedict Wong
4755021eb1 Merge "Trigger revalidation of VCN, underlying networks" am: bd14581e6b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007972

Change-Id: I69531948b404deac5ffdeb2687f77a324da28fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 22:55:42 +00:00
Ling Ma
5b37044c20 Merge "setProperty check for byte limit" am: 18b4802337 am: 4cd991467f am: 39709e6beb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004952

Change-Id: I777beb8d3d8731108533807830e6d7449a51437f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 22:55:04 +00:00
Ling Ma
8827b92855 Merge changes from topic "truncate operator name" am: ffa0f982b6 am: 9cf73e369d am: eb897b1d85 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004810

Change-Id: Ie1a67a1a9fae4dbbc321755f7ec9bde8bb84613f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 22:54:46 +00:00
Matt Pietal
2c3858b90c Merge "Update window with FLAG_SECURE when bouncer is showing" into tm-dev 2022-04-01 22:37:17 +00:00
Treehugger Robot
e210ca9e34 Merge "Add context to error message." am: 0754714469 am: 82e2afb277 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052076

Change-Id: I386d9460938f2045d41b0c6c19902d0a16fdca4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 22:37:15 +00:00
Ling Ma
39709e6beb Merge "setProperty check for byte limit" am: 18b4802337 am: 4cd991467f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004952

Change-Id: I1ea10c7f473956cdeeed14fbe8fa455bf4bb088d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 22:36:40 +00:00