Commit Graph

15647 Commits

Author SHA1 Message Date
Christian Wailes
8556b1c09a Merge "Fix a bug in the USAP Pool refill logic." 2021-02-03 21:12:34 +00:00
TreeHugger Robot
e9f796caa5 Merge "Fix sharing shortcuts not showing for Work Profile. Check package by using selected profile PackageManager." 2021-02-03 19:31:10 +00:00
Dmitri Plotnikov
dfc06ad726 Merge "Calculate total power for a BatteryConsumer by adding up PowerComponents" into sc-dev am: df5ebd7eab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13432184

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I957360f8e0886b8f4cef2ceef3888d69dc0fee21
2021-02-03 19:08:03 +00:00
Dmitri Plotnikov
df5ebd7eab Merge "Calculate total power for a BatteryConsumer by adding up PowerComponents" into sc-dev 2021-02-03 19:06:15 +00:00
Adam Bookatz
3cbcbeba88 Merge "Measured screen energy into BatteryStatsHelper" 2021-02-03 18:46:29 +00:00
Marcin Oczeretko
bb7a50a3e1 Merge "Use PerfettoTrigger to trigger traces from LatencyTracker" into sc-dev am: 81ed6656ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13452227

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5b9878684be2c03f1ab2d082cc184a64f963633
2021-02-03 18:39:50 +00:00
Marcin Oczeretko
81ed6656ba Merge "Use PerfettoTrigger to trigger traces from LatencyTracker" into sc-dev 2021-02-03 18:07:04 +00:00
TreeHugger Robot
8dcab0dee6 Merge "Do not propogate test api access flags to Zygote." into sc-dev 2021-02-03 18:01:30 +00:00
Jeff Sharkey
a67a00dec8 Merge "Add core notifications team as owners of internal notification widgets." am: 752040bead am: 6b3ed78bf6 am: b7cd95098f am: eb4fdbc3b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571164

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73c453fd0686718faab9254ddaa197cd1c145de1
2021-02-03 17:14:07 +00:00
Jeff Sharkey
eb4fdbc3b7 Merge "Add core notifications team as owners of internal notification widgets." am: 752040bead am: 6b3ed78bf6 am: b7cd95098f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571164

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c79eefd95bb24714c79145fdc907cbd6f4672e8
2021-02-03 16:33:36 +00:00
Jeff Sharkey
b7cd95098f Merge "Add core notifications team as owners of internal notification widgets." am: 752040bead am: 6b3ed78bf6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571164

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7133f6b8f758f6a37973691aea5e1ea2386a848b
2021-02-03 15:54:28 +00:00
Jeff Sharkey
6b3ed78bf6 Merge "Add core notifications team as owners of internal notification widgets." am: 752040bead
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571164

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ced104b3622d406e0eefe64aa311ab5970ccc02
2021-02-03 15:30:13 +00:00
Matt Pietal
556c3159f5 Merge "Lock Pattern View - Visual update" into sc-dev am: 0448729358
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13459659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bbe8d7ac20740e6c1b5b548b5fb6d83d42c857b
2021-02-03 13:21:04 +00:00
Matt Pietal
0448729358 Merge "Lock Pattern View - Visual update" into sc-dev 2021-02-03 13:08:12 +00:00
Artur Satayev
eb05e6c8fa Do not propogate test api access flags to Zygote.
The flow has been replaced by @ChangeId ALLOW_TEST_API_ACCESS, making
old approach obsolete.

Bug: 147113465
Test: atest CameraEvictionTest#testBasicCamera2ActivityEviction
Merged-In: I0bf109fa78212d6d71ba85d25f80e27e8e7cd900
(cherry picked from commit a27cd30535)
Change-Id: I0e58b6924744590afaadec6a6230aa9d552b2f6f
Exempt-From-Owner-Approval: cp
2021-02-03 12:29:45 +00:00
Galia Peycheva
e6ae6e325a Merge changes from topic "revert-13350963-blur_system_api-AFRJFBKNBA-sc-dev" into sc-dev
* changes:
  Revert "Add permission for blur SystemApi"
  Revert "Make window background blurs SystemApi"
  Revert "Make BackgroundBlurDrawable a SystemApi"
2021-02-03 05:49:41 +00:00
Adam Bookatz
30594e82d5 Measured screen energy into BatteryStatsHelper
Use measured screen energy usage (where available)
in battery reporting in BatteryStatsHelper, including
total and per-app screen energy usage.

