Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
670,024 Commits 3 Branches 0 Tags
d60338ea9e60ad12174fca4b85ea321f388cd699
Commit Graph

16826 Commits

Author SHA1 Message Date
PETER LIANG
d60338ea9e Merge "Fix the title of the HW "Edit shortcuts" menu is truncated when the device is folded." into sc-v2-dev am: d596ae37f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15746905

Change-Id: I2f993d298f539259506d499a242baa4a24ad487b
 2021-09-14 04:08:58 +00:00
PETER LIANG
d596ae37f4 Merge "Fix the title of the HW "Edit shortcuts" menu is truncated when the device is folded." into sc-v2-dev 2021-09-14 03:58:38 +00:00
Pavel Grafov
58ac1483e5 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: a238881ee0 am: d730a09568 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15778512

Change-Id: I51b6f6f162ac83c7b7c8cdf75494319e4c6d8648
 2021-09-13 14:18:44 +00:00
Pavel Grafov
d730a09568 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: a238881ee0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15778512

Change-Id: I44b1e9fa8d418ef84c1ab324306a00e47e5b4e9a
 2021-09-13 14:08:56 +00:00
Pavel Grafov
a238881ee0 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev 2021-09-13 13:52:26 +00:00
Dmitri Plotnikov
ac031c0c4d Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 am: e69a707085 am: 58214c18dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: I79141b6ae0be2d3aacc6a6168a9382940cfb3521
 2021-09-10 19:25:01 +00:00
Dmitri Plotnikov
58214c18dd Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 am: e69a707085 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: Iedc246526e371342096d6e3354b0e742bd4c855c
 2021-09-10 18:56:26 +00:00
Dmitri Plotnikov
e69a707085 Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: I531bd2c8da470bbde94135dfdddc425de5dbbf9c
 2021-09-10 18:41:20 +00:00
Dmitri Plotnikov
cc225325e3 Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: If3cc87baf6a2249634e3f35ea8683177d9ace1c9
 2021-09-10 18:20:32 +00:00
Dmitri Plotnikov
9fca835a97 Add OWNERS for BatteryStats related files 
Test: N/A

Change-Id: I6b17062eaf538849389528619067504f18e7b2ab
 2021-09-09 18:24:17 -07:00
Michael Wachenschwanz
c9cde5e755 Merge "Ref count isolated uid usage in BatteryStats" into sc-qpr1-dev am: b85b750561 am: 493f8b0569 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15756344

Change-Id: I8b43dd7addcb30a41b31d2a984ba7c0216b9e112
 2021-09-10 00:10:00 +00:00
Michael Wachenschwanz
04dcc9e512 Merge "Ref count isolated uid usage in BatteryStats" into sc-qpr1-dev am: b85b750561 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15756344

Change-Id: I6998822dfe23a513d5c52a0c931bb906eb6d59b2
 2021-09-09 23:54:51 +00:00
Michael Wachenschwanz
493f8b0569 Merge "Ref count isolated uid usage in BatteryStats" into sc-qpr1-dev am: b85b750561 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15756344

Change-Id: I6eb80336c52e2046180802d6813c7e9dafb92e47
 2021-09-09 23:54:45 +00:00
Michael Wachenschwanz
b85b750561 Merge "Ref count isolated uid usage in BatteryStats" into sc-qpr1-dev 2021-09-09 23:35:40 +00:00
Wu Ahan
7afe2f3723 Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424

Change-Id: Ia24326d6b43ca86e46511ebdaaee9718af701e98
 2021-09-09 16:04:08 +00:00
TreeHugger Robot
4e013d4fb7 Merge "Enables scroll capture for WebView" into sc-v2-dev am: 9bcef36827 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727585

Change-Id: Ia20954887459023b9481e8c0e6d5950c95f879d3
 2021-09-09 04:33:50 +00:00
TreeHugger Robot
9bcef36827 Merge "Enables scroll capture for WebView" into sc-v2-dev 2021-09-09 04:22:09 +00:00
Mark Renouf
d1b525354f Enables scroll capture for WebView 
Bug: 190731582
Test: manual, long screenshot Gmail message
Change-Id: I16cd568ab155d308e444c448cc77e538c6415061
 2021-09-08 22:08:13 -04:00
Wu Ahan
819d63139f Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 am: db108bdf5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424

Change-Id: Ib41b1c0347d440c0537ee157fe03327a03a1e3d2
 2021-09-08 12:32:54 +00:00
Wu Ahan
db108bdf5f Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424

Change-Id: I8e7f11c28c9e76702f422e5153d250f5750e8138
 2021-09-08 12:22:40 +00:00
Wu Ahan
6c0cb2fcec Merge "Shorten the timeout of finish call to 10 seconds" into sc-v2-dev am: 7108950503 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15777630

Change-Id: I07859fe3d30912f84ff4334dd596025fae483706
 2021-09-08 12:07:05 +00:00
