OSDN Git Service
Seigo Nonaka [Wed, 16 May 2018 05:11:22 +0000 (22:11 -0700)]
Introduce perf test for Layout.getOffsetForHorizontal
Bug:
78464361
Test: atest StaticLayoutGetOffsetForHorizontalPerfTest
Change-Id: I2543463daddf6ab174c14e11705de603d0286690
Selim Cinek [Tue, 15 May 2018 18:01:12 +0000 (11:01 -0700)]
Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev am:
bb24c6b501
am:
438a66d7ce
Change-Id: Iaef4a6566cbccf0e9b29cf57093ad2682ea598a4
Selim Cinek [Tue, 15 May 2018 17:29:54 +0000 (10:29 -0700)]
Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev
am:
bb24c6b501
Change-Id: I4a13c7e18dbfc1a136d2a7b766d4b1259f18ff0e
Selim Cinek [Tue, 15 May 2018 17:28:16 +0000 (10:28 -0700)]
Merge "Keeping the header hidden while the hun is going away" into pi-dev am:
2cfd9fb99c
am:
cb4e490d99
Change-Id: I0c2780d928c6bbe52a664655f5cc1f3750f19b2c
Selim Cinek [Tue, 15 May 2018 17:20:46 +0000 (10:20 -0700)]
Merge "Fixed that views could be stuck transiently at times" into pi-dev am:
f81ad4b94c
am:
19455f091d
Change-Id: I476c6bce6daf352dfa1a6741345f642b3472fed1
Selim Cinek [Tue, 15 May 2018 17:20:19 +0000 (10:20 -0700)]
Merge "Keeping the header hidden while the hun is going away" into pi-dev
am:
2cfd9fb99c
Change-Id: I3046b09b85a995491e616736cb9519c7ced3a944
Selim Cinek [Tue, 15 May 2018 17:10:18 +0000 (10:10 -0700)]
Merge "Fixed that views could be stuck transiently at times" into pi-dev
am:
f81ad4b94c
Change-Id: I066038b167f71f4f649b609b68aec66891c97a24
Selim Cinek [Tue, 15 May 2018 17:07:56 +0000 (17:07 +0000)]
Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev
Jason Monk [Tue, 15 May 2018 17:00:29 +0000 (10:00 -0700)]
Merge "Fix crash when loading resources without code" into pi-dev am:
c46279aa98
am:
2af66fb30f
Change-Id: Ib5d396772eef78971a1c4750bebe72ba49fdaef2
Jason Monk [Tue, 15 May 2018 16:52:15 +0000 (09:52 -0700)]
Merge "Fix crash when loading resources without code" into pi-dev
am:
c46279aa98
Change-Id: I3af4a66f050380c507ec59b9136f2ef6a4f41848
Selim Cinek [Tue, 15 May 2018 16:47:44 +0000 (16:47 +0000)]
Merge "Keeping the header hidden while the hun is going away" into pi-dev
Selim Cinek [Tue, 15 May 2018 16:47:17 +0000 (16:47 +0000)]
Merge "Fixed that views could be stuck transiently at times" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 16:33:20 +0000 (16:33 +0000)]
Merge "Fix crash when loading resources without code" into pi-dev
Jeff Sharkey [Tue, 15 May 2018 15:37:39 +0000 (08:37 -0700)]
Merge "Let tests enumerate all transports/capabilities." into pi-dev am:
8e6445a1a5
am:
75299cffec
Change-Id: If07e77c92046807235229a4f67ee087bdd7bccf1
Jason Monk [Tue, 15 May 2018 15:30:09 +0000 (11:30 -0400)]
Fix crash when loading resources without code
Should use default appComponentFactory, not the actual one from the
app because we have no code.
Test: manual
Change-Id: I982967543c4cf5c28b19b36b6d183a30052bf602
Fixes:
78883500
Jeff Sharkey [Tue, 15 May 2018 15:27:40 +0000 (08:27 -0700)]
Merge "Let tests enumerate all transports/capabilities." into pi-dev
am:
8e6445a1a5
Change-Id: Ie5cd22cfa2b6a60510fd1e31d7ebcd8f6cc890a0
Jeff Sharkey [Tue, 15 May 2018 15:17:30 +0000 (15:17 +0000)]
Merge "Let tests enumerate all transports/capabilities." into pi-dev
Nicolas Geoffray [Tue, 15 May 2018 15:15:19 +0000 (08:15 -0700)]
Merge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev am:
a66cc0da75
am:
060d3525e6
Change-Id: Ib843668663d55d40007e1bfdf4979e8d3b5d1988
Nicolas Geoffray [Tue, 15 May 2018 15:07:29 +0000 (08:07 -0700)]
Merge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev
am:
a66cc0da75
Change-Id: Ia79917a4f798ad46cc98a187e1bca4bab10d098a
Nicolas Geoffray [Tue, 15 May 2018 14:59:04 +0000 (14:59 +0000)]
Merge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev
Chris Wren [Tue, 15 May 2018 14:32:39 +0000 (07:32 -0700)]
Merge "clean up comments" into pi-dev am:
b8dcc91eb9
am:
66f4f3e2f2
Change-Id: I95c718361fcb64fb67c84441abd0309aeb1d6a78
Chris Wren [Tue, 15 May 2018 14:24:55 +0000 (07:24 -0700)]
Merge "clean up comments" into pi-dev
am:
b8dcc91eb9
Change-Id: I9a29d924b1f00491d963e6bf93172b1b622a73a9
Chris Wren [Tue, 15 May 2018 14:15:09 +0000 (14:15 +0000)]
Merge "clean up comments" into pi-dev
Chris Wren [Mon, 14 May 2018 21:16:31 +0000 (17:16 -0400)]
clean up comments
Bug:
79698458
Test: make framework-protos
Change-Id: Ifaac050f2e00912188e3fb999b308101e3b07bf0
shawnlin [Tue, 15 May 2018 08:39:56 +0000 (16:39 +0800)]
Fixed notification shelf not fully visible on lockscreen
Remove the height limitation of mBackgroundBounds.bottom, and allow min
height of NSSL to be shelf size in keyguard when qs panel fully
expanded.
Test: runtest systemui
Change-Id: I74755f8eefa70beec32db2a66a7a425b7fff0276
Fixes:
79202907
Jiyong Park [Tue, 15 May 2018 07:18:23 +0000 (00:18 -0700)]
Merge "Add api txt files for nfc-extras" am:
be7959bb10 am:
06bbf7e675
am:
afb9dbba38
Change-Id: I1a804772d5443c6b2962c72d4cfd048ce21b5096
Jiyong Park [Tue, 15 May 2018 07:09:36 +0000 (00:09 -0700)]
Merge "Add api txt files for nfc-extras" am:
be7959bb10
am:
06bbf7e675
Change-Id: I7f883efb4343be29a4a6c300c59c32505199535c
Jiyong Park [Tue, 15 May 2018 06:57:56 +0000 (23:57 -0700)]
Merge "Add api txt files for nfc-extras"
am:
be7959bb10
Change-Id: Iea39dee06752e13bb659f5f31f555b089ca4b90d
Nathan Harold [Tue, 15 May 2018 06:14:14 +0000 (06:14 +0000)]
Merge "Use INetd Constant for IpSec Interface Prefix"
Felipe Leme [Tue, 15 May 2018 06:09:16 +0000 (23:09 -0700)]
Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev am:
6d0842154b
am:
aae288a6a5
Change-Id: I8f543b2e8066d8f54baf3bf846de585f8a7631da
Felipe Leme [Tue, 15 May 2018 06:01:10 +0000 (23:01 -0700)]
Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev
am:
6d0842154b
Change-Id: Ifc971e81483b5bcf08c6f0af9789b88905dc17ad
TreeHugger Robot [Tue, 15 May 2018 05:47:51 +0000 (05:47 +0000)]
Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev
Nathan Harold [Thu, 26 Apr 2018 18:47:14 +0000 (11:47 -0700)]
Use INetd Constant for IpSec Interface Prefix
Convert to using a constant in INetd to ensure
that there is a consistent tunnel prefix between
Java and native code.
Bug:
74560705
Test: atest FramworksNetTest; atest CtsNetTestCases
Change-Id: Ida233aac2e6c6b26567463964e0ebac9d52eff1e
(cherry picked from commit
649df5e07a968ac98b41a1da60a04d59149d2385)
Philip P. Moltmann [Tue, 15 May 2018 05:32:33 +0000 (22:32 -0700)]
Merge "Allow Print subsystem to work with services provided by instant app" into pi-dev am:
cc64fb9c8f
am:
b098a03e84
Change-Id: Id4820d0df901304b1e10f19c62ee5d049f6cb103
Jiyong Park [Tue, 15 May 2018 05:30:41 +0000 (05:30 +0000)]
Merge "Add api txt files for nfc-extras"
Chilun Huang [Tue, 15 May 2018 05:20:02 +0000 (05:20 +0000)]
Merge "Add index for Hotspot settings page into search"
Philip P. Moltmann [Tue, 15 May 2018 05:10:25 +0000 (22:10 -0700)]
Merge "Allow Print subsystem to work with services provided by instant app" into pi-dev
am:
cc64fb9c8f
Change-Id: I462d3a5cdde32dc193b7ee0611ea79a7f8143df6
nharold [Tue, 15 May 2018 05:08:19 +0000 (22:08 -0700)]
Merge "Use INetd Constant for IpSec Interface Prefix" am:
05a16e8a04 am:
e651d67bcb
am:
f9b0abb6c8
Change-Id: I62832e817becf6a5c532a51344ff158c2138fc43
nharold [Tue, 15 May 2018 04:59:55 +0000 (21:59 -0700)]
Merge "Use INetd Constant for IpSec Interface Prefix" am:
05a16e8a04
am:
e651d67bcb
Change-Id: I142689ec7f7b43e745580eea393130d84fe4e99b
Philip P. Moltmann [Tue, 15 May 2018 04:58:00 +0000 (04:58 +0000)]
Merge "Allow Print subsystem to work with services provided by instant app" into pi-dev
Jorim Jaggi [Tue, 15 May 2018 04:31:27 +0000 (21:31 -0700)]
Merge "Do not immediately perform traversals when executing transition" into pi-dev am:
09a0c2d53c
am:
f8ac1fd83c
Change-Id: I3009c9eae0692c45abd22da5bc2ba9ef855bb96f
Jorim Jaggi [Tue, 15 May 2018 04:23:50 +0000 (21:23 -0700)]
Merge "Do not immediately perform traversals when executing transition" into pi-dev
am:
09a0c2d53c
Change-Id: I65f45f8f979765def9ba1c7f56d1a3dee3292b0f
Jorim Jaggi [Tue, 15 May 2018 04:13:38 +0000 (04:13 +0000)]
Merge "Do not immediately perform traversals when executing transition" into pi-dev
nharold [Tue, 15 May 2018 03:55:41 +0000 (20:55 -0700)]
Merge "Use INetd Constant for IpSec Interface Prefix"
am:
05a16e8a04
Change-Id: If5a0507e6aa2dfa2af7c69d1ec26ff9b48f3baf7
nharold [Tue, 15 May 2018 02:46:05 +0000 (02:46 +0000)]
Merge "Use INetd Constant for IpSec Interface Prefix"
Tracy Zhou [Tue, 15 May 2018 02:40:04 +0000 (19:40 -0700)]
Merge "Change quickstep onboarding tip window type to TYPE_NAVIGATION_BAR_PANEL." into pi-dev am:
02e086eaf3
am:
5282a99fd9
Change-Id: I478342723e49bffe615a16c4c62c0bda86695455
Tracy Zhou [Tue, 15 May 2018 02:29:50 +0000 (19:29 -0700)]
Merge "Change quickstep onboarding tip window type to TYPE_NAVIGATION_BAR_PANEL." into pi-dev
am:
02e086eaf3
Change-Id: Ida73e81d2bf60113d3137e78fdbddfe39fd58381
TreeHugger Robot [Tue, 15 May 2018 02:18:14 +0000 (02:18 +0000)]
Merge "Change quickstep onboarding tip window type to TYPE_NAVIGATION_BAR_PANEL." into pi-dev
Andrew Chant [Tue, 15 May 2018 01:51:26 +0000 (18:51 -0700)]
Merge "Metrics for hardware reliability reporting" into pi-dev am:
22c738d842
am:
67c3ee3d03
Change-Id: Ic186931c0a69583edf83148e8a361c00e072840e
Dake Gu [Tue, 15 May 2018 01:46:16 +0000 (18:46 -0700)]
Merge "Autofill: allow switch IME when autofill is showing" into pi-dev am:
7b6ecb7668
am:
0c268a1a89
Change-Id: Ia0ec98c603ecd69f4b54793df1228468596c6df6
Wyatt Riley [Tue, 15 May 2018 01:40:49 +0000 (18:40 -0700)]
Merge "Simplify Javadoc for easier parsing." into pi-dev am:
f707c55725
am:
0e34c367a1
Change-Id: I5ed07e3aff0f363190985633e1c0310abd7a848f
Andrew Chant [Tue, 15 May 2018 01:36:02 +0000 (18:36 -0700)]
Merge "Metrics for hardware reliability reporting" into pi-dev
am:
22c738d842
Change-Id: I64b0b4b516b3328494059c3f320aa98ce36f264a
Colin Cross [Tue, 15 May 2018 01:35:46 +0000 (18:35 -0700)]
[automerger skipped] Merge "Fix errors caught by aapt2" am:
5d58a302e3 am:
2743c5bb09
am:
d6a3bafd12 -s ours
Change-Id: I7a9419213d418d64ca8eec262a9db46cdfa73ab4
Michael Wright [Tue, 15 May 2018 01:28:32 +0000 (18:28 -0700)]
Merge "Decrease the inferred auto-brightness adjustment at the extremes." into pi-dev am:
b718563329
am:
f68e5665bf
Change-Id: Ib3610c0c93e5c55f8d826c5f8cb60e1deb43d29e
Selim Cinek [Tue, 15 May 2018 01:12:42 +0000 (18:12 -0700)]
Fixed that views could be stuck transiently at times
Removed all references to overlay from the stackscroller
and always using transient views now. We were using
the overlay in places where we shouldn't have been and
therefore views could become stuck.
Change-Id: I8bf455e2d1c4d065d0b3c441606d51b3b96eab9f
Fixes:
78493499
Test: add hun, click on it, observe no transient view stuck behind
TreeHugger Robot [Tue, 15 May 2018 01:16:33 +0000 (01:16 +0000)]
Merge "Metrics for hardware reliability reporting" into pi-dev
Dake Gu [Tue, 15 May 2018 01:12:53 +0000 (18:12 -0700)]
Merge "Autofill: allow switch IME when autofill is showing" into pi-dev
am:
7b6ecb7668
Change-Id: I4adefc4466dd9dc6168e36526b49b03a5d384f1d
Wyatt Riley [Tue, 15 May 2018 01:08:00 +0000 (18:08 -0700)]
Merge "Simplify Javadoc for easier parsing." into pi-dev
am:
f707c55725
Change-Id: Ica75bc5d4ba41041e2cbd585e953320bddbca956
Tracy Zhou [Mon, 14 May 2018 23:58:54 +0000 (16:58 -0700)]
Change quickstep onboarding tip window type to
TYPE_NAVIGATION_BAR_PANEL.
Fixes:
73990691
Test: Go through the talkback flow, "settings cannot verify your
response" toast does not show.
Change-Id: I6f4819eb6ace1260a30589dbcc6c01fa4c8e5c35
Colin Cross [Tue, 15 May 2018 01:03:55 +0000 (18:03 -0700)]
Merge "Fix errors caught by aapt2" am:
5d58a302e3
am:
2743c5bb09
Change-Id: I84dbf6e0fbfe8e2730ffa3fa79c3ef732702e192
Felipe Leme [Tue, 15 May 2018 00:51:58 +0000 (17:51 -0700)]
Don't call setAutofillClient() on base Context if it's null.
Test: atest CtsAutoFillServiceTestCases
Test: changed activity on autofill sample to override attachBaseContext() by
calling super.attachBaseContext(null) - the activity still crashes, but
not on attachBaseContext().
Fixes:
79707861
Change-Id: Idfaa9c596cc338ab815441138ce06ba64cd3b4d2
Dake Gu [Tue, 15 May 2018 01:02:41 +0000 (01:02 +0000)]
Merge "Autofill: allow switch IME when autofill is showing" into pi-dev
Colin Cross [Tue, 15 May 2018 00:55:51 +0000 (17:55 -0700)]
Merge "Fix errors caught by aapt2"
am:
5d58a302e3
Change-Id: Icf8a601da34c92af6f82afbbdf87468db6387049
Michael Wright [Tue, 15 May 2018 00:53:00 +0000 (17:53 -0700)]
Merge "Decrease the inferred auto-brightness adjustment at the extremes." into pi-dev
am:
b718563329
Change-Id: I76e456b7f000cedb183115f0abd306957e983ffa
TreeHugger Robot [Tue, 15 May 2018 00:48:52 +0000 (00:48 +0000)]
Merge "Simplify Javadoc for easier parsing." into pi-dev
TreeHugger Robot [Tue, 15 May 2018 00:37:10 +0000 (00:37 +0000)]
Merge "Decrease the inferred auto-brightness adjustment at the extremes." into pi-dev
Colin Cross [Tue, 15 May 2018 00:36:20 +0000 (17:36 -0700)]
Merge "Fix errors caught by aapt2" am:
ed90a673d4 am:
592590c3d2
am:
ceaf60dc18
Change-Id: I91978ad442e7b79a3c19819cffa322c30cc274c4
Colin Cross [Tue, 15 May 2018 00:23:55 +0000 (17:23 -0700)]
Merge "Fix errors caught by aapt2" am:
ed90a673d4
am:
592590c3d2
Change-Id: I47bac881f38d638192418c4e664722cc71941f0d
Selim Cinek [Tue, 15 May 2018 00:17:31 +0000 (17:17 -0700)]
Keeping the header hidden while the hun is going away
Previously we were showing the Hun header immediately again
when the heads up times out, but we now also factor in
if it's animating away.
Test: add hun, click on it, header is still hidden
Change-Id: I2e5714c9282f0dd76d17511485c002010be169bb
Fixes:
77219603
Ta-wei Yen [Tue, 15 May 2018 00:13:31 +0000 (17:13 -0700)]
Merge "Update javadoc for setVisualVoicemailSmsFilterSettings" into pi-dev am:
1f520a64d7
am:
e1f739d4bd
Change-Id: I859af50cb948e291b7bb047b83ed0c6b668645b4
Michael Wright [Tue, 15 May 2018 00:01:16 +0000 (17:01 -0700)]
Merge "Reset auto-brightness on new BrightnessConfiguration" into pi-dev am:
cc26ac226a
am:
ab65c3085d
Change-Id: I1984b3de49d97f878312fa663b42bb34ca2a72d4
Colin Cross [Tue, 15 May 2018 00:00:08 +0000 (17:00 -0700)]
Merge "Fix errors caught by aapt2"
am:
ed90a673d4
Change-Id: I91c38a3b05338d280d4b5050f28f8f3c1f2481a2
Ta-wei Yen [Mon, 14 May 2018 23:59:17 +0000 (16:59 -0700)]
Merge "Update javadoc for setVisualVoicemailSmsFilterSettings" into pi-dev
am:
1f520a64d7
Change-Id: I200ac97a1bdc7efaca638628abff90f3853bf688
Suprabh Shukla [Mon, 14 May 2018 23:56:13 +0000 (16:56 -0700)]
Merge "Fixing user tap on suspended widget" into pi-dev am:
98deba8412
am:
fa03e5043f
Change-Id: Idd89e6255c02016b4dec92bcf05740406109f1c1
Michael Wright [Mon, 14 May 2018 23:52:35 +0000 (16:52 -0700)]
Merge "Reset auto-brightness on new BrightnessConfiguration" into pi-dev
am:
cc26ac226a
Change-Id: I633484797b6c00161cf68b22949e053d25532996
Phil Weaver [Mon, 14 May 2018 23:49:43 +0000 (16:49 -0700)]
Merge "Improve a11y ordering" into pi-dev am:
3789bbc476
am:
fbcae9d732
Change-Id: I0c234b9e3f2778951c729ed6daed96bcc3b394d2
Ta-wei Yen [Mon, 14 May 2018 23:48:55 +0000 (23:48 +0000)]
Merge "Update javadoc for setVisualVoicemailSmsFilterSettings" into pi-dev
Suprabh Shukla [Mon, 14 May 2018 23:48:06 +0000 (16:48 -0700)]
Merge "Fixing user tap on suspended widget" into pi-dev
am:
98deba8412
Change-Id: I689e4e488ec573050c18420c50595cc0d9472178
Philip P. Moltmann [Mon, 14 May 2018 23:45:38 +0000 (16:45 -0700)]
Merge "Allow to create trusted BaseDexClassLoader" into pi-dev am:
183f753624
am:
df22284084
Change-Id: Ia24c42f53df76cdab1fcbc407c82f831b85131b9
Phil Weaver [Mon, 14 May 2018 23:40:30 +0000 (16:40 -0700)]
Merge "Improve a11y ordering" into pi-dev
am:
3789bbc476
Change-Id: I873a9458755686d2e86d73fa001806c5e7bf0197
Suprabh Shukla [Mon, 14 May 2018 23:39:21 +0000 (16:39 -0700)]
Merge "Mitigating cache corruption in ArrayMap" into pi-dev am:
841de8fb31
am:
7e69f41b55
Change-Id: I9e5e678e89961720b25488aa13e5d35ef17f1f2a
Philip P. Moltmann [Mon, 14 May 2018 23:36:25 +0000 (16:36 -0700)]
Merge "Allow to create trusted BaseDexClassLoader" into pi-dev
am:
183f753624
Change-Id: If40343231640515c42455139b94d746fd02dc262
Michael Wright [Mon, 14 May 2018 23:33:02 +0000 (23:33 +0000)]
Merge "Reset auto-brightness on new BrightnessConfiguration" into pi-dev
TreeHugger Robot [Mon, 14 May 2018 23:32:08 +0000 (23:32 +0000)]
Merge "Fixing user tap on suspended widget" into pi-dev
Suprabh Shukla [Mon, 14 May 2018 23:31:21 +0000 (16:31 -0700)]
Merge "Mitigating cache corruption in ArrayMap" into pi-dev
am:
841de8fb31
Change-Id: Ia8e5eddc8837af23c2fdcb48b40e98f1eff3bc8b
Phil Weaver [Mon, 14 May 2018 23:25:07 +0000 (23:25 +0000)]
Merge "Improve a11y ordering" into pi-dev
Jeff Sharkey [Mon, 14 May 2018 19:49:07 +0000 (13:49 -0600)]
Let tests enumerate all transports/capabilities.
This gives them a way to collect all included values without
resorting to manual probing of each newly added value.
Bug:
16207332
Test: atest com.android.cts.net.HostsideVpnTests
Change-Id: I35ca412512dc8515b44d5518e1ca4caa5bdc678f
Michael Wright [Mon, 14 May 2018 22:53:48 +0000 (15:53 -0700)]
Decrease the inferred auto-brightness adjustment at the extremes.
Now that the brightness slider always represents the brightness of the
panel, rather than the auto-brightness adjustments like it did prior to
P, we need to infer the adjustment by comparing the old and new
brightness values. At the extremes, this inferred brightness increases
dramatically towards (+/-) infinity, so we use a different strategy.
Based on dogfood feedback, the current inference seems to have too
strong of an effect, so we're cutting it in half in the hopes that this
is more reasonable.
Change-Id: If6a6c3355f9dcce8588512f1d969c871149ec299
Fixes:
79153846
Test: manual
TreeHugger Robot [Mon, 14 May 2018 23:11:33 +0000 (23:11 +0000)]
Merge "Allow to create trusted BaseDexClassLoader" into pi-dev
Chenjie Yu [Mon, 14 May 2018 23:10:18 +0000 (16:10 -0700)]
Merge "Configurable data error action in value metric" into pi-dev am:
5ca38cafe8
am:
315211c74b
Change-Id: Iafca516e23b063bab59e751cecbea9ef9e25c1bd
TreeHugger Robot [Mon, 14 May 2018 23:03:39 +0000 (23:03 +0000)]
Merge "Mitigating cache corruption in ArrayMap" into pi-dev
Chenjie Yu [Mon, 14 May 2018 22:57:30 +0000 (15:57 -0700)]
Merge "Configurable data error action in value metric" into pi-dev
am:
5ca38cafe8
Change-Id: Ic4ce7443e381e42e6b33f93021c6344d18abb9c2
Andrew Chant [Thu, 10 May 2018 21:16:07 +0000 (14:16 -0700)]
Metrics for hardware reliability reporting
Add event metrics for hardware reliability reporting.
Events include:
- Battery Health Snapshot
- Battery Charge cycles
- Physical Drop
- Hardware Failed
- USB Audio Device insertion & removal
- USB Connector insertion & removal
Bug:
69978775
Test: Logged events from Pixelstats HAL
Change-Id: I9389f71ffe85a430273f33650503f714ea308a78
TreeHugger Robot [Mon, 14 May 2018 22:46:15 +0000 (22:46 +0000)]
Merge "Configurable data error action in value metric" into pi-dev
Colin Cross [Mon, 14 May 2018 22:42:03 +0000 (22:42 +0000)]
Merge "Fix errors caught by aapt2"
Colin Cross [Mon, 14 May 2018 22:41:42 +0000 (22:41 +0000)]
Merge "Fix errors caught by aapt2"
Ta-wei Yen [Mon, 30 Apr 2018 18:55:47 +0000 (11:55 -0700)]
Update javadoc for setVisualVoicemailSmsFilterSettings
Test: N/A
Change-Id: I024fa5c2947b562e61e693ecb4d8421fe2507c9e
Fixes:
73829091
Selim Cinek [Mon, 14 May 2018 22:01:56 +0000 (15:01 -0700)]
Merge "Measuring the content views always at their specified size" into pi-dev am:
13c0e0d19e
am:
a499c0060d
Change-Id: I45b130e3bc819394eb58d3b002e32f1f2f88b9a3
Mady Mellor [Mon, 14 May 2018 21:56:12 +0000 (14:56 -0700)]
Merge "Add 'Snooze' to local context menu for notifications" into pi-dev am:
18a67855a2
am:
3cd36ee42b
Change-Id: I78ab7bc973540c485df91482bc7169b89dee1770
Suprabh Shukla [Mon, 14 May 2018 21:22:11 +0000 (14:22 -0700)]
Mitigating cache corruption in ArrayMap
Before calling freeArrays, storing the array reference into a temporary
pointer so that the main pointer doesn't end up corrupting the static
pool of arrays on concurrent access. An earlier change missed a rare
case when removeAt was called for the last element in the map.
Test: atest android.util.ArrayMapTest
atest android.util.cts.ArrayMapTest
Bug:
78898947
Change-Id: I454c5b1600eb0a6c690e746df10f6a0ebcd8aa1d