Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
641,034 Commits 3 Branches 0 Tags
0ccbd4e52c4f70ea50df3fe7860b23971f7c46bb
Commit Graph

641034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Peng
0ccbd4e52c Disable group volume control bar in output switcher systemUI dialog 
-Disable static(Pre-defined) group volume seekbar
-Disable dynamic group volume seekbar
-Disable group volume seekbar in edit page

Bug: 189270378
Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest MediaOutputGroupAdapterTest MediaOutputGroupDialogTest
Change-Id: Ifc560e21a3ae8a4830be5c5c5d1fb94f452e36b0
 2021-06-01 12:06:26 +08:00
Xiaoyu Jin
0c59d91acc Merge "Log SearchStats in the platform" into sc-dev 2021-05-14 00:27:37 +00:00
Victor Chang
d59fb76bcb Merge "Revert "Add ART module-lib and system API to the collection"" into sc-dev 2021-05-13 23:47:34 +00:00
TreeHugger Robot
0d6ceb6710 Merge "Improve SettingsTransitionActivity for standalone usage." into sc-dev 2021-05-13 23:14:47 +00:00
Dmitri Plotnikov
14bc81b983 Merge "Add stats session end timestamp and duration to BatteryUsageStats" into sc-dev 2021-05-13 23:08:50 +00:00
Matt Pietal
d8ee5fbd5f Merge "Smartspace - Animate vertically with clock change" into sc-dev 2021-05-13 22:50:39 +00:00
John Reck
22b214ba67 Merge "Have HWUI validate the WebViewFunctors at registration" into sc-dev 2021-05-13 22:35:46 +00:00
Ryan Mitchell
47fb18bed8 Merge "Set ApkAssets path for fabricated rros" into sc-dev 2021-05-13 22:33:17 +00:00
Kevin Chyn
186d52afcb Merge "Animate UDFPS enroll affordance" into sc-dev 2021-05-13 22:19:18 +00:00
Zhomart Mukhamejanov
1aa8e74d5c Merge "Add android.car.permission.CONTROL_CAR_CLIMATE to bugreport app" into sc-dev 2021-05-13 22:10:13 +00:00
Lyn Han
ab2dd81796 Merge "Fix fickle footer visibility" into sc-dev 2021-05-13 22:09:53 +00:00
Adam He
0a78fe6d5e Merge "Removed addValue from TranslationRequest because of potential bug in genrated builder code." into sc-dev 2021-05-13 22:03:42 +00:00
Julia Reynolds
8bfb21bb8c Merge "Use | not ," into sc-dev 2021-05-13 21:49:45 +00:00
Makoto Onuki
85eb43208f Merge "Add a permission for CDM apps to start FGS from the background" into sc-dev 2021-05-13 21:17:44 +00:00
John Reck
faa1b0ab2a Have HWUI validate the WebViewFunctors at registration 
Also tweak how webview's plat_support creates the functor
sruct to be thread-safe, avoids any potential race conditions
even though WebView itself is stated to be thread-hostile in
general. It's too easy to have this just be defined-safe instead.

Bug: 186814981
Test: build & boot, no crashes in real-webview apps
Change-Id: I06f02a279e248fee375ce133c5ce9a2250665ad9
 2021-05-13 17:17:21 -04:00
Joshua Duong
d10df9336a Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." am: 3b2decbb34 am: bc9360ea4e am: 791f088436 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705645

Change-Id: Ieea062bd379150daf14406376e2e26b9499832fe
 2021-05-13 20:57:24 +00:00
Adam He
af6aa6ffb7 Merge "Make getText() nullable and return null." into sc-dev 2021-05-13 20:52:48 +00:00
Kohsuke Yatoh
c27e46f595 Merge changes I09ac3f34,Id3e36922 into sc-dev 
* changes:
  Close FDs / mmap handles promptly.
  Remove unused IFontManager#updateFontFile().
 2021-05-13 20:42:10 +00:00