Michael Wachenschwanz
b028aa01c6 Ref count isolated uid usage in BatteryStats 
Wakelock tracking in BatteryStats relies on the the isolated uid map
when tracking wakelocks from isolated uids. The map needs to keep the
isolated uid while it still has a  wakelock.

Bug: 194414351
Test: atest BatteryStatsNoteTest
Change-Id: I5e51f5f90191829d12fb080169520d9827b9906c
(cherry picked from commit 83c0928c34)
Merged-In: I5e51f5f90191829d12fb080169520d9827b9906c
 2021-09-07 22:47:21 +00:00
Hall Liu
f4fe3ac665 Update and expose ModemActivityInfo 
Update ModemActivityInfo to present a nicer API surface and expose it as
a SystemApi. Also change clients in BatteryStats to match the new
surface.

This is part 1. Part 2 will modify the methods in TelephonyManager to
use a more up-to-standards threading model.

Bug: 170427831
Test: atest ModemActivityInfoTest
Change-Id: I762ed949342861c75d94eafce88335e7bd8c9139
Merged-In: I762ed949342861c75d94eafce88335e7bd8c9139
 2021-09-07 11:40:55 -07:00
Ahan Wu
6f787a7588 Shorten the timeout of finish call to 10 seconds 
We have a minute timeout of finish call, it's a long duration,
shorten it to 10 seconds.

Bug: 196171638
Test: Manually
Change-Id: I4ff726bbac13fd90e7578074b5f11170816be7b1
 2021-09-07 09:18:48 -08:00
Pavel Grafov
6553b4b249 Respect PASSWORD_QUALITY_MANAGED for biometrics 
Bug: 195488124
Test: manual with a modified TestDPC
Change-Id: I3e5d0f6911e1fd785ac249b0dfeb2c7e4cca69df
 2021-09-07 18:09:46 +01:00
Ahan Wu
59e29276f9 Make sure the removeObservers be called correctly 
Handle the surface destroyed case and add a timeout for finish call.

Bug: 196171638
Bug: 197555842
Test: adb shell dumpsys SurfaceFlinger
Test: check the offscreen layers
Test: see 198714745#comment6
Change-Id: Ic6d2521d788c50e10b81b556849194a97f240376
Merged-In: Iec1eb82d1a4756a7b85c8fbdd05f4132a74c613c
 2021-09-07 08:44:16 -08:00
Treehugger Robot
0fa9d2ef6b Merge "Add suppressLintAnnotation on state.java" 2021-09-07 15:51:39 +00:00
Treehugger Robot
71b1df9e93 Merge "create library for mainline module" am: c59870928e am: 26531301a0 am: eeecbc866f am: 0ee62e910b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: Ia2f3df9c8c96de96eca1257013efad356a189bae
 2021-09-07 14:46:49 +00:00
wescande
4d65834880 Add suppressLintAnnotation on state.java 
Test: Build
Merged-In: I02aa127e8e07f239561f4f2a3bbdfc6fccb82f7f
Change-Id: I5a22ebe6473fbf38494e20d629e763c331b1e1e6
 2021-09-07 16:43:09 +02:00
Treehugger Robot
0ee62e910b Merge "create library for mainline module" am: c59870928e am: 26531301a0 am: eeecbc866f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: If4d803fb10b4fe5f77b308200ed93fd43681190e
 2021-09-07 14:33:34 +00:00
Treehugger Robot
eeecbc866f Merge "create library for mainline module" am: c59870928e am: 26531301a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: Ic3137a8521f0cca651292a9a56cddde54a138ea7
 2021-09-07 14:21:56 +00:00
Treehugger Robot
26531301a0 Merge "create library for mainline module" am: c59870928e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: I048c27593314c00706f29db19b6d20ed4b899ae2
 2021-09-07 14:00:18 +00:00
William Escande
a6fb9459cc create library for mainline module 
This library is a temporary work to link all mainline module using
statemachine.
Once this is done, we will be able to move the library to
frameworks/libs/modules-utils

also fix some typo in state* files

Bug: 198418216
Tag: #refactor
Test: None
Change-Id: I1bec7c7bdb25bf3397a742a356aa1f18fddf7d89
 2021-09-06 15:28:09 +00:00
Naomi Musgrave
45a3723982 Merge "[MediaProjection] Do not start layer mirroring without a surface" into sc-v2-dev am: 052c311bb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15684475

Change-Id: Iffd55a3ae6f1eb736cf6cd0f37a46abe904b1a31
 2021-09-06 10:13:27 +00:00
Naomi Musgrave
052c311bb2 Merge "[MediaProjection] Do not start layer mirroring without a surface" into sc-v2-dev 2021-09-06 09:57:30 +00:00
Wu Ahan
ceb5b5db70 Merge "Make sure the removeObservers be called correctly" into sc-v2-dev am: 506fa0bebd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15746914

