OSDN Git Service
TreeHugger Robot [Fri, 19 Jan 2018 17:39:57 +0000 (17:39 +0000)]
Merge "Rename the dimension_in_what/condition as fields_in_what/condition in MetricConditionLink proto."
TreeHugger Robot [Fri, 19 Jan 2018 17:17:24 +0000 (17:17 +0000)]
Merge "Fix regression in launch settings performance"
TreeHugger Robot [Fri, 19 Jan 2018 17:10:29 +0000 (17:10 +0000)]
Merge "Allow <adopt-permissions> tag in manifest"
TreeHugger Robot [Fri, 19 Jan 2018 17:06:12 +0000 (17:06 +0000)]
Merge "Add canChildBeDraggable() method to SwipeHelper's callback"
Lorenzo Colitti [Fri, 19 Jan 2018 16:46:11 +0000 (16:46 +0000)]
Merge changes Id8776d14,Ifa291c62,I5ea9d200 am:
c48f4cb7f1 am:
b36b423230
am:
cfbf873dd1
Change-Id: I12108d96e29bfe71406106c2af950a6d6a9f8351
Lorenzo Colitti [Fri, 19 Jan 2018 16:37:44 +0000 (16:37 +0000)]
Merge changes Id8776d14,Ifa291c62,I5ea9d200 am:
c48f4cb7f1
am:
b36b423230
Change-Id: I1ac9d349850d607c5fbf4a47760bc09de1c18043
Lorenzo Colitti [Fri, 19 Jan 2018 16:30:17 +0000 (16:30 +0000)]
Merge changes Id8776d14,Ifa291c62,I5ea9d200
am:
c48f4cb7f1
Change-Id: I7a0b01cba8bdee67cffabddacb4ff5f4591cbc34
TreeHugger Robot [Fri, 19 Jan 2018 15:47:14 +0000 (15:47 +0000)]
Merge "Remove use of streams in TransportManager"
TreeHugger Robot [Fri, 19 Jan 2018 15:41:20 +0000 (15:41 +0000)]
Merge "Renamed Setting's Directory Access constants."
Julia Reynolds [Fri, 19 Jan 2018 15:40:35 +0000 (15:40 +0000)]
Merge "Display the active volume stream."
Robert Berry [Fri, 19 Jan 2018 15:25:29 +0000 (15:25 +0000)]
Merge "Revert "Calc job standby runnability based on last job execution...""
Treehugger Robot [Fri, 19 Jan 2018 14:48:52 +0000 (14:48 +0000)]
Merge changes Id8776d14,Ifa291c62,I5ea9d200
* changes:
Track and persist in stats whether traffic is on the default network.
Add the default network to NetworkStats and NetworkStatsCollection.
Pass all default networks to NetworkStatsService
TreeHugger Robot [Fri, 19 Jan 2018 14:42:13 +0000 (14:42 +0000)]
Merge "DisplayCutout: device-independent emulation overlay"
TreeHugger Robot [Fri, 19 Jan 2018 14:28:26 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 19 Jan 2018 13:37:19 +0000 (13:37 +0000)]
Merge "Import translations. DO NOT MERGE"
Vladislav Kuzkokov [Fri, 19 Jan 2018 13:36:09 +0000 (13:36 +0000)]
Merge "Implement Policy to disable printing."
Robert Berry [Fri, 19 Jan 2018 10:52:19 +0000 (10:52 +0000)]
Revert "Calc job standby runnability based on last job execution..."
This reverts commit
f0ce10155244b8e7361dc61640a2d0beac22471b.
Reason for revert: broken master
Test: manual
Bug:
72207660
Change-Id: Ib760dadfd51c4457744b0688f714de8f61570f50
Jeff Sharkey [Fri, 19 Jan 2018 12:27:22 +0000 (12:27 +0000)]
Merge "Alert user on rapid/heavy data usage."
Jeff Sharkey [Fri, 19 Jan 2018 12:21:01 +0000 (12:21 +0000)]
Merge "Use data plans for better job scheduling."
Bernardo Rufino [Fri, 19 Jan 2018 11:22:44 +0000 (11:22 +0000)]
Remove use of streams in TransportManager
Test: m -j RunFrameworksServicesRoboTests
Change-Id: Ie5d81ca9e8c8fcda482fa520aa46841800b88210
Adrian Roos [Thu, 18 Jan 2018 16:45:52 +0000 (17:45 +0100)]
DisplayCutout: device-independent emulation overlay
Adds an option to use dp instead of px when specifying the cutout bounds.
Also centers the coordinate system in the middle, making it easier to specify
the usually centered cutouts.
Also makes the emulated cutout a bit prettier.
Bug:
65689439
Test: adb shell overlay enable com.android.display.cutout.emulation
Change-Id: I3bd16af15f1dad2af204d436abaa35fb9e5ae146
Michal Karpinski [Fri, 19 Jan 2018 11:44:13 +0000 (11:44 +0000)]
Merge "Add validators for all Settings.Global settings that are backed up"
Michal Karpinski [Fri, 19 Jan 2018 11:42:52 +0000 (11:42 +0000)]
Merge "Add SettingsValidators class and a test for validators enforcement"
TreeHugger Robot [Fri, 19 Jan 2018 11:40:20 +0000 (11:40 +0000)]
Merge "Remove junit classes from android.jar"
Ricky Wai [Fri, 19 Jan 2018 11:28:06 +0000 (11:28 +0000)]
Merge "Apply differential privacy on watchlist report"
David Chaloupka [Fri, 19 Jan 2018 10:57:53 +0000 (10:57 +0000)]
Merge "Handle multiple packages of same name in 'aapt2 convert'"
Lorenzo Colitti [Thu, 18 Jan 2018 16:12:04 +0000 (01:12 +0900)]
Track and persist in stats whether traffic is on the default network.
This change adds the defaultNetwork to the ident based on current
system networking state, and persists that value to flash.
Bug:
35142602
Test: runtest frameworks-net
Test: downloaded files using default/non-default networks while watching dumpsys netstats
Change-Id: Id8776d149b2977548a9eb455ad4926af55e25aba
Lorenzo Colitti [Thu, 18 Jan 2018 16:05:20 +0000 (01:05 +0900)]
Add the default network to NetworkStats and NetworkStatsCollection.
This allows us to maintain NetworkStats entries that track
whether the traffic was on the default network.
At the moment, the stats collection code always passes in
DEFAULT_NETWORK_NO. However, this value is a no-op, since it is
not persisted to disk. Only the ident, the uid/set/tag, and the
packet/byte/operation counters are persisted.
A future change will add defaultNetwork to the ident and start
persisting it.
Bug:
35142602
Test: runtest frameworks-net
Change-Id: Ifa291c62c0fa389b88e5561086a29dcd7cee2253
TreeHugger Robot [Fri, 19 Jan 2018 09:57:15 +0000 (09:57 +0000)]
Merge "Initial commit for VideoView2Impl"
Jeff Sharkey [Fri, 19 Jan 2018 09:02:47 +0000 (18:02 +0900)]
Alert user on rapid/heavy data usage.
Now that we have accurate information about a user's carrier data
plan, we can alert them if the current usage patterns would end up
with a nasty surprise towards the end of the current billing cycle.
For example, a single abusive app could use 90% of the user's budget
within the first few days of a billing cycle, leaving the user to
limp along for the remainder of the month.
The simple algorithm here extrapolates to see if the average usage
over the last 4 days would be more than 150% of the data limit for
the full billing cycle. This period is short enough to catch rapid
recent usage, but long enough to smooth over short-term habit
changes, such as a weekend getaway. This was chosen after
backtesting the proposed algorithm against real-world data usage
from a handful of internal users.
Fix NPMS unit tests, and write new ones, but leave the existing
@Ignored annotation intact for now.
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug:
64133169
Change-Id: I0d394b133257e8569a9aa2631b57638839d870ce
TreeHugger Robot [Fri, 19 Jan 2018 09:18:39 +0000 (09:18 +0000)]
Merge "Only load preinstalled updatable in release"
Paul Duffin [Mon, 18 Dec 2017 12:53:43 +0000 (12:53 +0000)]
Remove junit classes from android.jar
Bug:
30188076
Test: make checkbuild
Change-Id: Ia90b8a81495299165d6f8d373ab8c5937e2a5290
Amit Mahajan [Fri, 19 Jan 2018 08:02:04 +0000 (08:02 +0000)]
Merge "Added new SIM state related broadcasts." am:
0fc9900802 am:
6ada16b386
am:
1644137343 -s ours
Change-Id: I3b6f80f86f5a422d768f92ded609a2bc0ee61d86
Amit Mahajan [Fri, 19 Jan 2018 07:54:45 +0000 (07:54 +0000)]
Merge "Added new SIM state related broadcasts." am:
0fc9900802
am:
6ada16b386
Change-Id: Id2b6996e712675b387d0f6b89043b02f39fb1af9
Amit Mahajan [Fri, 19 Jan 2018 07:47:21 +0000 (07:47 +0000)]
Merge "Added new SIM state related broadcasts."
am:
0fc9900802
Change-Id: I10b5f7a9307012e1097712acd36a91c5f6969c11
Lorenzo Colitti [Thu, 18 Jan 2018 15:50:48 +0000 (00:50 +0900)]
Pass all default networks to NetworkStatsService
This will allow NetworkStatsService to treat traffic on these
networks differently from traffic where the app selects a network
that is not the default.
Bug:
35142602
Test: runtest frameworks-net
Change-Id: I5ea9d200d9fb153490c6108bb9390bf152f297da
Christofer Åkersten [Fri, 19 Jan 2018 07:20:37 +0000 (16:20 +0900)]
Only load preinstalled updatable in release
Test: Instantiate MediaController2
Change-Id: I8da88cf9291ee1365143ca86fa64d3f2fde8e225
TreeHugger Robot [Fri, 19 Jan 2018 07:14:46 +0000 (07:14 +0000)]
Merge "Only pass resources to updatable"
Jeff Sharkey [Thu, 18 Jan 2018 22:58:35 +0000 (07:58 +0900)]
Use data plans for better job scheduling.
Now that we have data plan information from the carrier, we can start
using it to influence when we schedule jobs. As a first pass
algorithm:
-- If the network is congested, and a job is less than 50% through
its runnable window, then we'll defer it for awhile.
-- If the network has a surplus of data, we'll consider using some
of it to improve the user experience by running prefetching jobs.
Provider APIs for carrier apps to override their connections to be
temporarily marked as either "unmetered" or "congested", along with
automatic timeouts if desired.
Flag for developers to indicate which jobs will have a material
positive impact on end users. (We don't want to promote jobs that
are simply doing logs upload; for example.) Glue code to quickly
return targetSdk of a specific package.
More tweaking to the exact algorithms will come in future CLs.
Test: bit FrameworksServicesTests:com.android.server.job.
Bug:
64133169
Change-Id: Iabb9f90a7a65958ad648b091edec378fc3bf785a
Jeff Sharkey [Fri, 19 Jan 2018 06:38:48 +0000 (06:38 +0000)]
Merge "Add DataUnit to clarify SI-vs-IEC units."
Bill Yi [Fri, 19 Jan 2018 06:34:01 +0000 (22:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: If8ac5eb5604380c537ddfa2ae118b7fc3f873211
Auto-generated-cl: translation import
Bill Yi [Fri, 19 Jan 2018 06:28:46 +0000 (22:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icf032c113be4120f53b881992df53e3450720404
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 19 Jan 2018 06:08:23 +0000 (06:08 +0000)]
Merge "Camera: Update MOTION_TRACKING requirements"
TreeHugger Robot [Fri, 19 Jan 2018 05:51:43 +0000 (05:51 +0000)]
Merge "Add 4 new fields to KeychainSnapshot"
Insun Kang [Wed, 17 Jan 2018 14:06:18 +0000 (23:06 +0900)]
Initial commit for VideoView2Impl
Test: build
Change-Id: I12b93da01b9c37115cba29b8b50b36cf3d74ddb6
Android Build Merger (Role) [Fri, 19 Jan 2018 05:36:48 +0000 (05:36 +0000)]
Merge "Merge "Fixing app compat issue b/
72143978" am:
8353a39ecc am:
61bab24fa8 am:
1993c5618a"
Ian Pedowitz [Fri, 19 Jan 2018 05:35:27 +0000 (05:35 +0000)]
Merge "Fixing app compat issue b/
72143978" am:
8353a39ecc am:
61bab24fa8
am:
1993c5618a
Change-Id: If6e67a008d02dc561982583a3819de1ef3e06e46
Android Build Merger (Role) [Fri, 19 Jan 2018 05:30:31 +0000 (05:30 +0000)]
Merge "Merge "HIDL: Check error value." am:
898137f817 am:
74426e9c2d am:
b9b7bfb02f"
Steven Moreland [Fri, 19 Jan 2018 05:30:07 +0000 (05:30 +0000)]
Merge "HIDL: Check error value." am:
898137f817 am:
74426e9c2d
am:
b9b7bfb02f
Change-Id: I2b1506eee7c7a5f9557029abd2013c3b2ae0c523
TreeHugger Robot [Fri, 19 Jan 2018 05:27:46 +0000 (05:27 +0000)]
Merge "StaticLayoutPerfTest: Use fixed seed in each test case"
Jeff Sharkey [Fri, 19 Jan 2018 05:25:20 +0000 (05:25 +0000)]
Merge "Add ability to override subscriber capabilities." am:
d6cd4b241a am:
5e097d452b
am:
992cfa2667
Change-Id: I46a6c87751494afca6fdd13736d7a4877e3cc833
Dan Zhang [Fri, 19 Jan 2018 05:21:12 +0000 (05:21 +0000)]
Merge "Fix <Report Audio Status> update" am:
1d5e2c3c37 am:
e7aaba48de
am:
4775f0c76e
Change-Id: I98074b58c0b9def3d766c40ac2c5bc669a2abd0f
Dan Zhang [Fri, 19 Jan 2018 05:17:09 +0000 (05:17 +0000)]
Merge "Fix OTP performance with no Vendor ID device" am:
6ecaac4c9f am:
b88d9b4593
am:
0f279d4577
Change-Id: I0f8bb0736384cafd60180e658ecbe08a464db8d4
Dan Zhang [Fri, 19 Jan 2018 05:13:10 +0000 (05:13 +0000)]
Merge "Fix NPE by pressing Volume Up/Down" am:
fca5ee0bb8 am:
bd57a4d8a1
am:
cc07fa73a1
Change-Id: I95d710489a0ad87c6e3811603097e5438f11f413
Dan Zhang [Fri, 19 Jan 2018 05:09:15 +0000 (05:09 +0000)]
Merge "Fix illegal volume value issue" am:
20443a8dbb am:
65dd4cbf32
am:
3a05ecd714
Change-Id: I64f27d734dc93c036b4f8bd1ecf3088821b92a75
Christofer Åkersten [Fri, 19 Jan 2018 05:09:09 +0000 (14:09 +0900)]
Only pass resources to updatable
Test: Instantiate MediaController2
Change-Id: If357a01847d8a2f9995af3f4c3ec3a777082c662
TreeHugger Robot [Fri, 19 Jan 2018 05:03:27 +0000 (05:03 +0000)]
Merge "Revert the field number change to make statsd_config proto backward-compatible."
TreeHugger Robot [Fri, 19 Jan 2018 05:02:18 +0000 (05:02 +0000)]
Merge "Temporary use hardcoded counterId."
TreeHugger Robot [Fri, 19 Jan 2018 04:58:29 +0000 (04:58 +0000)]
Merge "resolve merge conflicts of
f761f6371a0350bd8d62e97d14cce869a5039572 to master"
Treehugger Robot [Fri, 19 Jan 2018 04:25:12 +0000 (04:25 +0000)]
Merge "Added new SIM state related broadcasts."
Ian Pedowitz [Fri, 19 Jan 2018 04:21:35 +0000 (04:21 +0000)]
Merge "Fixing app compat issue b/
72143978" am:
8353a39ecc
am:
61bab24fa8
Change-Id: I6f07f1d9cfd26aa8b93a2563349b5e40effb7a41
TreeHugger Robot [Fri, 19 Jan 2018 04:19:23 +0000 (04:19 +0000)]
Merge "camera: Add external flash mode key"
Ian Pedowitz [Fri, 19 Jan 2018 04:13:00 +0000 (04:13 +0000)]
Merge "Fixing app compat issue b/
72143978"
am:
8353a39ecc
Change-Id: I4ca60a29aec20f08c65d85b03a080a19d03c7345
TreeHugger Robot [Fri, 19 Jan 2018 03:37:25 +0000 (03:37 +0000)]
Merge "Ignore missing font in fontchain_linter.py"
TreeHugger Robot [Fri, 19 Jan 2018 03:36:02 +0000 (03:36 +0000)]
Merge "Make NotificationShelf nullable in StackScrollAlgorithm."
TreeHugger Robot [Fri, 19 Jan 2018 03:31:56 +0000 (03:31 +0000)]
Merge "Fix bug in statsd with uid memory guardrail"
Steven Moreland [Fri, 19 Jan 2018 03:21:45 +0000 (03:21 +0000)]
Merge "HIDL: Check error value." am:
898137f817
am:
74426e9c2d
Change-Id: Iadcd6a9264e0771aa6d9fe62cca221f2391f2d12
TreeHugger Robot [Fri, 19 Jan 2018 03:19:36 +0000 (03:19 +0000)]
Merge "Calc job standby runnability based on last job execution..."
Steven Moreland [Fri, 19 Jan 2018 03:15:30 +0000 (03:15 +0000)]
Merge "HIDL: Check error value."
am:
898137f817
Change-Id: I838c21cc0c423d41e980a360967a2773238dff81
Dmitry Dementyev [Fri, 19 Jan 2018 00:44:08 +0000 (16:44 -0800)]
Add 4 new fields to KeychainSnapshot
The fields are necessary to construct correct arguments for recovery session.
maxAttempts
counterId
serverParams
trustedHardwarePublicKey
Bug:
66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: If8fbc2e0a313d4367712e3598925eab0fb334258
TreeHugger Robot [Fri, 19 Jan 2018 02:53:30 +0000 (02:53 +0000)]
Merge "Put statsd on system-background cpu set."
Dmitry Dementyev [Fri, 19 Jan 2018 00:57:01 +0000 (16:57 -0800)]
Temporary use hardcoded counterId.
Bug:
66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I0f387e6a424f24de340276fc45cfaddb3529a715
Treehugger Robot [Fri, 19 Jan 2018 02:38:33 +0000 (02:38 +0000)]
Merge "Fixing app compat issue b/
72143978"
TreeHugger Robot [Fri, 19 Jan 2018 02:32:46 +0000 (02:32 +0000)]
Merge "Added new SIM state related broadcasts."
Arthur Hsu [Fri, 19 Jan 2018 02:30:23 +0000 (18:30 -0800)]
resolve merge conflicts of
f761f6371a0350bd8d62e97d14cce869a5039572 to
master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I095f92ed3607616a7147a23f1fd9cd65b72e921b
TreeHugger Robot [Fri, 19 Jan 2018 02:10:46 +0000 (02:10 +0000)]
Merge "Add back missing synchronized in stopGuestOrEphemeralUserIfBackground"
TreeHugger Robot [Fri, 19 Jan 2018 01:55:27 +0000 (01:55 +0000)]
Merge "Modify IHealthInfoCallback interface to return V2.0 HealthInfo"
TreeHugger Robot [Fri, 19 Jan 2018 01:48:10 +0000 (01:48 +0000)]
Merge "Fix RecoverableKeyStore unit tests."
Treehugger Robot [Fri, 19 Jan 2018 01:41:08 +0000 (01:41 +0000)]
Merge "HIDL: Check error value."
Dake Gu [Fri, 19 Jan 2018 01:32:47 +0000 (01:32 +0000)]
Merge "leanback janktest: use extra to initialize fastlane state"
TreeHugger Robot [Fri, 19 Jan 2018 01:26:41 +0000 (01:26 +0000)]
Merge "Center backspace key ripple in pin keyguard"
TreeHugger Robot [Fri, 19 Jan 2018 01:26:21 +0000 (01:26 +0000)]
Merge "condition dimension query."
TreeHugger Robot [Fri, 19 Jan 2018 01:24:40 +0000 (01:24 +0000)]
Merge changes from topic "shadow-in-app"
* changes:
Remove DragDropController#prepareDrag()
Create a drag shadow surface in app process,
Seigo Nonaka [Fri, 19 Jan 2018 01:24:31 +0000 (17:24 -0800)]
Ignore missing font in fontchain_linter.py
It is totally valid if the font is missing even if the font is listed in
fonts.xml. Android Watch has less fonts and OEM vendor may reduce the
font files.
Bug:
72159040
Test: m fontchain_lint
Change-Id: I22bdf7bfeb6d80a2a338ebf7536c8eaf193b03c5
Steven Thomas [Fri, 19 Jan 2018 01:19:44 +0000 (01:19 +0000)]
Merge "Fix missing service call when rebinding to VrCore"
Jeff Sharkey [Fri, 19 Jan 2018 01:11:41 +0000 (01:11 +0000)]
Merge "Add ability to override subscriber capabilities." am:
d6cd4b241a
am:
5e097d452b
Change-Id: Ib22d57c7cde75560cfd5bdd71b75d29b1056f783
Jeff Sharkey [Fri, 19 Jan 2018 01:04:32 +0000 (01:04 +0000)]
Merge "Add ability to override subscriber capabilities."
am:
d6cd4b241a
Change-Id: Id035d437e9b297ba70ba9231f6cfdd44e5b9c257
TreeHugger Robot [Fri, 19 Jan 2018 01:03:55 +0000 (01:03 +0000)]
Merge "Treat missing font in fallback chain"
TreeHugger Robot [Fri, 19 Jan 2018 01:00:00 +0000 (01:00 +0000)]
Merge "AAPT2: Store BinaryPrimatives in protos as oneofs"
Jeff Sharkey [Fri, 19 Jan 2018 00:56:51 +0000 (09:56 +0900)]
Add DataUnit to clarify SI-vs-IEC units.
Improve docs and propose it as public API.
Test: builds, boots
Bug:
70915728
Change-Id: I9b55601e9eb8c069eeccd5f8f5e64fb34e336fd2
TreeHugger Robot [Fri, 19 Jan 2018 00:53:49 +0000 (00:53 +0000)]
Merge "Add semantics for accessibility headings"
Bo Zhu [Fri, 19 Jan 2018 00:44:40 +0000 (00:44 +0000)]
Merge "Change packVaultParams to use the real vault_handle directly"
Yangster-mac [Fri, 19 Jan 2018 00:40:57 +0000 (16:40 -0800)]
Revert the field number change to make statsd_config proto backward-compatible.
Test: statsd unit test passed.
Change-Id: I28b28c0706d35da3617ec9dba4c5bfeb2527befc
TreeHugger Robot [Fri, 19 Jan 2018 00:37:42 +0000 (00:37 +0000)]
Merge "Update the dimension_in_what/condition field number."
Yao Chen [Fri, 19 Jan 2018 00:37:10 +0000 (16:37 -0800)]
Put statsd on system-background cpu set.
Bug:
72176997
Test: manual
Change-Id: Ic160dc8ffea8fd349185ad8b583e6c02dc7defa6
TreeHugger Robot [Fri, 19 Jan 2018 00:35:58 +0000 (00:35 +0000)]
Merge "GnssMeasurementsListener - Fix indexing, add & remove"
Yao Chen [Fri, 19 Jan 2018 00:27:36 +0000 (00:27 +0000)]
Merge "Revert "Enable init.rc for statsd to start statsd by default in boot time""
Ian Pedowitz [Fri, 19 Jan 2018 00:24:11 +0000 (16:24 -0800)]
Fixing app compat issue b/
72143978
Revert "Remove obsolete workaround."
This reverts commit
5e48241a95b843c10f96c57d8544af9d04807218.
Bug:
72143978
Bug:
24465209
Test: Tested failing case on sailfish, reverted back all CL's since
Test:
3471433 for b/
24465209 and apps open
TreeHugger Robot [Fri, 19 Jan 2018 00:23:33 +0000 (00:23 +0000)]
Merge "Set ActivityView's rect as tap exclude region"
Yangster-mac [Fri, 19 Jan 2018 00:17:43 +0000 (16:17 -0800)]
Rename the dimension_in_what/condition as fields_in_what/condition in MetricConditionLink proto.
Test: statsd cts tests passed.
Change-Id: I4c21b0da3d153c8d0c368a78647c44699a3161a5