Ryan Mitchell
bdc0ae1247 Set ApkAssets path for fabricated rros 
Fabricated RROs do not provide assets but are stored on disk. Ensure
that the path to the frro is returned when querying for the ApkAssets
path (which is mostly for debug purposes).

Bug: 181338216
Test: enable frro, use cmd overlay lookup to see path in resolution
Change-Id: Ibf9b1bf0a995325affbf084c71b1e87c5682e734
 2021-05-13 13:41:26 -07:00
Schneider Victor-tulias
3e8e6b9f28 Merge "Update SmartspaceDataPlugin to allow sending SmartspaceTargetEvents." into sc-dev 2021-05-13 20:40:09 +00:00
Joshua Duong
791f088436 Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." am: 3b2decbb34 am: bc9360ea4e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705645

Change-Id: I835c98cbed1be7f90d0c57b25d16cf0bda36b3b1
 2021-05-13 20:39:50 +00:00
Caitlin Cassidy
b70feab0d8 Merge "[Device Controls] Fix the tooltip text color." into sc-dev 2021-05-13 20:32:05 +00:00
Silin Huang
7c08b49192 Merge "Make wallet screen scrollable in landscape mode." into sc-dev 2021-05-13 20:31:16 +00:00
Joshua Duong
bc9360ea4e Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." am: 3b2decbb34 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705645

Change-Id: Iadbd63a4c99d148179b41be32a3862a2fcdd617c
 2021-05-13 20:29:47 +00:00
Ned Burns
f540d78701 Merge changes from topic "dedupe-lockscreen" into sc-dev 
* changes:
  Dedupe smartspace and notification content on lockscreen
  Break circular dependencies in notif code
 2021-05-13 20:29:31 +00:00
Matt Pietal
b40d4b4857 Smartspace - Animate vertically with clock change 
When the large clock appears, move smartspace up to take the place of
the small clock. Reverse that when notifications appear and the small
clock shows up. Animate the large clock weight on appear.

Fixes: 185301988
Test: manual (swipe away notifications)

Change-Id: Ic293cebad4e7a5311c024a4d9cdc7b206689fde7
 2021-05-13 16:19:46 -04:00
Joshua Duong
3b2decbb34 Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." 2021-05-13 20:16:08 +00:00
Lyn Han
8cadb0bf2d Fix fickle footer visibility 
Include top padding for notification background scrim in stackEndHeight

Fixes: 188000471
Test: open shade with no shelf, close shade
Test: open shade with shelf, scroll notifications a lot, close shade
Change-Id: I93b4b6039eb812619787744f893fe1924e1afc4d
 2021-05-13 15:14:09 -05:00
Alexander Dorokhine
c09e57ce61 Merge "Link framework-appsearch against the module_current SDK." into sc-dev 2021-05-13 20:03:08 +00:00
TreeHugger Robot
4d2d17baf7 Merge "Prevent 3 button taskbar from showing on startup" into sc-dev 2021-05-13 19:57:28 +00:00
Xiaoyu Jin
d6d22f0ecf Log SearchStats in the platform 
Bug: b/173532925
Test: atest
CtsAppSearchTestCases FrameworksCoreTests:android.app.appsearch
FrameworksServicesTests:AppSearchImplTest
FrameworksServicesTests:com.android.server.appsearch.stats.PlatformLoggerTest

Change-Id: I6545cb6722ad6f4680e6b0f7800e1833ecc80e0e
 2021-05-13 12:51:29 -07:00
Jeff DeCew
a5b0ed3b0c Merge "Set the height of the right_icon in addition to the width" into sc-dev 2021-05-13 19:48:40 +00:00
Elliott Hughes
05ba318dfc Merge "Remove a use of String16::remove." am: 0529640cc0 am: c881ac71b5 am: 9853e8a94e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704170

Change-Id: I31b89ce8b8504388deab49d9af7410f8d64b78fd
 2021-05-13 19:44:55 +00:00
Dave Mankoff
c9a8383c22 Merge "Move listener registration out of constructor." into sc-dev 2021-05-13 19:42:46 +00:00
Elliott Hughes
9853e8a94e Merge "Remove a use of String16::remove." am: 0529640cc0 am: c881ac71b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704170