Regardless of the data source (measured screen power usage vs.
estimating from screen time), the blame on apps is 'smeared',
meaning that it is apportioned (after-the-fact) based on each
app's foreground usage. That does not change here.

Also fixes a mistake in Uid.getScreenOnEnergy().

Future followups to do
1. Make getMeasuredOrEstimatedPower more universal (as more
   PowerCalculators follow suit)
2. Support for BatteryUsageStats
3. Deal with voltage properly
4. Toggle whether to report the measured energy on/off.

Test: atest BatteryStatsHelperTest
Bug: 174818228
Change-Id: I0eaa4bc594cb31b4a26b5488b08114cbf80e3884
2021-02-02 21:01:18 -08:00
Ahaan Ugale
6a95b357c6 Merge "VIMS: Clarify NonNullability of PackageMonitor#onPackageModified." into sc-dev am: b7fd9a7814
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13434323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68a4d01650b2db7d7ca34a759524ec83b540bb05
2021-02-03 02:58:30 +00:00
Ahaan Ugale
b7fd9a7814 Merge "VIMS: Clarify NonNullability of PackageMonitor#onPackageModified." into sc-dev 2021-02-03 02:57:18 +00:00
Jeff DeCew
c879d183a8 Add core notifications team as owners of internal notification widgets.
Change-Id: Ie1a8e61f8c250340083940af866552e0d15851dd
2021-02-03 01:07:21 +00:00
Chris Wailes
f561980638 Fix a bug in the USAP Pool refill logic.
This CL addresses a bug in the USAP Pool refill logic that could cause
refill events to be delayed indefinitely.  This would not prevent future
refill events from triggering, but could cause temporary degradation in
USAP performance.

Test: launch applications from USAP pool and inspect log
Bug: 177795408
Change-Id: I2e46eae431a1d9671d31c29b3552cd0287c66239
2021-02-02 16:59:24 -08:00
Galia Peycheva
3804d61f2a Revert "Make window background blurs SystemApi"
Revert "Add permission check for blurs in SurfaceFlinger"

Revert "Remove public usages of FLAG_BLUR_BEHIND"

Revert "Add pid and uid to SF::setClientStateLocked"

Revert "Add USE_BACKGROUND_BLUR to cts expected permissions"

Revert submission 13350963-blur_system_api

Reason for revert: This topic made blurs a system api. API council voted against that and we will instead aim to make it public for S. None of these changes are relevant in that case.

Reverted Changes:
I3683db296:Remove public usages of FLAG_BLUR_BEHIND
I23b21b603:Add USE_BACKGROUND_BLUR to cts expected permission...
Id21f03793:Add pid and uid to SF::setClientStateLocked
If5d8344a5:Add permission for blur SystemApi
I70d1e1715:Add permission check for blurs in SurfaceFlinger
Icf98c3607:Make window background blurs SystemApi
I0b881ec6e:Make BackgroundBlurDrawable a SystemApi

Bug: 177523043
Test: m
Change-Id: I0f7bcf34db2986d8d5e08b115a611e8e07db5917
Merged-In: I0f7bcf34db2986d8d5e08b115a611e8e07db5917
2021-02-02 23:08:29 +01:00
Galia Peycheva
f83b52cc13 Revert "Make BackgroundBlurDrawable a SystemApi"
Revert "Add permission check for blurs in SurfaceFlinger"

Revert "Remove public usages of FLAG_BLUR_BEHIND"

Revert "Add pid and uid to SF::setClientStateLocked"

Revert "Add USE_BACKGROUND_BLUR to cts expected permissions"

Revert submission 13350963-blur_system_api

Reason for revert: This topic made blurs a system api. API council voted against that and we will instead aim to make it public for S. None of these changes are relevant in that case.

Reverted Changes:
I3683db296:Remove public usages of FLAG_BLUR_BEHIND
I23b21b603:Add USE_BACKGROUND_BLUR to cts expected permission...
Id21f03793:Add pid and uid to SF::setClientStateLocked
If5d8344a5:Add permission for blur SystemApi
I70d1e1715:Add permission check for blurs in SurfaceFlinger
Icf98c3607:Make window background blurs SystemApi
I0b881ec6e:Make BackgroundBlurDrawable a SystemApi

