OSDN Git Service
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
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
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."
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
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"
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
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
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:42:55 +0000 (03:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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
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
sghuman [Tue, 13 Dec 2016 02:08:39 +0000 (02:08 +0000)]
Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests."
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
Ben Lin [Tue, 13 Dec 2016 01:34:39 +0000 (01:34 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev
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
Josh Gao [Tue, 13 Dec 2016 00:55:32 +0000 (00:55 +0000)]
Merge "Add trace category for adb." am:
6968d90dc5 am:
15dc5951e6
am:
96446b5bd3
Change-Id: I1d354df518f19d61eaa17e03fd696193464b6f7b
Felipe Leme [Tue, 13 Dec 2016 00:54:22 +0000 (00:54 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am:
ff93f927e4 -s ours am:
c398c0fc8d -s ours
am:
f93437d683
Change-Id: Ic77fec13bfac6f94b6297920fc304ad50af2ca8b
Android Build Merger (Role) [Tue, 13 Dec 2016 00:44:25 +0000 (00:44 +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
Jerry Zhang [Tue, 13 Dec 2016 00:42:47 +0000 (00:42 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am:
1975240f17 am:
830874dbe7
am:
88672d7d29
Change-Id: Ic083ac68e2a6acaa211cfb8baaf3b9ea0bbe47e2
Josh Gao [Tue, 13 Dec 2016 00:42:42 +0000 (00:42 +0000)]
Merge "Add trace category for adb." am:
6968d90dc5
am:
15dc5951e6
Change-Id: I1e60464308807f09a4d89ee4c0fc1a007fb1be88
Hugo Benichi [Tue, 13 Dec 2016 00:41:44 +0000 (00:41 +0000)]
Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev
am:
e40bb555d8
Change-Id: I7981b678c7043b0680339178f5e3a86d456b60f2
Hugo Benichi [Tue, 13 Dec 2016 00:41:39 +0000 (00:41 +0000)]
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
am:
a61684feb4
Change-Id: I2e79e9fb5d2324d2b008bc1e4263d3bdeaf3752d
Felipe Leme [Tue, 13 Dec 2016 00:41:15 +0000 (00:41 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am:
ff93f927e4 -s ours
am:
c398c0fc8d -s ours
Change-Id: I44dd708ba7b890cc54f27cdcee7334c25a215411
Jerry Zhang [Tue, 13 Dec 2016 00:37:12 +0000 (00:37 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am:
1975240f17
am:
830874dbe7
Change-Id: I930f006ffd7a429379638aa4f8268ed443a3696b
Josh Gao [Tue, 13 Dec 2016 00:36:54 +0000 (00:36 +0000)]
Merge "Add trace category for adb."
am:
6968d90dc5
Change-Id: Id542769172f3d40221a6b20ea8af1db5a70abfd1
Hugo Benichi [Tue, 13 Dec 2016 00:35:17 +0000 (00:35 +0000)]
Merge changes Ic83c3f8f,I7ed954de,I7780c389 into nyc-mr2-dev
am:
d792f9d032
Change-Id: I4974f56b4c47f55e337e7f0ca5fb5cbd35b581b1
Hugo Benichi [Tue, 13 Dec 2016 00:35:08 +0000 (00:35 +0000)]
DO NOT MERGE NetworkMonitor: send one DNS probe per web probe
am:
eb5e9aa2ce
Change-Id: I2e3d9794e56d434f838ead9f12ee4edc74a3d6f2
Hugo Benichi [Tue, 13 Dec 2016 00:34:19 +0000 (00:34 +0000)]
DO NOT MERGE NetworkMonitor metrics: add first validation information
am:
dd22982e25
Change-Id: I9540a8357fd44cfcb17b244c66e5883f3a1a100b
Hugo Benichi [Tue, 13 Dec 2016 00:32:46 +0000 (00:32 +0000)]
DO NOT MERGE Captive portal systel log improvements
am:
a4f17bcbdf
Change-Id: Icbba206e8c035f566ff6d9e500d972a3dcf65bb6
Hugo Benichi [Tue, 13 Dec 2016 00:31:21 +0000 (00:31 +0000)]
Merge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev
am:
4efaee1d0f
Change-Id: I70780ebd72fc756a28d1d46ad4a029c29a75f9c4
Hugo Benichi [Tue, 13 Dec 2016 00:31:16 +0000 (00:31 +0000)]
DO NOT MERGE APF: also drop any ICMPv6 RSs
am:
0cc49bb5bc
Change-Id: I8788a2572bbf7e7b4004c8fb83aa22c560438db7
Felipe Leme [Tue, 13 Dec 2016 00:30:21 +0000 (00:30 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4."
am:
ff93f927e4 -s ours
Change-Id: I9cf0ed46073b2cf8af33e61df77aa7c0ec168344
Josh Gao [Tue, 13 Dec 2016 00:28:09 +0000 (00:28 +0000)]
Merge "Add trace category for adb."
Hugo Benichi [Tue, 13 Dec 2016 00:27:32 +0000 (00:27 +0000)]
Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev
Jerry Zhang [Tue, 13 Dec 2016 00:26:33 +0000 (00:26 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers."
am:
1975240f17
Change-Id: I4b6532719b848ba4b595c8069ecbbd42e855382b
Hugo Benichi [Tue, 6 Dec 2016 06:36:30 +0000 (15:36 +0900)]
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
Logging improvements to help debugging captive portal issues.
Test: manually tested
Bug:
33126342
(cherry picked from commit
87de0c206709d3a170649b535a973de8f9c0fb0c)
Change-Id: I3ac1773e07827194d854ebad4c27c48da106154b
Hugo Benichi [Tue, 13 Dec 2016 00:22:31 +0000 (00:22 +0000)]
Merge changes Ic83c3f8f,I7ed954de,I7780c389 into nyc-mr2-dev
* changes:
DO NOT MERGE NetworkMonitor: send one DNS probe per web probe
DO NOT MERGE NetworkMonitor metrics: add first validation information
DO NOT MERGE Captive portal systel log improvements
Hugo Benichi [Tue, 13 Dec 2016 00:21:43 +0000 (00:21 +0000)]
Merge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev
Treehugger Robot [Tue, 13 Dec 2016 00:18:56 +0000 (00:18 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4."
Jerry Zhang [Tue, 13 Dec 2016 00:12:04 +0000 (00:12 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers."
Xiaohui Chen [Mon, 12 Dec 2016 23:48:05 +0000 (23:48 +0000)]
Merge "sysui: add assets and dimentions for sw900dp" into nyc-mr2-dev
am:
f400349eb9
Change-Id: Id12cf6f0ea67266f5ee63ea03910980a1211f36d
Xiaohui Chen [Mon, 12 Dec 2016 23:42:50 +0000 (23:42 +0000)]
sysui: add assets and dimentions for sw900dp
am:
376b1756d4
Change-Id: I4df31eea74b4978a4e8711730507e5d26877431d
Xiaohui Chen [Mon, 12 Dec 2016 23:36:51 +0000 (23:36 +0000)]
Merge "sysui: add assets and dimentions for sw900dp" into nyc-mr2-dev
Bill Yi [Mon, 12 Dec 2016 23:29:24 +0000 (15:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iac15928717cf7dc2caa8a2ed0c0e9fb7d6d09011
Auto-generated-cl: translation import
Felipe Leme [Mon, 12 Dec 2016 23:24:00 +0000 (23:24 +0000)]
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." am:
d0fdf7aba3 -s ours am:
9f0030a98a -s ours
am:
edb11059e7
Change-Id: Ifbe3d0abcdfe61f519fd3dfe7727d430534b4f61
sghuman [Mon, 12 Dec 2016 23:18:31 +0000 (23:18 +0000)]
Merge "Fix erroneous constructor in ScoredNetwork.java" am:
9d55f43719 am:
eaed9ef0b7
am:
60a850b670
Change-Id: I2c3de5b2cb0d60fc4aef08256939b50e67d7aa53
Felipe Leme [Mon, 12 Dec 2016 23:18:29 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." am:
d0fdf7aba3 -s ours
am:
9f0030a98a -s ours
Change-Id: Ifd564eb7e8260b0642805abf4621d77c0381a5a2
sghuman [Mon, 12 Dec 2016 23:12:36 +0000 (23:12 +0000)]
Merge "Fix erroneous constructor in ScoredNetwork.java" am:
9d55f43719
am:
eaed9ef0b7
Change-Id: I0314c02497dcabd6f3fa1caeb665ff5ecb9a0f59
Felipe Leme [Mon, 12 Dec 2016 23:12:25 +0000 (23:12 +0000)]
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."
am:
d0fdf7aba3 -s ours
Change-Id: I3720f2e2fd0c78c9d45e0b26e7157902a32fae76
sghuman [Mon, 12 Dec 2016 23:07:22 +0000 (23:07 +0000)]
Merge "Fix erroneous constructor in ScoredNetwork.java"
am:
9d55f43719
Change-Id: I6f24c92a9638f91197a4d17bfdc3fbeeede3daf4
Treehugger Robot [Mon, 12 Dec 2016 23:00:17 +0000 (23:00 +0000)]
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."
Sundeep Ghuman [Wed, 30 Nov 2016 03:56:48 +0000 (19:56 -0800)]
Copy WifiNetworkScoreCache into frameworks/base. Add tests.
Begin process of migrating WifiNetworkScoreCache.java from System Server
(//frameworks/opt/net/wifi/service/java/com/android/server/wifi/) to a
SystemApi. This CL is a straight copy and paste of
WifiNetworkScoreCache.java. Only new code is located in
WifiNetworkScoreCacheTest.java
Bug: b/
33050254
Test: Unit tests added to cover most common use cases.
Change-Id: I7510420d293339ce7811fcf71a6efceb8d809c3a
sghuman [Mon, 12 Dec 2016 22:53:18 +0000 (22:53 +0000)]
Merge "Fix erroneous constructor in ScoredNetwork.java"
Sundeep Ghuman [Mon, 12 Dec 2016 22:36:03 +0000 (14:36 -0800)]
Fix erroneous constructor in ScoredNetwork.java
Test: Unit tests in ag/310934.
Change-Id: I0075b15f59796872ea9779c04373563607d2f883
Felipe Leme [Fri, 12 Aug 2016 22:19:40 +0000 (15:19 -0700)]
DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4.
BUG:
30839080
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
(cherry picked from Ic192334389eed7596e1f7cb8ce98a5169262418c)
Change-Id: I90cf55ad948bbe0883473431f40201cf4206dc82
Felipe Leme [Wed, 10 Aug 2016 21:46:39 +0000 (14:46 -0700)]
DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest.
NetworkPolicyManagerServiceTest had many tests there were @Suppressed
because they were obsolete and harder to fix using Easymocks.
This CL replaced EasyMock by Mockito and re-enabled most tests, although
some tests were removed because:
- It's underlying logic changed too much that.
- It would be hard to mock all external entities they interact with.
- They are covered by CTS tests.
Bug:
30764608
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
(cherry picked from commit I53ff86fc9b64cb058846f1aefa244771630d9e1e)
Change-Id: Ia9cdb780cb0917477b310dc38d2e39731d6a7609
Marie Janssen [Mon, 12 Dec 2016 21:46:06 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am:
47e1f497c0 -s ours am:
964f769d63 -s ours
am:
2e4d0c765f
Change-Id: I8a68cdea6ec1e227ac3b179b8b82221a38365f0c
Marie Janssen [Mon, 12 Dec 2016 21:40:10 +0000 (21:40 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am:
47e1f497c0 -s ours
am:
964f769d63 -s ours
Change-Id: I3bf8b667f00da5c517d382a7e710b1556a41116e
Joe LaPenna [Mon, 12 Dec 2016 21:39:55 +0000 (21:39 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager." am:
9b430e0395 am:
2bc66bf601
am:
b52989c736
Change-Id: I06dcc86f7e11e0db205f712b41dd3e7d0194bb36
Marie Janssen [Mon, 12 Dec 2016 21:34:39 +0000 (21:34 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework"
am:
47e1f497c0 -s ours
Change-Id: Ifa6abd776e6752c0eb1ac0bc41d51f9ebdddc490
Joe LaPenna [Mon, 12 Dec 2016 21:34:30 +0000 (21:34 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager." am:
9b430e0395
am:
2bc66bf601
Change-Id: Idaa23641c8e95890271c554dee0244702601a109
Joe LaPenna [Mon, 12 Dec 2016 21:28:29 +0000 (21:28 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager."
am:
9b430e0395
Change-Id: Ib14979d168f4e37ab2f8de0737abe94cc6c8b16d
Marie Janssen [Mon, 12 Dec 2016 21:27:23 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework"
Treehugger Robot [Mon, 12 Dec 2016 21:14:56 +0000 (21:14 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager."
Jason Monk [Mon, 12 Dec 2016 20:33:57 +0000 (20:33 +0000)]
Merge "Fix animations for app QS tiles." into nyc-mr2-dev
am:
eb3623c7dd
Change-Id: Ifcc88360b7e059ce0dd9f40ea2d9107e36e3bb5a
Jason Monk [Mon, 12 Dec 2016 20:33:51 +0000 (20:33 +0000)]
Fix animations for app QS tiles.
am:
d2274f848c
Change-Id: I32fdb2e9047e402650e374024fcc7cb39b2a83f9
Josh Gao [Tue, 29 Nov 2016 18:57:01 +0000 (10:57 -0800)]
Add trace category for adb.
Bug: http://b/
31289465
Test: systrace
Change-Id: I765c55c264329227556ff25655e3f00c5c3e8b54
Jason Monk [Mon, 12 Dec 2016 20:32:02 +0000 (20:32 +0000)]
Merge "Fix loading bar positioning." into nyc-mr2-dev
am:
50a3327bbf
Change-Id: Ifbc58bd82744f6a0b06e3547d08026f68838465b
Jason Monk [Mon, 12 Dec 2016 20:31:56 +0000 (20:31 +0000)]
Fix loading bar positioning.
am:
76bf8eb3d6
Change-Id: Ibf167360200be9969c1c725d84e4b9b9e442f553
Jason Monk [Mon, 12 Dec 2016 20:22:19 +0000 (20:22 +0000)]
Merge "Fix animations for app QS tiles." into nyc-mr2-dev
Jason Monk [Mon, 12 Dec 2016 20:21:56 +0000 (20:21 +0000)]
Merge "Fix loading bar positioning." into nyc-mr2-dev
Android Build Merger (Role) [Mon, 12 Dec 2016 19:56:48 +0000 (19:56 +0000)]
Merge "Merge "Add missing API diffs for support library 25.1.0" into nyc-mr2-dev am:
bf5c5f8981" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Mon, 12 Dec 2016 19:56:23 +0000 (19:56 +0000)]
Merge "Add missing API diffs for support library 25.1.0 am:
f11879ae94" into nyc-mr2-dev-plus-aosp
OSDN Git Service
