OSDN Git Service
Jordan Liu [Tue, 15 May 2018 20:34:02 +0000 (13:34 -0700)]
[automerger skipped] Merge "Update documentation of ApnSetting with V5 example" am:
1c0ef18c39
am:
3ae696bff2 -s ours
Change-Id: Ia7c35d8daeb6c72f43e32215a5af0c0ccfda3e15
Jordan Liu [Tue, 15 May 2018 20:22:56 +0000 (13:22 -0700)]
Merge "Update documentation of ApnSetting with V5 example"
am:
1c0ef18c39
Change-Id: I36cdf4d62fe7a482fef1e7d30e011d12c19695c3
Phil Weaver [Tue, 15 May 2018 20:22:25 +0000 (13:22 -0700)]
Merge "Update a11y when alpha changes" into pi-dev
am:
b504a2f65b
Change-Id: I47118412434c9d433473f1dd3123d9c765c6a045
Selim Cinek [Tue, 15 May 2018 20:01:43 +0000 (13:01 -0700)]
Merge "Made sure that the ambient single line view remains invisible" into pi-dev
am:
75402c371b
Change-Id: I171b5e8251fc1cd5133e39cfc4ddc2f8eaa49ff2
Felipe Leme [Tue, 15 May 2018 19:54:56 +0000 (12:54 -0700)]
Merge "Fixed autofill compat mode so it works on secondary user." into pi-dev
am:
0b20fa45b8
Change-Id: Ic76d6edfb1a943d26ef7310221e260853e347e4e
Phil Weaver [Tue, 15 May 2018 19:49:09 +0000 (19:49 +0000)]
Merge "Update a11y when alpha changes" into pi-dev
Rohan Shah [Tue, 15 May 2018 19:46:04 +0000 (12:46 -0700)]
Merge "[Notif] Safeguard animation start" into pi-dev
am:
97d17a7774
Change-Id: I607bc98d37c1689fdb26d660777e21715d017b07
TreeHugger Robot [Tue, 15 May 2018 19:42:39 +0000 (19:42 +0000)]
Merge "Made sure that the ambient single line view remains invisible" into pi-dev
Svet Ganov [Tue, 15 May 2018 19:33:20 +0000 (12:33 -0700)]
Merge "Prevent instant apps to host app widgets" into pi-dev
am:
dee2a78db6
Change-Id: Icd3b350305e21d607dd95476f3871e3638a0d5ff
Selim Cinek [Tue, 15 May 2018 19:28:06 +0000 (12:28 -0700)]
Merge "Fixed an issue where the wrong notification would be heads upped" into pi-dev
am:
fbdd1f7d09
Change-Id: I007934cfb8bd971e77291a56958fb55e1bfc5c3e
TreeHugger Robot [Tue, 15 May 2018 19:20:19 +0000 (19:20 +0000)]
Merge "Fixed autofill compat mode so it works on secondary user." into pi-dev
TreeHugger Robot [Tue, 15 May 2018 19:12:38 +0000 (19:12 +0000)]
Merge "[Notif] Safeguard animation start" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 19:05:08 +0000 (19:05 +0000)]
Merge "Prevent instant apps to host app widgets" into pi-dev
Selim Cinek [Tue, 15 May 2018 19:04:01 +0000 (19:04 +0000)]
Merge "Fixed an issue where the wrong notification would be heads upped" into pi-dev
Jason Monk [Tue, 15 May 2018 18:49:28 +0000 (11:49 -0700)]
Merge "Blacklist doze setting from tuner reset" into pi-dev
am:
49cb81658d
Change-Id: I52290b149ecee7c6dc81f98b7ef0cafad2846010
Beverly [Tue, 15 May 2018 18:40:32 +0000 (11:40 -0700)]
Merge "When ringer changes to vibrate, phone vibrates" into pi-dev
am:
fd165bb5dd
Change-Id: I14c1de8465663f379c6c031874cf12c0bb4f5317
TreeHugger Robot [Tue, 15 May 2018 18:38:36 +0000 (18:38 +0000)]
Merge "Blacklist doze setting from tuner reset" into pi-dev
Yi Jin [Tue, 15 May 2018 18:27:13 +0000 (11:27 -0700)]
Merge "The argument type is bool, the current bug passes a "true" or "false" string." into pi-dev
am:
0a3815958a
Change-Id: Iadf8a52e65ba7930f419eacbaac9816992715506
Selim Cinek [Tue, 15 May 2018 18:17:07 +0000 (11:17 -0700)]
Made sure that the ambient single line view remains invisible
The single line views are visible by default when they are inflated
and not all calls to it actually ensure that the visibility is
updated. We therefore make sure that the view is appropriately
hidden.
Change-Id: Ied7641347d910fff5c8f1f0b38d349e7f3b56b76
Fixes:
77290485
Test: add second notification to group, observe no overlapping text
Felipe Leme [Tue, 15 May 2018 17:38:13 +0000 (10:38 -0700)]
Fixed autofill compat mode so it works on secondary user.
Test: manual verification using Chrome and sample service
Test: atest CtsAutoFillServiceTestCases
Fixes:
79747293
Change-Id: I83b6fa23e9e7307e9eb44720942f55dc58820ed7
Jordan Liu [Tue, 15 May 2018 18:16:33 +0000 (18:16 +0000)]
Merge "Update documentation of ApnSetting with V5 example"
TreeHugger Robot [Tue, 15 May 2018 18:15:08 +0000 (18:15 +0000)]
Merge "Update Android.bp for api-stubs in order to do api-check." into pi-dev-plus-aosp
Amith Yamasani [Tue, 15 May 2018 18:00:25 +0000 (11:00 -0700)]
Merge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev
am:
c1eddaed6e
Change-Id: I3a8bdfe2858c88854ab15aba6a619aac1fd66945
TreeHugger Robot [Tue, 15 May 2018 18:00:11 +0000 (18:00 +0000)]
Merge "When ringer changes to vibrate, phone vibrates" into pi-dev
Selim Cinek [Tue, 15 May 2018 17:53:56 +0000 (10:53 -0700)]
Merge "Hiding all views when the notification shade is collapsed" into pi-dev
am:
a1f417caf0
Change-Id: I07bb66bde7633bcd52c7f875a85340fbf6b847ff
TreeHugger Robot [Tue, 15 May 2018 17:47:16 +0000 (17:47 +0000)]
Merge "The argument type is bool, the current bug passes a "true" or "false" string." into pi-dev
TreeHugger Robot [Tue, 15 May 2018 17:40:32 +0000 (17:40 +0000)]
Merge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev
Selim Cinek [Tue, 15 May 2018 17:38:31 +0000 (17:38 +0000)]
Merge "Hiding all views when the notification shade is collapsed" into pi-dev
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: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 16:52:15 +0000 (09:52 -0700)]
Merge "Fix crash when loading resources without code" into pi-dev
am:
c46279aa98
Change-Id: I3af4a66f050380c507ec59b9136f2ef6a4f41848
Jason Monk [Tue, 15 May 2018 16:50:57 +0000 (12:50 -0400)]
Blacklist doze setting from tuner reset
Test: manual
Change-Id: I934cfcd65552c9998eb95ecfed65670ec73dde8d
Fixes:
78512759
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
Selim Cinek [Tue, 15 May 2018 02:17:06 +0000 (19:17 -0700)]
Hiding all views when the notification shade is collapsed
Non-heads up views could still be visible when the shade
was collapsed. Therefore they would briefly peak out
after heads up views would be swiped away leading
to ugly flickering.
Test: add hun (with notch enabled) and swipe away hun with other views present
Change-Id: I794693d7d5af5591490df7c2f4b95c01043897d2
Fixes:
76150837
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: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: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: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
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
Jiyong Park [Tue, 15 May 2018 05:30:41 +0000 (05:30 +0000)]
Merge "Add api txt files for nfc-extras"
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 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: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: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:36:02 +0000 (18:36 -0700)]
Merge "Metrics for hardware reliability reporting" into pi-dev
am:
22c738d842
Change-Id: I64b0b4b516b3328494059c3f320aa98ce36f264a
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
Yi Jin [Tue, 15 May 2018 01:04:29 +0000 (18:04 -0700)]
The argument type is bool, the current bug passes a "true" or "false"
string.
Bug:
79710844
Test: atest incidentd_test
Change-Id: I66fc086e4a194e68638311ccdc305a495ecf8da4
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: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
Selim Cinek [Tue, 8 May 2018 21:43:21 +0000 (14:43 -0700)]
Fixed an issue where the wrong notification would be heads upped
When setting the heads up on the summary, the headsup could be transfered
to the children, which is correct whenever we only have one child but not
if contains more then one. We're now looking at the pending notifications
as well in order to make the heads up transfer and revert back in case
we just made the wrong decision.
Test: install test app from bug: first post group and first child and then group with second child, observe normal heads up behavior
Change-Id: I52803f6846d602b6eb542aa18185bde7d60573e0
Fixes:
71818291
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
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
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
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
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
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
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