OSDN Git Service
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
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
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""
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
Bill Yi [Tue, 13 Dec 2016 03:52:51 +0000 (03:52 +0000)]
Import translations. DO NOT MERGE
am:
e6e588d21a -s ours
Change-Id: Id2dc541ef35ca1fb55bf8d36952e2b155ed3a76c
Hugo Benichi [Tue, 13 Dec 2016 03:52:38 +0000 (03:52 +0000)]
Merge "DO NOT MERGE IpConnectivity metrics: add version number" into nyc-mr2-dev
TreeHugger Robot [Tue, 13 Dec 2016 03:43:43 +0000 (03:43 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 13 Dec 2016 03:42:55 +0000 (03:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 13 Dec 2016 03:42:14 +0000 (03:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Romain Guy [Tue, 13 Dec 2016 02:21:32 +0000 (18:21 -0800)]
Pre-multiply gradient colors the right way
Alpha pre-multiplication must be done after applying the
opto-electronic transfer function when linear blending is
disabled. The correct way would be to pre-multiply before
gamma encoding but this leads to improper blending which
cannot be corrected without using sRGB frame buffers and
texture sampling.
Bug:
33010587
Test: cts-tradefed run singleCommand cts-dev --module CtsUiRenderingTestCases --test android.uirendering.cts.testclasses.GradientTests
Change-Id: I5f04bda4cb9f63674537aef5931621c14d601884
sghuman [Tue, 13 Dec 2016 02:40:46 +0000 (02:40 +0000)]
Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests." am:
a895081335 am:
9b2760dbe5 am:
b2f7005f07
am:
e071e13501
Change-Id: If21ebbb25a5fe557c37e4cbc265dfe2efb6d2305
Sundeep Ghuman [Tue, 13 Dec 2016 02:35:09 +0000 (02:35 +0000)]
Copy WifiNetworkScoreCache into frameworks/base. Add tests. am:
46169f946b am:
e436024c65 am:
c600c4058b
am:
e4fb9aaa3f
Change-Id: I311fb02b2d0a2f12a0f76411de61074145b9077e
sghuman [Tue, 13 Dec 2016 02:34:45 +0000 (02:34 +0000)]
Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests." am:
a895081335 am:
9b2760dbe5
am:
b2f7005f07
Change-Id: I90266a56558bd64219c4be053100181198c7fedb
Sundeep Ghuman [Tue, 13 Dec 2016 02:29:32 +0000 (02:29 +0000)]
Copy WifiNetworkScoreCache into frameworks/base. Add tests. am:
46169f946b am:
e436024c65
am:
c600c4058b
Change-Id: Ia14819d997d93bac4080409f4841207fc864ea65
sghuman [Tue, 13 Dec 2016 02:29:14 +0000 (02:29 +0000)]
Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests." am:
a895081335
am:
9b2760dbe5
Change-Id: Ia4c873cc5425175b86f909b6aa3798074521467a
Sundeep Ghuman [Tue, 13 Dec 2016 02:23:42 +0000 (02:23 +0000)]
Copy WifiNetworkScoreCache into frameworks/base. Add tests. am:
46169f946b
am:
e436024c65
Change-Id: I9f9310feaa19385bb9287c959c2f2d3a9642e3b9
sghuman [Tue, 13 Dec 2016 02:23:15 +0000 (02:23 +0000)]
Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests."
am:
a895081335
Change-Id: I779eabea94d67d01ac29b49a68456daf9dd19013
Hugo Benichi [Tue, 13 Dec 2016 02:23:02 +0000 (02:23 +0000)]
Merge "Unit tests for NetworkNotificationManager"
Felipe Leme [Tue, 29 Nov 2016 01:21:21 +0000 (17:21 -0800)]
AutoFill Framework refactoring.
The AutoFill Framework uses the same AssitStructure provided by the Assist API
and so far it was using the same methods as well, both internally and externally
(public API).
Sharing that internal code internally is fine, but the public APIs must distinguish between the 2 cases so they can fill the assist structures accordingly (although the initial implementation still shares the same logic).
This CL also splits the original 'auto-fill' request in 2 types of requests,
which are set by View flags:
- ASSIST_FLAG_SANITIZED_TEXT
- ASSIST_FLAG_NON_SANITIZED_TEXT
It also added new methods and callbacks to handle save requests.
Bug:
31001899
Test: manual verification
Change-Id: I4eb09099dc19a43cb7e053e64d939aed3704b410
Sundeep Ghuman [Tue, 13 Dec 2016 02:18:21 +0000 (02:18 +0000)]
Copy WifiNetworkScoreCache into frameworks/base. Add tests.
am:
46169f946b
Change-Id: Id3ce970efaea32d0d0a2fa5594b91628e2f3d1df
jackqdyulei [Tue, 13 Dec 2016 02:17:10 +0000 (18:17 -0800)]
Add tint for plus & minus icon
Bug:
32592245
Test: Manual
Change-Id: I9c3278c87bc669b69cf2d9d571b9935a6ef846ac
sghuman [Tue, 13 Dec 2016 02:08:39 +0000 (02:08 +0000)]
Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests."
Ben Lin [Tue, 13 Dec 2016 01:58:48 +0000 (01:58 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev am:
50e8e64c45 -s ours
am:
279845e54c -s ours
Change-Id: If7728696791b206a62185b157206cd5376092198
Ben Lin [Tue, 13 Dec 2016 01:57:41 +0000 (01:57 +0000)]
DO NOT MERGE ANYWHERE am:
4c80659e99 -s ours
am:
6f67f964c3 -s ours
Change-Id: I219054dfb871e09c8b788344737c2d2aa5adc99d
Jeremy Joslin [Thu, 8 Dec 2016 18:24:02 +0000 (10:24 -0800)]
Make the onRequestRecommendation() method async.
Converted the NetworkRecommendationProvider.onRequestRecommendation()
method into an async call to give implementors more flexibility.
Added unit tests for NetworkRecommendationProvider.
Test: Added NetworkRecommendationProviderTest.
BUG:
32909424
Change-Id: I8c1d2e11baa539744d77a012e85351f750523e3b
Merged-In: Iebe72f260133e9ad1946b0b75e2f69635e154ef3
Ben Lin [Tue, 13 Dec 2016 01:46:11 +0000 (01:46 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev
am:
50e8e64c45 -s ours
Change-Id: I1ef606566d2c1dfbe6ff273e073a45b72a0d788f
Ben Lin [Tue, 13 Dec 2016 01:46:07 +0000 (01:46 +0000)]
DO NOT MERGE ANYWHERE
am:
4c80659e99 -s ours
Change-Id: I1d5b79452fcca235e8026cab583040db69aff1e6
TreeHugger Robot [Tue, 13 Dec 2016 01:44:38 +0000 (01:44 +0000)]
Merge "Only checking activity state to determine visibility when entering PiP."
TreeHugger Robot [Tue, 13 Dec 2016 01:38:51 +0000 (01:38 +0000)]
Merge "Fixed window ordering issue with TYPE_VOICE_INTERACTION."
Ben Lin [Tue, 13 Dec 2016 01:34:39 +0000 (01:34 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev
TreeHugger Robot [Tue, 13 Dec 2016 01:34:21 +0000 (01:34 +0000)]
Merge "Make the onRequestRecommendation() method async."
Hugo Benichi [Tue, 18 Oct 2016 01:36:33 +0000 (10:36 +0900)]
DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).
Test: new test in IpConnectivityMetricsTest
Bug:
1550402
(cherry picked from commit
e1c173d2240a8eedf7685c9371087dc047a6931f)
Change-Id: Ibe41e9a76db36ea502697a5f19fc0d91c40a3087
Hugo Benichi [Wed, 19 Oct 2016 02:17:28 +0000 (11:17 +0900)]
DO NOT MERGE IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug:
32198637
(cherry pick from commit
05686dbb6b965eb1a54591d2ed2334337886c6ee)
Change-Id: Ie7ca1638533479601c5983bb6e54705003561b6c
Hugo Benichi [Mon, 17 Oct 2016 23:43:30 +0000 (08:43 +0900)]
DO NOT MERGE TokenBucket for rate-limiting and throttling
This patch adds a TokenBucket class that can accumulate and distribute
tokens over time.
Test: comes with unit tests.
Bug:
32198637
(cherry picked from commit
998493f0ee39ae0e9ffdea27f48f1b11b0807fcb)
Change-Id: Iaf477c7bb14f8ddb293b7a907e2ab0cf76d09e07
Hugo Benichi [Thu, 13 Oct 2016 04:16:16 +0000 (13:16 +0900)]
DO NOT MERGE IpConnectivity metrics: add version number
This patch adds a version field to ipconnectivity.proto and populates it
to 2, which is the logical version number for NYC-MR2.
Test: IpConnectivity{EventBuilder,Metrics}Test pass
Bug:
32127906
(cherry picked from commit
d680d4c856f54bea0c60dea74ba4204822391e49)
Change-Id: I5f37633afd9ec82f5402c5b6670fe2febae82a14
jackqdyulei [Tue, 13 Dec 2016 01:17:57 +0000 (17:17 -0800)]
Add tint for edit and setting icon
Bug:
32592245
Test: Manual
Change-Id: Ibed4eca205afce44d50440f56b77edadf9a47505
Josh Gao [Tue, 13 Dec 2016 01:10:22 +0000 (01:10 +0000)]
Merge "Add trace category for adb." am:
6968d90dc5 am:
15dc5951e6 am:
96446b5bd3
am:
19c4422c7c
Change-Id: I33a39902df365cf60cd5976d7977e18d36c09bc0
Felipe Leme [Tue, 13 Dec 2016 01:09:15 +0000 (01:09 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am:
ff93f927e4 -s ours am:
c398c0fc8d -s ours am:
f93437d683
am:
bc5f9ad9ff -s ours
Change-Id: I6ccc0774f8d4caa1c91d98bc1860df9180be0849
Jerry Zhang [Tue, 13 Dec 2016 01:08:08 +0000 (01:08 +0000)]
Merge "Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am:
1975240f17 am:
830874dbe7 am:
88672d7d29" into nyc-mr2-dev-plus-aosp
am:
49950e68b2
Change-Id: I6d111eb8c4afef7cb0615153c2949b0a3cf2155d
Jerry Zhang [Tue, 13 Dec 2016 01:02:55 +0000 (01:02 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am:
1975240f17 am:
830874dbe7 am:
88672d7d29
am:
11dc0eccfb
Change-Id: Ibafebe4877052595cb34626bde9ac6fba1983fb0
Android Build Merger (Role) [Tue, 13 Dec 2016 00:57:25 +0000 (00:57 +0000)]
Merge "Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev am:
e40bb555d8 am:
0522f09bac -s ours"
OSDN Git Service
