John Reck
997ac15bcb
Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev am: 2d362d7159
...
am: a54a5f6512
Change-Id: I3e78ede76656eff16fce54808a052ab79105ae79
2017-09-26 16:52:15 +00:00
John Reck
a54a5f6512
Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev
...
am: 2d362d7159
Change-Id: I7e2895fdb802c25389a689f87e60fe408c955405
2017-09-26 16:34:45 +00:00
Charles He
743f6c37b1
Merge "AM: fix bug in moveTaskToBackLocked due to LockTask"
2017-09-26 16:34:38 +00:00
John Reck
2d362d7159
Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev
2017-09-26 16:23:43 +00:00
Charles He
e66a5bcac1
Merge "StatusBar: add DISABLE2_SYSTEM_ICONS flag"
2017-09-26 15:32:35 +00:00
Evan Laird
56b69b9a9d
Merge "Fix wifi tile animating full-dark when slashing/unslashing" into oc-mr1-dev am: 9b120d5a08
...
am: 01cc377d88
Change-Id: I4cf6284c9d13167c707820564e93a7684ae1bf92
2017-09-26 14:25:16 +00:00
Evan Laird
01cc377d88
Merge "Fix wifi tile animating full-dark when slashing/unslashing" into oc-mr1-dev
...
am: 9b120d5a08
Change-Id: Ic1ff947868039b78360377e098d7908d7ca6eb42
2017-09-26 14:14:31 +00:00
Evan Laird
9b120d5a08
Merge "Fix wifi tile animating full-dark when slashing/unslashing" into oc-mr1-dev
2017-09-26 14:09:09 +00:00
Hugo Benichi
d7a9617ea7
Merge changes Ia47e566b,Ib94d79a9 am: b9e2ddfc10 am: a2161c5ccb am: b91bd88c5e
...
am: f43db3bf94
Change-Id: I4226f31aaea21a7ad2bff7ac8b0a85acc5151cfc
2017-09-26 13:30:24 +00:00
Jack Yu
26f8e592cf
Merge "Fixed that telephony registry service reference incorrectly assigned" am: b0510407da am: aeb6820f11 am: 75c2378ea0
...
am: 1818704efb
Change-Id: I351ad10c34937741d5516229fcd02d7e286fc706
2017-09-26 13:19:16 +00:00
Nicolas Geoffray
192fd323f4
Merge "Move code around for deleting oat artifacts." am: a7bf2a21d9 am: 69fbdcae71 am: 6518232039 -s ours
...
am: 4b8036f6ce
Change-Id: I3d47d3084b886cca0f0dbc6068b95f927c2fe2cc
2017-09-26 13:13:34 +00:00
Nicolas Geoffray
f4b8915efd
Merge "Special handling of priv-apps in PMS." am: 107899c599 am: 15b0493360 am: 35455f2553
...
am: 61dc6ffcbd
Change-Id: I21e1683250d43cbc4c95ec748623b7368f8d4b28
2017-09-26 13:06:43 +00:00
Hugo Benichi
f43db3bf94
Merge changes Ia47e566b,Ib94d79a9 am: b9e2ddfc10 am: a2161c5ccb
...
am: b91bd88c5e
Change-Id: Ied2b31c9d1219b8aebf5fec085ab598b77bede6e
2017-09-26 13:05:41 +00:00
Hans Boehm
6f0d970b2e
Merge "Naming fix and add comments" am: 3c03d5bd2b am: 24b9851605 am: 4a901144fe
...
am: c9532e8ac6
Change-Id: Ibe7d825b3b491cd9e5fb1ef07adaa9f71719e0dd
2017-09-26 13:03:11 +00:00
Jack Yu
1818704efb
Merge "Fixed that telephony registry service reference incorrectly assigned" am: b0510407da am: aeb6820f11
...
am: 75c2378ea0
Change-Id: I80082688f4c7c3438ca4e6cdd5eb3cb80fbd4ad1
2017-09-26 13:02:10 +00:00
Nicolas Geoffray
4b8036f6ce
Merge "Move code around for deleting oat artifacts." am: a7bf2a21d9 am: 69fbdcae71
...
am: 6518232039 -s ours
Change-Id: Id51866d5e0e0615db96bbf25a8171e95f664faab
2017-09-26 12:58:30 +00:00
Peng Xu
00ae599474
Merge changes from topic "equalizer_1" am: 1ba697e29b am: 46f2249f46 am: 01ad27a0eb
...
am: b855edc41f
Change-Id: I499360f6cb7ecdf5c8580faf066c9ac0c0aea59a
2017-09-26 12:49:03 +00:00
Peng Xu
8b53c01dca
Add sensor HAL process into dump list am: ee5164ef5b am: 2398607cc7 am: 3e18872796
...
am: d4b37b57e0 -s ours
Change-Id: Ief93a5d4e69e4280eacc2d428393a2b56a4ef217
2017-09-26 12:47:35 +00:00
Nicolas Geoffray
61dc6ffcbd
Merge "Special handling of priv-apps in PMS." am: 107899c599 am: 15b0493360
...
am: 35455f2553
Change-Id: I8bfe46aad8166d4d4b7346fe10f3e148a34ccf0b
2017-09-26 12:46:30 +00:00
Hugo Benichi
b91bd88c5e
Merge changes Ia47e566b,Ib94d79a9 am: b9e2ddfc10
...
am: a2161c5ccb
Change-Id: If1125419d50b8291bcb056dd4bc7ecd6ea2b5342
2017-09-26 12:43:28 +00:00
Hans Boehm
c9532e8ac6
Merge "Naming fix and add comments" am: 3c03d5bd2b am: 24b9851605
...
am: 4a901144fe
Change-Id: I1e2446f67e0505d30edb230f2dde70855c9fe00c
2017-09-26 12:42:41 +00:00
Peng Xu
c12f5b5271
Merge changes from topic "equalizer" am: aad139a2d3 -s ours am: 2c292120aa -s ours am: 228e5b94e3
...
am: dd463873b1
Change-Id: I7e26c227b8323be39db30bd46b49e54ad3134073
2017-09-26 12:40:36 +00:00
Peng Xu
b855edc41f
Merge changes from topic "equalizer_1" am: 1ba697e29b am: 46f2249f46
...
am: 01ad27a0eb
Change-Id: Ie717da6b0e336701bdacc2949877bc0c1d71cb58
2017-09-26 12:38:01 +00:00
Peng Xu
d4b37b57e0
Add sensor HAL process into dump list am: ee5164ef5b am: 2398607cc7
...
am: 3e18872796
Change-Id: I5028128bc23fa670dedd1c763f2227d30f40957e
2017-09-26 12:36:50 +00:00
Jack Yu
75c2378ea0
Merge "Fixed that telephony registry service reference incorrectly assigned" am: b0510407da
...
am: aeb6820f11
Change-Id: Ie788700dfe65037d80fb1a42ff3dae1030b37405
2017-09-26 12:34:42 +00:00
Peng Xu
dd463873b1
Merge changes from topic "equalizer" am: aad139a2d3 -s ours am: 2c292120aa -s ours
...
am: 228e5b94e3
Change-Id: I480f3645c89dbd44117f18a5807f8aea753439ab
2017-09-26 12:33:02 +00:00
Nicolas Geoffray
6518232039
Merge "Move code around for deleting oat artifacts." am: a7bf2a21d9
...
am: 69fbdcae71
Change-Id: If5e92c3b0499f3d2f69975596678581dfc090733
2017-09-26 12:30:43 +00:00
Nicolas Geoffray
35455f2553
Merge "Special handling of priv-apps in PMS." am: 107899c599
...
am: 15b0493360
Change-Id: I30c573bccf1f0e483d0881062c5b83a56b5080fe
2017-09-26 12:26:51 +00:00
Hans Boehm
4a901144fe
Merge "Naming fix and add comments" am: 3c03d5bd2b
...
am: 24b9851605
Change-Id: Ib2f4ade384b33efc5d54374ce13e26e256f4c8d3
2017-09-26 12:23:12 +00:00
Peng Xu
0b43f740d1
Update Java doc of SensorManager.createDirectChannel am: 9ee042efa8 am: 1c2b555ad9 am: 1cc5ca6bdd -s ours
...
am: a5392a56e5
Change-Id: Ida8af98146e50203211c34b068e1af0da48c03e8
2017-09-26 12:21:36 +00:00
Peng Xu
01ad27a0eb
Merge changes from topic "equalizer_1" am: 1ba697e29b
...
am: 46f2249f46
Change-Id: Icd3c715dfed772d05b8314a394aad2725a9937e0
2017-09-26 12:17:39 +00:00
Peng Xu
3e18872796
Add sensor HAL process into dump list am: ee5164ef5b
...
am: 2398607cc7
Change-Id: I625a84f4f5c235c06e90fe4f8b44aa41979c8b5b
2017-09-26 12:16:35 +00:00
Peng Xu
228e5b94e3
Merge changes from topic "equalizer" am: aad139a2d3 -s ours
...
am: 2c292120aa -s ours
Change-Id: I7d40f3964fd312fe645dba2b05cc324fea079321
2017-09-26 12:13:04 +00:00
Peng Xu
a5392a56e5
Update Java doc of SensorManager.createDirectChannel am: 9ee042efa8 am: 1c2b555ad9
...
am: 1cc5ca6bdd -s ours
Change-Id: I7b4bb738cc70f03abc7ac464bb7e148ac6fde4a2
2017-09-26 12:10:47 +00:00
Peng Xu
1cc5ca6bdd
Update Java doc of SensorManager.createDirectChannel am: 9ee042efa8
...
am: 1c2b555ad9
Change-Id: If2ca73b4b7ba4c1e6778061739ce3689a1341746
2017-09-26 11:56:01 +00:00
Hugo Benichi
a2161c5ccb
Merge changes Ia47e566b,Ib94d79a9
...
am: b9e2ddfc10
Change-Id: I0cac456f778db78d76d2225b79ce42526a6d2d19
2017-09-26 11:46:30 +00:00
Jack Yu
aeb6820f11
Merge "Fixed that telephony registry service reference incorrectly assigned"
...
am: b0510407da
Change-Id: I0d65bc2cc843ce49a10cf6fdebfc4e1f602edaea
2017-09-26 11:33:16 +00:00
Nicolas Geoffray
69fbdcae71
Merge "Move code around for deleting oat artifacts."
...
am: a7bf2a21d9
Change-Id: I63ef9f2a730dbe6ad37ce750be3a6a47636c14d6
2017-09-26 11:25:41 +00:00
Nicolas Geoffray
15b0493360
Merge "Special handling of priv-apps in PMS."
...
am: 107899c599
Change-Id: I43de972b520dcfab7d103ce77ea1539e341825b3
2017-09-26 11:22:00 +00:00
Hans Boehm
24b9851605
Merge "Naming fix and add comments"
...
am: 3c03d5bd2b
Change-Id: Ib35c874f56f87757904553ceeffb4d363eff196e
2017-09-26 11:12:19 +00:00
Peng Xu
46f2249f46
Merge changes from topic "equalizer_1"
...
am: 1ba697e29b
Change-Id: I0b5dabe42c0ab59fab63ea653392dd4d99b7d967
2017-09-26 11:07:28 +00:00
Peng Xu
2398607cc7
Add sensor HAL process into dump list
...
am: ee5164ef5b
Change-Id: I2d13c8d5a871e00cbe96d42b2f8779f5d323223f
2017-09-26 11:05:54 +00:00
Peng Xu
2c292120aa
Merge changes from topic "equalizer"
...
am: aad139a2d3 -s ours
Change-Id: Id283ea5e7ad3620f9c6488aadcca8bb216aea482
2017-09-26 11:01:14 +00:00
Charles He
72a3652665
AM: fix bug in moveTaskToBackLocked due to LockTask
...
In the previous refactor of LockTask-related methods, there was a typo
which resulted in an incorrect lock task state being reported during
moveTaskToBackLocked.
Bug: 66224859
Test: cts/tests/framework/base/activitymanager/util/run-test CtsActivityManagerDeviceTestCases android.server.am.ActivityManagerPinnedStackTests
Test: bit FrameworksServicesTests:com.android.server.am.LockTaskControllerTest
Change-Id: Ic235069ed3c2bafb14efcd83b98af12e37fcb5a7
2017-09-26 10:55:17 +01:00
Hugo Benichi
b9e2ddfc10
Merge changes Ia47e566b,Ib94d79a9
...
* changes:
Separate connectivity event buffer for bug reports
Extract RingBuffer class from NetdEventListenerService
2017-09-26 09:48:10 +00:00
Hugo Benichi
1198ba1533
Separate connectivity event buffer for bug reports
...
This patch uses the RingBuffer class previously extracted out of
NetdEventListenerService for buffering connectivity events in two
independent buffers:
- the current existing buffer used for metrics reporting
- a new rolling buffer, used for bug report dumpsys.
This improves the suefulness of connectivity metrics for bug reports
by solving these three issues tied to the usage of the existing metrics
reporting buffer:
- the buffer is always cleared when metrics reporting happens. If a bug
report is taken shortly after, there is no past connectivity event
added to that bug report.
- the buffer has a max capacity and starts dropping new events when it
saturates, until metrics reporting happens. When this happens, a bug
report will not contain recent connectivity events.
- some types of event are rate limited to avoid flooding the metrics
buffer. events dropped due to rate limits never appears in the bug
report, but the new bug report buffer ignores rate limiting.
Bug: 65164242
Bug: 65700460
Test: runtest frameworks-net,
manually inspecting ouput of $ adb shell dumpsys connmetrics -a
Change-Id: Ia47e566b0c9a6629a26afb7067d5a8efadc25aef
2017-09-26 14:14:25 +09:00
Hugo Benichi
67c5e03b54
Extract RingBuffer class from NetdEventListenerService
...
This patch takes out the ring buffer array added for NFLOG wakeup packet
events logging and extract it into its own class for reuse. This new
RingBuffer class has the two minimal useful functions append() and
toArray().
Bug: 65164242
Bug: 65700460
Test: runtest frameworks-net, with new unit test
Change-Id: Ib94d79a93f4e99661b7d0fac67117b91d57af980
2017-09-26 14:14:16 +09:00
Bryce Lee
6833a07a07
Merge "Restrict when a window receives new Configurations." into oc-mr1-dev am: d71227355e
...
am: 9626a900da
Change-Id: If2664499c9f4233fbbdea7b488fed761d6faf1c1
2017-09-26 00:28:52 +00:00
Bryce Lee
9626a900da
Merge "Restrict when a window receives new Configurations." into oc-mr1-dev
...
am: d71227355e
Change-Id: Ibc6aea6b9126639a44b36466a2efcfbe0dd8d267
2017-09-26 00:18:41 +00:00
Bryce Lee
d71227355e
Merge "Restrict when a window receives new Configurations." into oc-mr1-dev
2017-09-26 00:12:15 +00:00