Bug: 177523043
Test: m
Change-Id: Iee4b89b06508c7dc3b7266452bb0b987f8670fac
Merged-In: Iee4b89b06508c7dc3b7266452bb0b987f8670fac
2021-02-02 23:02:05 +01:00
Eugene Susla
cc4c46e0ac Merge "Improvements and fixes for BLE scanning within CDM" 2021-02-02 20:12:52 +00:00
Ben Lin
239d2c4cf0 Merge changes If42d4470,Ia0b701b7 into sc-dev am: 6292565f13
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13434008

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d8097a97b79a811b02483066fcc796c57606af4
2021-02-02 19:35:15 +00:00
Ben Lin
6292565f13 Merge changes If42d4470,Ia0b701b7 into sc-dev
* changes:
  PiP: Add tap-to-unstash function.
  PiP: Allow stashing via dropping on the edge.
2021-02-02 19:27:55 +00:00
Bill Yi
e02a98aab6 Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE
Merged-In: Ie9567c088e4fff075cce5b6f44bd73199377c91b
Change-Id: I3a2480f2cb8331a70141dad9af61ac3fd7f39991
2021-02-02 09:54:38 -08:00
Galia Peycheva
dbe52c0c1a Merge changes from topic "revert-13350963-blur_system_api-AFRJFBKNBA"
* changes:
  Revert "Add permission for blur SystemApi"
  Revert "Make window background blurs SystemApi"
  Revert "Make BackgroundBlurDrawable a SystemApi"
2021-02-02 16:28:01 +00:00
Matt Pietal
6a40f0c588 Lock Pattern View - Visual update
1. Create a wider path
2. Allow dots to be a different color
3. Draw dots over the path instead of below

Bug: 170729566
Test: manual, visual refresh only
Change-Id: I5c191893132eba89d6e55047d7500efa4aa95a29
2021-02-02 10:57:42 -05:00
Marcin Oczeretko
8d09ec3712 Use PerfettoTrigger to trigger traces from LatencyTracker
Also adds IntDef Action annotation to clarify which methods expect the
ACTION_* arguments.

Test: manual - configure threshold through adb and trigger a trace
Bug: 161781469
Change-Id: I7497901138f71049362927c0491d1ab208df3db3
2021-02-02 15:51:08 +00:00
Artur Satayev
42976b7ef2 Merge "Revert "Revert "Do not propogate test api access flags to Zygote.""" 2021-02-02 15:22:07 +00:00
Galia Peycheva
371dd07c26 Revert "Make window background blurs SystemApi"
Revert "Add permission check for blurs in SurfaceFlinger"

Revert "Remove public usages of FLAG_BLUR_BEHIND"

Revert "Add pid and uid to SF::setClientStateLocked"

Revert "Add USE_BACKGROUND_BLUR to cts expected permissions"

Revert submission 13350963-blur_system_api

Reason for revert: This topic made blurs a system api. API council voted against that and we will instead aim to make it public for S. None of these changes are relevant in that case.

Reverted Changes:
I3683db296:Remove public usages of FLAG_BLUR_BEHIND
I23b21b603:Add USE_BACKGROUND_BLUR to cts expected permission...
Id21f03793:Add pid and uid to SF::setClientStateLocked
If5d8344a5:Add permission for blur SystemApi
I70d1e1715:Add permission check for blurs in SurfaceFlinger
Icf98c3607:Make window background blurs SystemApi
I0b881ec6e:Make BackgroundBlurDrawable a SystemApi

Bug: 177523043
Test: m
Change-Id: I0f7bcf34db2986d8d5e08b115a611e8e07db5917
2021-02-02 14:39:40 +01:00
Galia Peycheva
77bf6e0770 Revert "Make BackgroundBlurDrawable a SystemApi"
Revert "Add permission check for blurs in SurfaceFlinger"

Revert "Remove public usages of FLAG_BLUR_BEHIND"

Revert "Add pid and uid to SF::setClientStateLocked"

Revert "Add USE_BACKGROUND_BLUR to cts expected permissions"

Revert submission 13350963-blur_system_api

Reason for revert: This topic made blurs a system api. API council voted against that and we will instead aim to make it public for S. None of these changes are relevant in that case.

Reverted Changes:
I3683db296:Remove public usages of FLAG_BLUR_BEHIND
I23b21b603:Add USE_BACKGROUND_BLUR to cts expected permission...
Id21f03793:Add pid and uid to SF::setClientStateLocked
If5d8344a5:Add permission for blur SystemApi
I70d1e1715:Add permission check for blurs in SurfaceFlinger
Icf98c3607:Make window background blurs SystemApi
I0b881ec6e:Make BackgroundBlurDrawable a SystemApi