Change-Id: Id574570093d0d59b11079c5b9ecd5b0d5a5006e6
 2021-09-06 03:36:40 +00:00
Wu Ahan
506fa0bebd Merge "Make sure the removeObservers be called correctly" into sc-v2-dev 2021-09-06 03:18:43 +00:00
Nataniel Borges
a61012f1d7 [DO NOT MERGE] Sync flicker from master to sc-v2 am: c8287a930f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15716594

Change-Id: I1c8ba8041d346d6991fd113b60e75184aa849ea6
 2021-09-04 00:36:01 +00:00
TreeHugger Robot
6bd19fab1c Merge "[DO NOT MERGE] Sync flicker from master to sc-v2" into sc-v2-dev 2021-09-04 00:15:31 +00:00
Ahan Wu
f0fda0d220 Make sure the removeObservers be called correctly 
Handle the surface destroyed case and add a timeout for finish call.

Bug: 196171638
Test: adb shell dumpsys SurfaceFlinger
Test: check the offscreen layers
Change-Id: Id1c0e3a0aea1e27a5581a9c7bdcbe6562f8e2ab6
 2021-09-03 06:05:43 -08:00
Naomi Musgrave
fcef782559 [MediaProjection] Do not start layer mirroring without a surface 
An app may pass a null surface to MediaProjection#createVirtualDisplay,
and later set the surface on the VirtualDisplay. The display's state
will change from off to on when the surface is set.

When determining if layer mirroring should be started/updated in
DisplayContent, take the presence of the surface/display state
into account, to prevent the app from crashing.

Bug: 197863746
Test: atest WmTests:DisplayContentTests
Change-Id: I01af07fff681aab6fc8235c861375eb79118cbfe
 2021-09-03 14:42:52 +01:00
Peter_Liang
a71cd04883 Fix the title of the HW "Edit shortcuts" menu is truncated when the device is folded. 
Solution:
Remove the attribute configchanges and store the situation to let the dialog automatically be created again when layout changes.

Bug: 194072748
Test: manual test
Change-Id: I0d70af45720d796bed1115f1835eb66fc6ccadf3
 2021-09-03 16:16:36 +08:00
shawnlin
bae802cfd8 [DO NOT MERGE]Support rounded corner for multi-display devices am: 6603444a76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15581983

Change-Id: Iaf7cd7b6c357c8df9f7abe39d737fd71e705d557
 2021-09-03 04:04:19 +00:00
Shawn Lin
97b0de7326 Merge "[DO NOT MERGE]Support rounded corner for multi-display devices" into sc-v2-dev 2021-09-03 03:57:09 +00:00
Joe Bolinger
1c6d4006c1 Merge changes from topic "more-cancel-sc-qpr1-dev" into sc-qpr1-dev am: 16a7d2e7bd am: 02eb16d887 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727904

Change-Id: I91c4de88902de11510d6ac79db5e9db61c4dc2ec
 2021-09-01 22:36:28 +00:00
Joe Bolinger
02eb16d887 Merge changes from topic "more-cancel-sc-qpr1-dev" into sc-qpr1-dev am: 16a7d2e7bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727904

Change-Id: Id9964610269328c04806b44d10b9bb555b1f63e0
 2021-09-01 22:23:39 +00:00
Joe Bolinger
c346dab881 Merge changes from topic "more-cancel-sc-qpr1-dev" into sc-qpr1-dev am: 16a7d2e7bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727904

Change-Id: Id8fb1fac31177116d974bd99f1056f6565d986ea
 2021-09-01 22:23:23 +00:00
Joe Bolinger
bdd477a5d1 Add requestId to authentication entry points. 
The CancellationSignal passed into the authentication methods is not
associated with the request and can be used to cancel the current
operation, even if it is more recent. The new id prevents outdated
signals from being using.

Note that there are still issues with the Callbacks that are not
addressed (see bug for details).

Bug: 194405579
Bug: 189451155
Bug: 191716671
Test: atest com.android.systemui.biometrics com.android.server.biometrics

Change-Id: Id71be912cc88ae90df8087eb8f1a6fc3e110f883
 2021-09-01 08:49:26 -07:00
Nataniel Borges
c8287a930f [DO NOT MERGE] Sync flicker from master to sc-v2 
Flicker on master diverged form sc-v2, to make it easier to debug
flicker issues on sc-v2, push the current version of flicker into sc-v2

Test: atest FlickerTests WMShellFlickerTests
Bug: 188792659
Change-Id: I1c832bf32214b12ba4b708bccfc95cf259324844
 2021-09-01 12:06:21 +00:00
TreeHugger Robot
162c1fe42a Merge "Refine WindowInsets logs" into sc-v2-dev am: 964abd77da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15716099

Change-Id: Iee4966a59e7877af03ae68ae4e5bd451c586316b
 2021-08-31 16:00:15 +00:00