Change-Id: I6817cbc45faabde688d59f4cd36260cea231a1c5
 2021-05-13 19:34:16 +00:00
Julia Reynolds
c51b18f835 Use | not , 
Test: atest, cts verifier
Fixes: 181175697
Change-Id: I50e273c1ebaab6ff4006efec9edb96efce89874e
 2021-05-13 19:24:00 +00:00
Makoto Onuki
dc4aa4b86e Add a permission for CDM apps to start FGS from the background 
Previously, any apps with a CDM association was allowed to start
foreground services from the background.

Now, only apps with
REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND
(or REQUEST_COMPANION_RUN_IN_BACKGROUND) are allowed to do so.

Bug: 186536261
Test: Manual test with a test app using CDM. With and without these
    permissions.
Change-Id: Ic00aa1c7cfefc37bf89ea3079ef0977aee12499b
 2021-05-13 12:21:39 -07:00
Elliott Hughes
c881ac71b5 Merge "Remove a use of String16::remove." am: 0529640cc0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704170

Change-Id: I70230cad27bf33d6b02022d28442686885724fb6
 2021-05-13 19:19:01 +00:00
Alexander Dorokhine
0f563404e9 Merge "Update framework from jetpack." into sc-dev 2021-05-13 19:15:05 +00:00
Matt Pietal
ef7ebb5e84 Merge "Fix crash with smartspace view reparenting" into sc-dev 2021-05-13 19:12:39 +00:00
Ken Chen
2ace2a8945 [automerger skipped] Merge "[DO NOT MERGE] Revert "Reference unreachable netId from INetd"" am: 3c2cd1a33c am: 637d31088d am: ef339664dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I981f62347bf962ce71eeec2e2bdb7b2c25480a30
 2021-05-13 19:11:57 +00:00
Ken Chen
75ddfb13ec [automerger skipped] [DO NOT MERGE] Revert "Reference unreachable netId from INetd" am: 4d9020efb5 am: e2431f5328 am: 0f99ee62a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d1439da5a0f0b527c424982c442e05354a35814
 2021-05-13 19:11:46 +00:00
Lais Andrade
c90aab512f Merge "Use a fallback vibration effect for GESTURE_END" am: 12ffac178a am: 777b5e12fe am: e5457de8bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675891

Change-Id: Ic7e09b4a7db59e1d1775937f025f8aec7d800217
 2021-05-13 19:11:27 +00:00
Nate Myren
477fdc1a3b Merge "Ensure paused ops are finished correctly" into sc-dev 2021-05-13 19:11:23 +00:00
Sean Stout
1d0ef86d51 Merge "Fix screen not turning off correctly." into sc-dev 2021-05-13 19:07:29 +00:00
Elliott Hughes
0529640cc0 Merge "Remove a use of String16::remove." 2021-05-13 19:04:33 +00:00
Ken Chen
ef339664dd Merge "[DO NOT MERGE] Revert "Reference unreachable netId from INetd"" am: 3c2cd1a33c am: 637d31088d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705391

Change-Id: I1aeb8e966cc95ea4734a57855507c1b5534b1e1f
 2021-05-13 19:01:39 +00:00
Ken Chen
0f99ee62a1 [DO NOT MERGE] Revert "Reference unreachable netId from INetd" am: 4d9020efb5 am: e2431f5328 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705391

Change-Id: I95422a1f422a6cff29f92eeb2506e9d9ac90c98f
 2021-05-13 19:01:36 +00:00
Lais Andrade
e5457de8bc Merge "Use a fallback vibration effect for GESTURE_END" am: 12ffac178a am: 777b5e12fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675891

Change-Id: I7b278126c7a1207ee4553962074284053760ff1d
 2021-05-13 19:01:06 +00:00
TreeHugger Robot
0d2041dec3 Merge "Do not recreate ImeInputEventSender for the same channel" into sc-dev 2021-05-13 18:55:14 +00:00