Bug: 177523043
Test: m
Change-Id: Iee4b89b06508c7dc3b7266452bb0b987f8670fac
2021-02-02 14:34:24 +01:00
Wilson Wu
d8343be5ac Merge "Make IInputMethodManager to oneway (11/N)" into sc-dev 2021-02-02 07:35:56 +00:00
Dmitri Plotnikov
afe6fe643d Calculate total power for a BatteryConsumer by adding up PowerComponents
Bug: 158137862
Test: atest BatteryUsageStatsTest
Change-Id: I785799efcc895494be6e338475c6b4f276bdf9d5
2021-02-01 17:44:36 -08:00
Jeff Sharkey
38835a6212 Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl" am: 0db5d441ad am: f486d1dc63 am: db00fbb7b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1568920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I799ab3aaaac352805ad2c8dccc3e1f155484494c
2021-02-02 01:28:57 +00:00
Remi NGUYEN VAN
9d060c9e6e Merge "Use consistent Wifi-only checking" into sc-dev 2021-02-02 01:26:16 +00:00
Jeff Sharkey
db00fbb7b3 Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl" am: 0db5d441ad am: f486d1dc63
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1568920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4e04f57ef860e64e5b3af541067c5d163abc7f1
2021-02-02 00:44:46 +00:00
Song Hu
0e4b75a215 Fix sharing shortcuts not showing for Work Profile. Check package by
using selected profile PackageManager.

Test: test on local device
Bug: 175240616
Change-Id: I30728705dbc60d0506b7d20a16bcc8f1eed9b6d0
2021-02-01 16:15:35 -08:00
Dmitri Plotnikov
1ef5d3f87e Add BATTERY_STATS_OWNERS for IBatteryStats.aidl
Change-Id: Iffb8ded9ff5edc899ab38c74ffe3ad98793ca67c
2021-02-01 23:42:59 +00:00
Chloris Kuo
b3a5d74f93 Merge "Conversation Blocklist" into sc-dev 2021-02-01 22:32:32 +00:00
Ben Lin
6930fd5cbc PiP: Allow stashing via dropping on the edge.
Changes so that:
1) PiP now can be stashed when the user releases/let go of input when
PiP is currently floating on top of the left/right edge of the device.
Currently, 1/3 of the PiP needs to be off-screen in order for stash to
happen.
2) Stashing is now allowed from one edge to the other (e.g. user flings
from left to right, right to left), with VERY high velocity (>=
18000.f).

Bug: 178752503
Test: Let go of PiP when off screen, stashes
Test: fling from left to right with extremely high velocity, stashes
Change-Id: Ia0b701b75f598965d79b07b10f09118f80562f09
2021-02-01 12:41:14 -08:00
Tony Huang
d346ee5315 Merge "Make AppTransition animations sharable (1/n)" into sc-dev 2021-02-01 10:16:33 +00:00
Kohsuke Yatoh
1da1ca1702 Merge "Add FontManager#updateFont API" into sc-dev am: ad68508496 am: ca3b164d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13422366

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide21f938f21b37119bba546f6198fbd4ab865404
2021-01-30 18:03:47 +00:00
Eugene Susla
10a1973972 Improvements and fixes for BLE scanning within CDM
Test: manual
Bug: 168052577
Change-Id: I16ec39d1139ab6ab0c2c84364493268e8f395d43
2021-01-29 17:33:48 -08:00
Seigo Nonaka
ff85b932d7 Add FontManager#updateFont API
Bug: 173619554
Test: atest FontManagerTest
Change-Id: I261e55783978d9840b06c586389e2126bc6eb2ca
2021-01-29 14:28:46 -08:00
Chloris Kuo
73bcb5b51f Conversation Blocklist
Add KEY_NOT_CONVERSATION into default allowed adjustments list and add
DeviceConfig to enable it

Bug: 173106605, 178151392
Test: tested on device
Change-Id: I9a34fc3aadadde785bfce2bdf2ff35b0cc0b0ec6
(cherry picked from commit 6fe1741d37)
2021-01-29 17:52:38 +00:00
Chloris Kuo
2597d448f2 Merge "Conversation Blocklist" 2021-01-29 17:51:57 +00:00
Ahaan Ugale
8b3b3b9403 VIMS: Clarify NonNullability of PackageMonitor#onPackageModified.
Bug: 178410946
Test: builds
Change-Id: I767e0f7f4ed1ae8c7f0a74afb5114a85a679d86a
2021-01-29 08:41:46 +00:00
TreeHugger Robot
8f15e41d76 Merge "ScreenPowerCalculator is responsible for smearing" into sc-dev 2021-01-28 20:39:30 +00:00