OSDN Git Service
Philip P. Moltmann [Tue, 13 Dec 2016 22:50:29 +0000 (22:50 +0000)]
Merge "Do not write if apply() did not change the file."
Wale Ogunwale [Tue, 13 Dec 2016 22:43:29 +0000 (22:43 +0000)]
Merge "Fixed issue with ordering of non-app token windows"
Rob Carr [Tue, 13 Dec 2016 22:34:28 +0000 (22:34 +0000)]
Merge "Correct error in Configuration.updateFrom"
Wale Ogunwale [Tue, 13 Dec 2016 22:24:00 +0000 (14:24 -0800)]
Fixed issue with ordering of non-app token windows
We tried to fix this issue in I83357975c87c704af9d0702c939ca99984462365
but the fix introduced other problems. So, we are going to have sys-ui
create a separate binder for object for each type of window it adds.
Long term we want to allow one binder object to map to multiple window
tokens on the same display in window manager.
Change-Id: Iee53b8bf95b87f79ab7a1b574a54111c678f7413
Fixes:
33567674
Fixes:
33538278
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Ben Lin [Tue, 13 Dec 2016 21:21:23 +0000 (21:21 +0000)]
DO NOT MERGE Using Activity#setTitle to have TalkBack announce root traversal. am:
ab58b5a3dd
am:
7ef13276c1 -s ours
Change-Id: I2c8e035ad92988cba898e82efb8a6437d21fe469
Ben Lin [Tue, 13 Dec 2016 21:15:15 +0000 (21:15 +0000)]
DO NOT MERGE Using Activity#setTitle to have TalkBack announce root traversal.
am:
ab58b5a3dd
Change-Id: Id9c2e3ff42a2ec8fe554e5d3d830d2d70d107086
TreeHugger Robot [Tue, 13 Dec 2016 21:03:27 +0000 (21:03 +0000)]
Merge "Fixing issue in current and max duration calculations."
Ivan Podogov [Tue, 13 Dec 2016 20:56:31 +0000 (20:56 +0000)]
Merge "Finish resolving conflict from
d23dc17" into nyc-mr2-dev-plus-aosp
am:
966d2357c5
Change-Id: I20f596ecc7171d9aaa86e9a25005ac93ccbf9922
Ivan Podogov [Tue, 13 Dec 2016 20:56:24 +0000 (20:56 +0000)]
Finish resolving conflict from
d23dc17
am:
4460839e5c -s ours
Change-Id: Id560c17d069d6405696e5fbc7e307c95f8922abd
TreeHugger Robot [Tue, 13 Dec 2016 20:49:02 +0000 (20:49 +0000)]
Merge "SkCanvas is no longer refcnted, use SkClipOps"
Ivan Podogov [Tue, 13 Dec 2016 20:44:47 +0000 (20:44 +0000)]
Merge "Really resolve merge conflicts of
903d641 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp
am:
0cc0222bdf
Change-Id: I294e13cff04b77b3fa6160a7948e72d29b98e3eb
Ivan Podogov [Tue, 13 Dec 2016 20:44:41 +0000 (20:44 +0000)]
Really resolve merge conflicts of
903d641 to nyc-mr2-dev-plus-aosp
am:
d97e21c0e1 -s ours
Change-Id: I5c9784c3e3c349585f32d44364f7876417483dd9
Hakan Seyalioglu [Tue, 13 Dec 2016 20:41:18 +0000 (20:41 +0000)]
Merge "Don't auto-launch if switching to managed account"
TreeHugger Robot [Tue, 13 Dec 2016 20:38:52 +0000 (20:38 +0000)]
Merge "Finish resolving conflict from
d23dc17" into nyc-mr2-dev-plus-aosp
Ivan Podogov [Tue, 13 Dec 2016 20:36:04 +0000 (20:36 +0000)]
Finish resolving conflict from
d23dc17
Test: Treehugger
Change-Id: If7fa9f7e300f3d810e41447369ccbbfbc3963b94
Ivan Podogov [Tue, 13 Dec 2016 20:34:50 +0000 (20:34 +0000)]
Merge changes from topic 'f-radio-toggle' into cw-f-dev am:
e5592abb83 am:
4d2c60173e
am:
4418dbb2cb
Change-Id: I1ec3470b9184e7166f7536d1213dad38a4c970f6
Svetoslav Ganov [Tue, 13 Dec 2016 20:33:05 +0000 (20:33 +0000)]
Add WiFi toggle prompts - framework am:
82737b42a6 am:
4c63779d4b
am:
a5758cf1a5
Change-Id: I2b1409e2e3915218f0fa0fdbfb3fd3132d046db9
Ivan Podogov [Tue, 13 Dec 2016 20:31:55 +0000 (20:31 +0000)]
resolve merge conflicts of
903d641 to nyc-mr2-dev-plus-aosp
am:
90a198a659 -s ours
Change-Id: I9139e70e694cf024ce633a03dba7f620bc7fac56
TreeHugger Robot [Tue, 13 Dec 2016 20:29:59 +0000 (20:29 +0000)]
Merge "Really resolve merge conflicts of
903d641 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp
Ivan Podogov [Tue, 13 Dec 2016 20:27:15 +0000 (20:27 +0000)]
Really resolve merge conflicts of
903d641 to nyc-mr2-dev-plus-aosp
Test: Treehugger
Change-Id: Idd62dc36b4257f31148b29dec19a2785043e3d11
Ivan Podogov [Tue, 13 Dec 2016 20:25:42 +0000 (20:25 +0000)]
Merge changes from topic 'f-radio-toggle' into cw-f-dev am:
e5592abb83
am:
4d2c60173e
Change-Id: If7c29499a229e1a71c200816bc87073e4f238e45
Svetoslav Ganov [Tue, 13 Dec 2016 20:24:44 +0000 (20:24 +0000)]
Add WiFi toggle prompts - framework am:
82737b42a6
am:
4c63779d4b
Change-Id: Ib2351eba8d8e4980c36fd328d298c16bab48b0dc
Ivan Podogov [Tue, 13 Dec 2016 20:15:37 +0000 (20:15 +0000)]
resolve merge conflicts of
903d641 to nyc-mr2-dev-plus-aosp
Test: Treehugger
Change-Id: Ie994c37011f6f4255ca681e4f0c0a99fa5c337fd
TreeHugger Robot [Tue, 13 Dec 2016 19:47:30 +0000 (19:47 +0000)]
Merge "Always reserve space for icon in RestrictedSwitchPreference."
Ivan Podogov [Tue, 13 Dec 2016 19:46:45 +0000 (19:46 +0000)]
Merge changes from topic 'f-radio-toggle' into cw-f-dev
am:
e5592abb83
Change-Id: I9b6e01eedbbd463e0053bab3a5b8a080aaf7514a
Svetoslav Ganov [Tue, 13 Dec 2016 19:46:20 +0000 (19:46 +0000)]
Add WiFi toggle prompts - framework
am:
82737b42a6
Change-Id: I5767478779bf20ad854a0992b73b3cd72737504c
Ben Lin [Tue, 13 Dec 2016 19:33:23 +0000 (19:33 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."" into nyc-mr2-dev am:
52a9e0e1dd -s ours
am:
0ca78d3f85 -s ours
Change-Id: I69db4438267a2f8d50d8f3fbde102d1c878a0520
Ben Lin [Tue, 13 Dec 2016 19:32:17 +0000 (19:32 +0000)]
DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal." am:
98e58262d2 -s ours
am:
233d21d06b -s ours
Change-Id: Ie7621980589c45ae0b3133b32cb3377600d2620b
Ben Lin [Tue, 13 Dec 2016 19:31:44 +0000 (11:31 -0800)]
DO NOT MERGE Using Activity#setTitle to have TalkBack announce root
traversal.
Bug:
32260739
Bug:
28275570
Change-Id: Ie3711e8ccbf588838a3f21346f317243516382bd
Ben Lin [Tue, 13 Dec 2016 19:22:19 +0000 (19:22 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."" into nyc-mr2-dev
am:
52a9e0e1dd -s ours
Change-Id: Ie172e5465319cab3b2fb220174ab9a05fd4b000a
Ben Lin [Tue, 13 Dec 2016 19:22:14 +0000 (19:22 +0000)]
DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."
am:
98e58262d2 -s ours
Change-Id: If75f6d0b7ea512f5b72f84af0e84f58c2c13b398
Kweku Adams [Sat, 10 Dec 2016 03:04:50 +0000 (19:04 -0800)]
Fixing issue in current and max duration calculations.
It looks like one operation was done out of order and some of the times used in
the calculations were leading to incorrect results.
BUG:
31023263
Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsDurationTimerTest
Change-Id: I417cc28c5a55748067b6c7f682a66fe3dbc09f09
Ben Lin [Tue, 13 Dec 2016 19:09:39 +0000 (19:09 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."" into nyc-mr2-dev
Ben Lin [Tue, 13 Dec 2016 19:01:14 +0000 (19:01 +0000)]
DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."
This reverts commit
4c80659e99b182492a4719560180079d23c1b338.
Change-Id: Id5fa68f37170e61e2e63fdb3a60e8a3db79c81fa
Lei Yu [Tue, 13 Dec 2016 19:03:11 +0000 (19:03 +0000)]
Merge "Add tint for edit and setting icon"
Lei Yu [Tue, 13 Dec 2016 19:01:50 +0000 (19:01 +0000)]
Merge "Add tint for plus & minus icon"
Romain Guy [Tue, 13 Dec 2016 18:24:33 +0000 (18:24 +0000)]
Merge "Pre-multiply gradient colors the right way"
Ivan Podogov [Tue, 13 Dec 2016 18:12:06 +0000 (18:12 +0000)]
Merge changes from topic 'f-radio-toggle' into cw-f-dev am:
e5592abb83 am:
c5700918aa
am:
554f58a5bc
Change-Id: I1a3eb0610845d12ad51c3127fc1c4b302a740577
Svetoslav Ganov [Tue, 13 Dec 2016 18:11:10 +0000 (18:11 +0000)]
Add WiFi toggle prompts - framework am:
82737b42a6 am:
e07563cc96
am:
ad096f8bab
Change-Id: I425323ef942f2133a65026edf7fb14bf9b980a2e
Svetoslav Ganov [Tue, 13 Dec 2016 18:10:13 +0000 (18:10 +0000)]
Add Bluetooth toggle prompts - framework am:
b1e2da7c24 am:
d23dc17754 -s ours
am:
9ec075a420
Change-Id: I7167c2f1bda4caa2d89c85ecbbe0f1602c9d04ce
Hakan Seyalioglu [Tue, 13 Dec 2016 00:15:38 +0000 (16:15 -0800)]
Don't auto-launch if switching to managed account
When the user picks the option to switch to a managed account, avoid
auto-launching the activity if there's only a single activity to pick
from.
Bug:
32669623
Test: Manual
Change-Id: Ieaed5885385929297304506ca2d5839e77043a64
Ivan Podogov [Tue, 13 Dec 2016 17:58:20 +0000 (17:58 +0000)]
Merge changes from topic 'f-radio-toggle' into cw-f-dev am:
e5592abb83
am:
c5700918aa
Change-Id: I44f2d9b7b015f5b38023479ce0e0ae329b663b80
Svetoslav Ganov [Tue, 13 Dec 2016 17:57:29 +0000 (17:57 +0000)]
Add WiFi toggle prompts - framework am:
82737b42a6
am:
e07563cc96
Change-Id: I033f5db461da6525f906f3d515bda3e322c13fb6
Svetoslav Ganov [Tue, 13 Dec 2016 17:56:38 +0000 (17:56 +0000)]
Add Bluetooth toggle prompts - framework am:
b1e2da7c24
am:
d23dc17754 -s ours
Change-Id: I04aebf2f5819bce363085482d0e52a06ecb624d8
Ivan Podogov [Tue, 13 Dec 2016 16:34:53 +0000 (16:34 +0000)]
resolve merge conflicts of
b1e2da7 to nyc-mr1-dev-plus-aosp
Test: build police
Change-Id: Ifec1ab6760ebb94b0b411c9c60f07066e151206b
TreeHugger Robot [Tue, 13 Dec 2016 17:40:23 +0000 (17:40 +0000)]
Merge "Remove unnecessary dependency, and fix the chain"
Manu Cornet [Tue, 13 Dec 2016 17:33:48 +0000 (17:33 +0000)]
Merge "Revert "Grid recents: tweak task header layout to better match mocks""
Mike Reed [Tue, 13 Dec 2016 17:32:37 +0000 (12:32 -0500)]
SkCanvas is no longer refcnted, use SkClipOps
Change-Id: I57469f56187f1ca8624e7a63968124ee925b4c04
Manu Cornet [Tue, 13 Dec 2016 17:32:20 +0000 (17:32 +0000)]
Revert "Grid recents: tweak task header layout to better match mocks"
This reverts commit
4701b993569cc5c9347571f84db8973a95c35495.
Change-Id: Id1a2f93f55b32e6544083254bb16e3d3722aa3dd
TreeHugger Robot [Tue, 13 Dec 2016 17:10:28 +0000 (17:10 +0000)]
Merge "Grid recents: tweak task header layout to better match mocks"
Lenka Trochtova [Tue, 13 Dec 2016 17:04:58 +0000 (17:04 +0000)]
Merge "Make UserManager#DISALLOW_OEM_UNLOCK a system API."
TreeHugger Robot [Tue, 13 Dec 2016 16:48:13 +0000 (16:48 +0000)]
Merge "Extract checking profiles for restrictions into a shared method."
Jeremy Joslin [Tue, 13 Dec 2016 16:31:19 +0000 (16:31 +0000)]
Merge "Make the onRequestRecommendation() method async." am:
fbeacb02c0 am:
a6c6bc333d am:
eb0a34f26b
am:
63c577c510 -s ours
Change-Id: I2ac19adab18e752207ab7bfb02bbfe0c0d0ccb53
Jeremy Joslin [Tue, 13 Dec 2016 16:25:44 +0000 (16:25 +0000)]
Merge "Make the onRequestRecommendation() method async." am:
fbeacb02c0 am:
a6c6bc333d
am:
eb0a34f26b
Change-Id: I62200f11d6be2bf83350255d9902dc67cf1a908e
Jeremy Joslin [Tue, 13 Dec 2016 16:19:14 +0000 (16:19 +0000)]
Merge "Make the onRequestRecommendation() method async." am:
fbeacb02c0
am:
a6c6bc333d
Change-Id: I56a830273f8e3246b598c2ea7a027b87e3066e16
Wyatt Riley [Tue, 13 Dec 2016 16:14:47 +0000 (16:14 +0000)]
Merge "Restoring Network Available Notification to AGnssRil"
Jeremy Joslin [Tue, 13 Dec 2016 16:13:44 +0000 (16:13 +0000)]
Merge "Make the onRequestRecommendation() method async."
am:
fbeacb02c0
Change-Id: I9b98480499c2366eee06de163b561c4583e475d2
Treehugger Robot [Tue, 13 Dec 2016 16:04:35 +0000 (16:04 +0000)]
Merge "Make the onRequestRecommendation() method async."
Ivan Podogov [Tue, 13 Dec 2016 16:02:45 +0000 (16:02 +0000)]
Merge changes from topic 'f-radio-toggle' into cw-f-dev
am:
e5592abb83
Change-Id: I7b7052c0402a73bda44db5970f96b6d7226361fc
Svetoslav Ganov [Tue, 13 Dec 2016 16:02:23 +0000 (16:02 +0000)]
Add WiFi toggle prompts - framework
am:
82737b42a6
Change-Id: Ia8958b54d04fff971b96fc6d29771eb94fd9b17e
Svetoslav Ganov [Tue, 13 Dec 2016 16:01:39 +0000 (16:01 +0000)]
Add Bluetooth toggle prompts - framework
am:
b1e2da7c24
Change-Id: I29c038d23488c504c838a85bd97c255b84919aab
Ivan Podogov [Tue, 13 Dec 2016 15:55:24 +0000 (15:55 +0000)]
Merge changes from topic 'f-radio-toggle' into cw-f-dev
* changes:
Add WiFi toggle prompts - framework
Add Bluetooth toggle prompts - framework
Manu Cornet [Tue, 22 Nov 2016 21:02:26 +0000 (13:02 -0800)]
Grid recents: tweak task header layout to better match mocks
Test: Checked layout on local sw600dp device
Bug:
32101881
Change-Id: Ic205beea47fc67fca9b3c95b3d1318c156ccc9c1
TreeHugger Robot [Tue, 13 Dec 2016 15:22:36 +0000 (15:22 +0000)]
Merge "Cleanup log spam on system notification post."
Lenka Trochtova [Tue, 29 Nov 2016 20:00:12 +0000 (21:00 +0100)]
Make UserManager#DISALLOW_OEM_UNLOCK a system API.
This is needed for unbundling of OobConfig app.
Test: gts-tradefed run gts -m GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerUserRestrictionTest#testDisallowOemUnlock_canSetWithSystemApi
Test: gts-tradefed run gts -m GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerUserRestrictionTest#testDisallowOemUnlock_doCannotSet
BUG:
32974379
Change-Id: I7710df96006821a5d0eddfe0b411dd3efa0e10f0
Tobias Thierer [Tue, 13 Dec 2016 14:01:53 +0000 (14:01 +0000)]
Merge "API changes for updating Locale to OpenJDK8u60, part 2" am:
c35137ce36 am:
7de23e292f am:
cd6720274d
am:
a5e128310e
Change-Id: I482b047e387c34487a031a4bb71d05799e31e621
Julia Reynolds [Fri, 9 Dec 2016 20:36:12 +0000 (15:36 -0500)]
Give assistant ability to modify channels.
Test: cts on same topic
Change-Id: Ia0db73d4d81a89e0821ba6a06f12823605dbea73
Julia Reynolds [Mon, 12 Dec 2016 13:51:08 +0000 (08:51 -0500)]
Cleanup log spam on system notification post.
Bug:
33209911
Test: unplug/replug adb cable, monitor log. runtest systemui-notifications
Change-Id: I294ccdcb0a353463fe0c6b52f1dbbd97f4c75079
Tobias Thierer [Tue, 13 Dec 2016 13:54:55 +0000 (13:54 +0000)]
Merge "API changes for updating Locale to OpenJDK8u60, part 2" am:
c35137ce36 am:
7de23e292f
am:
cd6720274d
Change-Id: Ic39bbbdb2f15da406ad75dfa805d198b01f84581
Tobias Thierer [Tue, 13 Dec 2016 13:48:39 +0000 (13:48 +0000)]
Merge "API changes for updating Locale to OpenJDK8u60, part 2" am:
c35137ce36
am:
7de23e292f
Change-Id: Id25c5050bb798ec206e86a83260a3bee9510e52c
Tobias Thierer [Tue, 13 Dec 2016 13:42:50 +0000 (13:42 +0000)]
Merge "API changes for updating Locale to OpenJDK8u60, part 2"
am:
c35137ce36
Change-Id: Ibbf80ffe75bdbbc5da343e139bd80bc70afe4794
Tobias Thierer [Tue, 13 Dec 2016 13:36:07 +0000 (13:36 +0000)]
Merge "API changes for updating Locale to OpenJDK8u60, part 2"
Leon Scroggins III [Mon, 12 Dec 2016 20:31:39 +0000 (15:31 -0500)]
Remove unnecessary dependency, and fix the chain
Test: No new tests. This should not affect behavior; only dependencies.
Font.h does not need to include SkGlyphCache.h, and doing so requires
a transitive dependency on external/skia/src/utils, which was not
intended. Forward declare it instead, and fix the build errors that
resulted.
Change-Id: Ifd09430bb848d51b139df0f0c06c63e7e48711eb
Donghyun Cho [Tue, 13 Dec 2016 11:13:40 +0000 (11:13 +0000)]
Merge "Enable sendKeyEvent() for all types of devices"
Andrew Scull [Wed, 7 Dec 2016 10:37:41 +0000 (10:37 +0000)]
Extract checking profiles for restrictions into a shared method.
Test: m RunSettingsLibRoboTests
Change-Id: Ie8fd3121771a7a2213ee441aef5a0746ad09a6c9
Donghyun Cho [Fri, 2 Dec 2016 06:31:52 +0000 (15:31 +0900)]
Enable sendKeyEvent() for all types of devices
Previously there was only sendKeyEvent() implementation for TV and the
method was no-op for other devices. This change moves the event handling
logic into HdmiCecLocalDevice so as to make this method work on the
playback device.
Bug:
33285033
Test: Sent key event from playback device, and it worked.
Change-Id: I937502ab87ce823630b0f9a933355d5a4cc5e96a
Hugo Benichi [Tue, 13 Dec 2016 04:23:21 +0000 (04:23 +0000)]
Merge "DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents" into nyc-mr2-dev am:
8b43f6eb02
am:
c2d38afdf3 -s ours
Change-Id: I9810fd2fec02285cc8c09ed10cb8386fadd15738
Hugo Benichi [Tue, 13 Dec 2016 04:22:20 +0000 (04:22 +0000)]
DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents am:
97d10ffcad
am:
b37d43b83c -s ours
Change-Id: Ie3547d74cdbf3a5333f3951b9375b00224c2ecd0
Hugo Benichi [Tue, 13 Dec 2016 04:21:18 +0000 (04:21 +0000)]
Merge "DO NOT MERGE IpConnectivityMetrics reads buffer size in settings" into nyc-mr2-dev am:
6674f7a3b4
am:
897ff1c5ad -s ours
Change-Id: I1ad2490adc9266aeba0dd0b47c965ba395784106
Hugo Benichi [Tue, 13 Dec 2016 04:20:19 +0000 (04:20 +0000)]
DO NOT MERGE IpConnectivityMetrics reads buffer size in settings am:
ff0b58627f
am:
fbbf03a3c2 -s ours
Change-Id: Iecbd16612359797223c1a8b2885f20bdcc71b543
Hugo Benichi [Tue, 13 Dec 2016 04:19:22 +0000 (04:19 +0000)]
Merge "DO NOT MERGE TokenBucket for rate-limiting and throttling" into nyc-mr2-dev am:
d4f09b83bd
am:
eb11cc679a -s ours
Change-Id: I4208375ecd299f58216a773ce2abca7ba305d7ea
Hugo Benichi [Tue, 13 Dec 2016 04:18:30 +0000 (04:18 +0000)]
DO NOT MERGE TokenBucket for rate-limiting and throttling am:
f6fdb4a552
am:
21f9e044b3 -s ours
Change-Id: I6e217ebef11eb7a508922bdbf41ba06843557987
Hugo Benichi [Tue, 13 Dec 2016 04:17:29 +0000 (04:17 +0000)]
Merge "DO NOT MERGE IpConnectivity metrics: add version number" into nyc-mr2-dev am:
16ec47d50f
am:
93569ea2b8 -s ours
Change-Id: I80fbb8a94b162d5b080fd5480a68c5a4045dab01
Hugo Benichi [Tue, 13 Dec 2016 04:16:21 +0000 (04:16 +0000)]
DO NOT MERGE IpConnectivity metrics: add version number am:
31cf55bdfe
am:
064d4f183c -s ours
Change-Id: I3c7e1476cf46cd03ea77b3a9bdcf30264fe2bcd7
Hugo Benichi [Tue, 13 Dec 2016 04:09:56 +0000 (04:09 +0000)]
Merge "DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents" into nyc-mr2-dev
am:
8b43f6eb02
Change-Id: If2878fe4eec7683077be32bf167e7a309035c7ce
Hugo Benichi [Tue, 13 Dec 2016 04:09:49 +0000 (04:09 +0000)]
DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents
am:
97d10ffcad
Change-Id: I266f7b8da58513b1e6c1a9c2b37e528ba777a7d6
Hugo Benichi [Tue, 13 Dec 2016 04:08:26 +0000 (04:08 +0000)]
Merge "DO NOT MERGE IpConnectivityMetrics reads buffer size in settings" into nyc-mr2-dev
am:
6674f7a3b4
Change-Id: I24685ad75f67a59e20190c5dbb28ef43fa5bc8f4
Hugo Benichi [Tue, 13 Dec 2016 04:08:18 +0000 (04:08 +0000)]
DO NOT MERGE IpConnectivityMetrics reads buffer size in settings
am:
ff0b58627f
Change-Id: I5c433faa0d43202ae1169fdba4c42c09dd9c17dd
Hugo Benichi [Tue, 13 Dec 2016 04:06:52 +0000 (04:06 +0000)]
Merge "DO NOT MERGE TokenBucket for rate-limiting and throttling" into nyc-mr2-dev
am:
d4f09b83bd
Change-Id: Ibbfe986099127a8ff31c6b40482ab206a5ff4dcd
Hugo Benichi [Tue, 13 Dec 2016 04:06:45 +0000 (04:06 +0000)]
DO NOT MERGE TokenBucket for rate-limiting and throttling
am:
f6fdb4a552
Change-Id: I82e17c2ed074ae37d469adb1f469b6ff1d6365d2
TreeHugger Robot [Tue, 13 Dec 2016 04:05:47 +0000 (04:05 +0000)]
Merge "AutoFill Framework refactoring."
Hugo Benichi [Tue, 13 Dec 2016 04:05:16 +0000 (04:05 +0000)]
Merge "DO NOT MERGE IpConnectivity metrics: add version number" into nyc-mr2-dev
am:
16ec47d50f
Change-Id: I523d75980de418f7674ee4882525e8ae9423d877
Hugo Benichi [Tue, 13 Dec 2016 04:05:08 +0000 (04:05 +0000)]
DO NOT MERGE IpConnectivity metrics: add version number
am:
31cf55bdfe
Change-Id: Iccdf7d09ef4dc80f05c76774c456b5effb2c08c7
Bill Yi [Tue, 13 Dec 2016 04:00:09 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
c95e7a56c1 -s ours
am:
4a527ed671 -s ours
Change-Id: I48f7c60855f6fff11dad0836f0ad2988854132c6
Bill Yi [Tue, 13 Dec 2016 03:59:09 +0000 (03:59 +0000)]
Import translations. DO NOT MERGE am:
e6e588d21a -s ours
am:
bafd58a6d3 -s ours
Change-Id: Ia37084af38f3a4af9eb0e61ddad28a32d1b8146e
Hugo Benichi [Tue, 13 Dec 2016 03:56:50 +0000 (03:56 +0000)]
Merge "Fix IP connectivity metrics tests"
Hugo Benichi [Tue, 13 Dec 2016 03:55:29 +0000 (03:55 +0000)]
Merge "DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents" into nyc-mr2-dev
Hugo Benichi [Tue, 13 Dec 2016 03:54:21 +0000 (03:54 +0000)]
Merge "DO NOT MERGE IpConnectivityMetrics reads buffer size in settings" into nyc-mr2-dev
Hugo Benichi [Tue, 13 Dec 2016 03:54:14 +0000 (03:54 +0000)]
Merge "DO NOT MERGE TokenBucket for rate-limiting and throttling" into nyc-mr2-dev
Bill Yi [Tue, 13 Dec 2016 03:52:56 +0000 (03:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
c95e7a56c1 -s ours
Change-Id: Ia35c684ae43442ad389ffde0ad0276c8d69f3bea
OSDN Git Service
