Commit Graph

17584 Commits

Author SHA1 Message Date
Winson Chiu
be3c8efc93 Merge "Revert "Revert "Open up AndroidPackage as @SystemApi""" 2021-09-10 23:07:18 +00:00
Dmitri Plotnikov
41f99f531d Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 am: e69a707085 am: 58214c18dd am: ac031c0c4d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: Ibd4173233b21e2ba7941db1bd2bf581e81203753
2021-09-10 20:48:10 +00:00
Daniel Olusakin
82bf215341 Merge "Update label loading logic to use intent-filter as sublabel for apps holding the right permission" 2021-09-10 20:19:01 +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
Daniel Olusakin
eb109bbd43 Update label loading logic to use intent-filter as sublabel for apps holding the right permission
Change-Id: I369365966925a2bee4b51453f7bfe271877c860c
Bug: 197665892
2021-09-10 18:07:04 +00:00
Winson Chiu
d7adbb01ba Revert "Revert "Open up AndroidPackage as @SystemApi""
This reverts commit 750ce30b84.

Reason for revert: b/199246839 fixed, re-introduce change

Change-Id: I48f3fd20ac14c823c85de55f667d1860dade1f97
2021-09-10 16:50:01 +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
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
Winson Chiu
d433d2cd9a Merge "Revert "Open up AndroidPackage as @SystemApi"" 2021-09-09 23:29:51 +00:00
Winson Chiu
750ce30b84 Revert "Open up AndroidPackage as @SystemApi"
This reverts commit b013a475eb.

Reason for revert: b/199246839, breaks some builds

Change-Id: If71cb271c6f4bb32f3cc9b31822fa0b9dbab7c37
2021-09-09 21:01:38 +00:00
Fabian Kozynski
d53d2d0d23 Merge "Add API for requesting add TileService" 2021-09-09 17:35:26 +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
291d2b44da Merge "Enables scroll capture for WebView" into sc-v2-dev am: 9bcef36827 am: 4e013d4fb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727585

Change-Id: Ib18701ec0a7e75c9f2e1a606a8a2492256459e73
2021-09-09 04:48:30 +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
6c5323d8ee Merge "Shorten the timeout of finish call to 10 seconds" into sc-v2-dev am: 7108950503 am: 6c0cb2fcec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15777630

Change-Id: I8e7f3b313b425eba92808f7469610e9217a14841
2021-09-08 21:27:28 +00: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
Joshua Trask
ed4f96f055 Make some ChooserActivity inner classes static.
This helps clarify the (lack of) dependencies between these
classes, and suggests that some of them might make good
candidates for removal from the (large) main source file.

In most cases, the classes already had no dependencies and
were ready to switch to static. In one case I had to modify
a class to make its single dependency more explicit.

The few remaining non-static inner classes have more
intricate dependencies on ChooserActivity, and should be
considered in a separate CL.

Test: build/presubmits (no behavior change)
Change-Id: Ic075f1bdd267cc16f6b7b297c7425873eb9bae55
2021-09-07 16:35:53 -04: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
Joshua Trask
eed026d039 Delete some unused ChooserActivity code/symbols.
Test: build/presubmits (unused code)
Change-Id: I049e7568a0bc7f65ffb36f1899e1c0b8bed22de4
2021-09-07 13:15:08 -04: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
31142f4918 Merge "Open up AndroidPackage as @SystemApi" 2021-09-07 15:07:07 +00:00
Treehugger Robot
bec0cce0fa Merge "create library for mainline module" am: c59870928e am: 26531301a0 am: eeecbc866f am: 0ee62e910b am: 71b1df9e93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: I641652c725fbdb8112918246f6103bc976686361
2021-09-07 14:52:55 +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
599a359267 Merge "[MediaProjection] Do not start layer mirroring without a surface" into sc-v2-dev am: 052c311bb2 am: 45a3723982
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15684475

Change-Id: Ie5a8e6aa1f71dd8d55963fd8174d239a3f6233e2
2021-09-06 10:22:51 +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
535a0bc6b6 Merge "Make sure the removeObservers be called correctly" into sc-v2-dev am: 506fa0bebd am: ceb5b5db70
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15746914

Change-Id: Id078bce060cbc021c453a3fa9635007ea6f2ef6b
2021-09-06 03:49:22 +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
TreeHugger Robot
5e678125d2 Merge "Consolidate systrace logic in RemoteInputConnectionImpl" 2021-09-03 20:04:15 +00:00
Yohei Yukawa
451b5da2f7 Consolidate systrace logic in RemoteInputConnectionImpl
This is a follow up CL to our previous CL [1], which introduced
method tracings of InputConnection in the IME client side.

This CL does not change its observable behavior but attempts to
simplify RemoteInputConnectionImpl by extracting out the tracing logic
into task dispatching logic from each InputConnection API handling.

This CL should slightly improve the performance unless systrace for
Trace.TRACE_TAG_INPUT is expcility enabled, because

  Trace.isTagEnabled(Trace.TRACE_TAG_INPUT)

is now called only once per InputConnection command down from twice
per command.  Although the call count would be increased to three
times per command when the tracing is manually enabled, hopefully it'd
be acceptable as an overhead of doing runtime tracing.

Anyway, there should be no observable behavior changes in this CL.

 [1]: I6718aa3183c95fc6802d93137e22d21b71869cfc
      bbdec456e2

Bug: 154348613
Bug: 192412909
Test: presubmit
Test: Manually verified that sytrace is still working
Change-Id: I0a5a6a34cb2a7e0942415253e7edea7eedd1083c
2021-09-03 11:14:12 -07:00