OSDN Git Service
Paul Stewart [Sat, 28 Jan 2017 02:00:50 +0000 (02:00 +0000)]
Account for null client certificate am:
1ca57a1d10 am:
4ad314b463
am:
25eff7731a
Change-Id: I2bd868e534ca1a5960ac9855bd40a91f705b9772
Paul Stewart [Sat, 28 Jan 2017 01:59:40 +0000 (01:59 +0000)]
Add a client chain to WifiEnterpriseConfig am:
291ddaef78 am:
cd463ff269
am:
80b5793645
Change-Id: I11310cfd06db4357ec1ee94139ebdb2e2f40f771
Paul Stewart [Sat, 28 Jan 2017 01:53:52 +0000 (01:53 +0000)]
Account for null client certificate am:
1ca57a1d10
am:
4ad314b463
Change-Id: I50138c766a4ca1f697bbe4c2285bc0bc8c2985f4
Paul Stewart [Sat, 28 Jan 2017 01:52:43 +0000 (01:52 +0000)]
Add a client chain to WifiEnterpriseConfig am:
291ddaef78
am:
cd463ff269
Change-Id: I3625766bb97cf2bf4ab8a6a0d518c2b876069e23
Paul Stewart [Sat, 28 Jan 2017 01:45:53 +0000 (01:45 +0000)]
Account for null client certificate
am:
1ca57a1d10
Change-Id: Id999634bb25a379a5cfdb47412323d2cc6d0cd30
Paul Stewart [Sat, 28 Jan 2017 01:45:05 +0000 (01:45 +0000)]
Add a client chain to WifiEnterpriseConfig
am:
291ddaef78
Change-Id: Ic8451631732bd3bfce7ff08f9f37b18745cda357
Brad Ebinger [Fri, 27 Jan 2017 23:13:36 +0000 (23:13 +0000)]
Merge "Adds @hide ImsResolver API and device overlays (2/3)" am:
d063843549 am:
b5f2519abc
am:
18140a6784
Change-Id: I1c29dcbdd4f1f1f97bf2e3eb3a1f0bdc83613676
Brad Ebinger [Fri, 27 Jan 2017 23:08:31 +0000 (23:08 +0000)]
Merge "Adds @hide ImsResolver API and device overlays (2/3)" am:
d063843549
am:
b5f2519abc
Change-Id: I54c577f6c4bd68f6328572651315e056270ee807
John Reck [Fri, 27 Jan 2017 23:05:52 +0000 (23:05 +0000)]
Merge "Fix a bunch of repeated reads of a ro.* property" am:
4265991701 am:
e4c2e8f303
am:
3c2837e77e
Change-Id: Idbcb9dfeac57036d3621474ee65ba967cc7bc499
Brad Ebinger [Fri, 27 Jan 2017 23:03:47 +0000 (23:03 +0000)]
Merge "Adds @hide ImsResolver API and device overlays (2/3)"
am:
d063843549
Change-Id: I82a38c0cb2b7b229b96f0a617f8b7c921eb6d3a9
John Reck [Fri, 27 Jan 2017 23:02:41 +0000 (23:02 +0000)]
Merge "Fix a bunch of repeated reads of a ro.* property" am:
4265991701
am:
e4c2e8f303
Change-Id: Id6af451556fde8eefac8076735e625911f8bf272
John Reck [Fri, 27 Jan 2017 22:57:29 +0000 (22:57 +0000)]
Merge "Fix a bunch of repeated reads of a ro.* property"
am:
4265991701
Change-Id: I996fbd1002ef788a768b575ab6d2177dc9ab5af1
Treehugger Robot [Fri, 27 Jan 2017 22:55:15 +0000 (22:55 +0000)]
Merge "Adds @hide ImsResolver API and device overlays (2/3)"
Treehugger Robot [Fri, 27 Jan 2017 22:49:03 +0000 (22:49 +0000)]
Merge "Fix a bunch of repeated reads of a ro.* property"
koji.x.shigehara [Fri, 27 Jan 2017 21:46:21 +0000 (21:46 +0000)]
Merge "Handles #9 as Dial number" am:
3b24c6e1a2 am:
4710c36e8d
am:
679ef0013e
Change-Id: I8697aa07662c7f00f0f5b678f63a1f44a39c08fb
koji.x.shigehara [Fri, 27 Jan 2017 21:42:28 +0000 (21:42 +0000)]
Merge "Handles #9 as Dial number" am:
3b24c6e1a2
am:
4710c36e8d
Change-Id: I2ea8c5bbd06b0b58609f27039a5fef0d9b37cb9e
koji.x.shigehara [Fri, 27 Jan 2017 21:38:26 +0000 (21:38 +0000)]
Merge "Handles #9 as Dial number"
am:
3b24c6e1a2
Change-Id: I71b8c65b0dc1fd813f2f962074db217df429c8ef
Treehugger Robot [Fri, 27 Jan 2017 21:30:42 +0000 (21:30 +0000)]
Merge "Handles #9 as Dial number"
Jack Yu [Mon, 16 Jan 2017 18:49:55 +0000 (10:49 -0800)]
DO NOT MERGE - Fixed the logic for tethering provisioning re-evaluation
Previously we only re-evaluate provisioning for SIM swap case
The new logic covers both SIM swap case
(ABSENT->NOT_READY->UNKNOWN->READY->LOADED) and modem reset
case (NOT_READY->READY->LOADED)
Test: Manual
bug:
33815946
Merged-In: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
Change-Id: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
Brad Ebinger [Tue, 24 Jan 2017 00:20:33 +0000 (16:20 -0800)]
Adds @hide ImsResolver API and device overlays (2/3)
- Adds config_ims_package device overlay, which specifies the default
package name to bind to.
- Adds config_dynamic_bind_ims device overlay, which determines
whether or not the new dynamic binding system is used.
- Adds @hide TelephonyManager API to interface with the ImsResolver
Test: Manual
Merged-In: I82a41da00e6da34629a40db431f13b968dfafe2e
Change-Id: I82a41da00e6da34629a40db431f13b968dfafe2e
Jack Yu [Fri, 27 Jan 2017 21:07:09 +0000 (21:07 +0000)]
Merge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev
am:
d9ab9df05b
Change-Id: I282418ddb3043e12c48edf23933d1bea4c35c3e0
Jack Yu [Fri, 27 Jan 2017 21:07:00 +0000 (21:07 +0000)]
Fixed the logic for tethering provisioning re-evaluation
am:
3294256ba5 -s ours
Change-Id: I153971fb47656ac122f786ed2f86f6302abe48e7
Paul Stewart [Fri, 27 Jan 2017 17:37:17 +0000 (09:37 -0800)]
Account for null client certificate
If a null certificate is passed to setClientKeyEntry() we should
not pass a non-null array with a single null element to the
setClientKeyEntryWithCertificateChain helper method. Instead we
should pass a null array.
Cherry-pick of
410a3498ac28dccf69212d94a533040893c7ce0c
Bug:
34765004
Test: cts-tradefed run cts -d --module CtsNetTestCases --test android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I02793b4b29bc7325f98833c58bf652ba68353827
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:43:24 +0000 (20:43 +0000)]
Merge "Use the new radio_metadata wrapper for safer memory management." am:
a9ed0b1c8b am:
e163e7b943
am:
bb15b50ffc
Change-Id: I09c0c21f69efb739d73f247e76c3b378a0e5c7d6
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:38:55 +0000 (20:38 +0000)]
Merge "Use the new radio_metadata wrapper for safer memory management." am:
a9ed0b1c8b
am:
e163e7b943
Change-Id: I61a101f50ef6ea56b0ed9b9b1b7ec4b0516220ab
TreeHugger Robot [Fri, 27 Jan 2017 20:36:29 +0000 (20:36 +0000)]
Merge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:32:52 +0000 (20:32 +0000)]
Merge "Use the new radio_metadata wrapper for safer memory management."
am:
a9ed0b1c8b
Change-Id: I7f5391cced1db62be2d9b88823d88d2d77f8b065
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:26:06 +0000 (20:26 +0000)]
Merge "Use the new radio_metadata wrapper for safer memory management."
Erik Kline [Fri, 27 Jan 2017 19:33:16 +0000 (19:33 +0000)]
Merge "Switch to listening for all network changes." am:
085ffa76fa am:
46f8abd229
am:
118c0c9e7d
Change-Id: I82ac34a2f846f4ebe164e4190716559186204934
Shukang Zhou [Fri, 27 Jan 2017 19:32:24 +0000 (19:32 +0000)]
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am:
e924640c4b am:
b0f03a64ea
am:
221e58fe95 -s ours
Change-Id: I3e70c3a349fd4ce05e88b84e2b987bbf26cadeba
Erik Kline [Fri, 27 Jan 2017 19:20:19 +0000 (19:20 +0000)]
Merge "Switch to listening for all network changes." am:
085ffa76fa
am:
46f8abd229
Change-Id: I28ad47a86ea534c5b675a530ffbaac415fd60b25
Erik Kline [Fri, 27 Jan 2017 19:14:39 +0000 (19:14 +0000)]
Merge "Switch to listening for all network changes."
am:
085ffa76fa
Change-Id: I87157788c5c2dc1015f9518c1c443256cfd30bae
Treehugger Robot [Fri, 27 Jan 2017 19:07:06 +0000 (19:07 +0000)]
Merge "Switch to listening for all network changes."
John Reck [Tue, 20 Sep 2016 21:24:21 +0000 (14:24 -0700)]
Fix a bunch of repeated reads of a ro.* property
SystemProperties.get() is not particularly fast,
especially if a string is returned. Since ro.* values
are unable to be changed, there's no need to
continously re-query them. Cache the value at
static init time to trivially fix this.
Test: refactoring CL.
Change-Id: Iccb021d3cb2ba3a4a1d0048ddec6811bb7409eec
(cherry picked from commit
aa67f684ff43c81e3280c846245ec6ebe907787e)
Shukang Zhou [Fri, 27 Jan 2017 19:01:44 +0000 (19:01 +0000)]
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am:
e924640c4b
am:
b0f03a64ea
Change-Id: I35fa80e43cd4f6af76099848714f838f217b7989
Shukang Zhou [Fri, 27 Jan 2017 18:57:12 +0000 (18:57 +0000)]
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."
am:
e924640c4b
Change-Id: I7e56dd815f5ac72b27ac6e2e2ca7614eaa648db1
Treehugger Robot [Fri, 27 Jan 2017 18:49:43 +0000 (18:49 +0000)]
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."
Paul Stewart [Wed, 25 Jan 2017 03:36:05 +0000 (19:36 -0800)]
Add a client chain to WifiEnterpriseConfig
Add a list of supporting certificates to be presented in the process
of presenting client credentials.
Cherry-pick of
e3511767169357a1409119b5666c62d50e005583
Bug:
34688653
Test: Compile, unit tests
Change-Id: I6afd8baf67312e8ddaaeefd26f30dacc51aa33bb
Tomasz Wasilczyk [Mon, 23 Jan 2017 22:36:47 +0000 (14:36 -0800)]
Use the new radio_metadata wrapper for safer memory management.
Bug: b/
34054813
Test: VTS, manual - both done in internal branch
Change-Id: I5f4962f86b7732e14c2584a562e9737c92310697
Jack Yu [Mon, 16 Jan 2017 18:49:55 +0000 (10:49 -0800)]
Fixed the logic for tethering provisioning re-evaluation
Previously we only re-evaluate provisioning for SIM swap case
The new logic covers both SIM swap case
(ABSENT->NOT_READY->UNKNOWN->READY->LOADED) and modem reset
case (NOT_READY->READY->LOADED)
Test: Manual
bug:
33815946
Merged-In: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
Change-Id: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
Android Build Merger (Role) [Fri, 27 Jan 2017 17:00:33 +0000 (17:00 +0000)]
Merge "Add hidden API for whether permission review mode is on. am:
7b89a7b1f7 am:
90e9bbc814" into nyc-mr2-dev-plus-aosp
Paul Navin [Fri, 27 Jan 2017 16:59:34 +0000 (16:59 +0000)]
Add hidden API for whether permission review mode is on. am:
7b89a7b1f7
am:
90e9bbc814
Change-Id: Ic52f409f1225c85340e71909a8adb3b9c4d66edf
Paul Navin [Fri, 27 Jan 2017 16:59:33 +0000 (16:59 +0000)]
Add hidden API for whether permission review mode is on. am:
7b89a7b1f7
am:
7c230c6f3c
Change-Id: I89c9a580a96d0f69ed30cad9ec2e4f9c215a403b
Paul Navin [Fri, 27 Jan 2017 16:55:03 +0000 (16:55 +0000)]
Add hidden API for whether permission review mode is on.
am:
7b89a7b1f7
Change-Id: I925b6de9f79850dcc816a73357d1d589eeac6333
Paul Navin [Fri, 27 Jan 2017 16:54:58 +0000 (16:54 +0000)]
Add hidden API for whether permission review mode is on.
am:
7b89a7b1f7
Change-Id: Ic7f4d30bd689bf5677600552030a3e696b16dfbb
Jason Monk [Fri, 27 Jan 2017 15:15:01 +0000 (15:15 +0000)]
Merge "Add separate roaming icon for status bar + QS" into nyc-mr2-dev
am:
76812ac8ac
Change-Id: I05998104c4d19d35cf8eba6b2a4aa1b35dfb600a
Jason Monk [Fri, 27 Jan 2017 15:14:53 +0000 (15:14 +0000)]
Add separate roaming icon for status bar + QS
am:
f62e889394
Change-Id: I065c6420e0ed379f44d7789e77590e5a39c2a5ec
Jason Monk [Fri, 27 Jan 2017 15:08:03 +0000 (15:08 +0000)]
Merge "Add separate roaming icon for status bar + QS" into nyc-mr2-dev
Lorenzo Colitti [Fri, 27 Jan 2017 10:00:06 +0000 (10:00 +0000)]
Merge "ConnectivityServiceTest: fix flaky tests" am:
b8bbd30203 am:
8fea8e5bbd
am:
c620e64f61
Change-Id: Iaa1ab50a323133cadfa4f39440fce982cde8d1fe
Lorenzo Colitti [Fri, 27 Jan 2017 09:55:39 +0000 (09:55 +0000)]
Merge "ConnectivityServiceTest: fix flaky tests" am:
b8bbd30203
am:
8fea8e5bbd
Change-Id: I66f2c2174c2895224724245c1b3d815da1678955
Lorenzo Colitti [Fri, 27 Jan 2017 09:55:36 +0000 (09:55 +0000)]
Merge "ConnectivityServiceTest: remove flaky waitForIdle test." am:
be80577f5b am:
0c659d2065
am:
f8cff961c8
Change-Id: I1d3707b4bc2ae00ca0fad1c3ec7e6ca859fcdd16
Lorenzo Colitti [Fri, 27 Jan 2017 09:51:39 +0000 (09:51 +0000)]
Merge "ConnectivityServiceTest: remove flaky waitForIdle test." am:
be80577f5b
am:
0c659d2065
Change-Id: I7fbf2cb2c9778f5c961335c5b9fd5a138ec140db
Lorenzo Colitti [Fri, 27 Jan 2017 09:51:32 +0000 (09:51 +0000)]
Merge "ConnectivityServiceTest: fix flaky tests"
am:
b8bbd30203
Change-Id: I0577f6b48de8a95e7d12e58a672fb0374ced9403
Lorenzo Colitti [Fri, 27 Jan 2017 09:47:05 +0000 (09:47 +0000)]
Merge "ConnectivityServiceTest: remove flaky waitForIdle test."
am:
be80577f5b
Change-Id: I444746af6adc7be4a3f69243379f65aadf29ea19
Lorenzo Colitti [Fri, 27 Jan 2017 09:40:46 +0000 (09:40 +0000)]
Merge "ConnectivityServiceTest: fix flaky tests"
Lorenzo Colitti [Fri, 27 Jan 2017 09:38:51 +0000 (09:38 +0000)]
Merge "ConnectivityServiceTest: remove flaky waitForIdle test."
Lorenzo Colitti [Fri, 27 Jan 2017 07:37:02 +0000 (07:37 +0000)]
Merge changes from topic 'net-sync-aosp-with-stage-aosp' into stage-aosp-master am:
277bd4235e
am:
22cd53384c
Change-Id: I03bdbb9fc8ceb6a7180b93c29b1d63b4fd471820
Hugo Benichi [Fri, 27 Jan 2017 07:29:59 +0000 (07:29 +0000)]
Merge commit '
88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp
am:
6a688ca1ad -s ours
Change-Id: Icf4cf5e8e95b9de4b313f826a40c1df81c02aa8a
Stephen Chen [Fri, 27 Jan 2017 07:29:07 +0000 (07:29 +0000)]
Merge commit '
48a1136c8b3000c651e8bcd86325acd1dce6e4ec' into nyc-mr1-dev-plus-aosp
am:
7bc2aebd53
Change-Id: I3de8f91b1c9d0160ec58be8347502769580e0159
Hugo Benichi [Fri, 27 Jan 2017 07:28:06 +0000 (07:28 +0000)]
Merge commit '
a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus-aosp
am:
53095bb5bd -s ours
Change-Id: Ie2f8c1e18acf57238fe4816812562ecd1644cf51
Lorenzo Colitti [Fri, 27 Jan 2017 07:26:28 +0000 (07:26 +0000)]
Merge changes from topic 'net-sync-aosp-with-stage-aosp' into stage-aosp-master
am:
277bd4235e
Change-Id: I02efb8229026eb6ddfbf10bf72645dea10a4215f
The Android Automerger [Fri, 27 Jan 2017 06:39:52 +0000 (06:39 +0000)]
Merge commit '
88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp
* commit '
88932754ffdcbffb3cb43e03991e5eb598c10458':
Captive portals: login activity probes like NetworkMonitor
Logging improvements in CaptivePortalLoginActivity
Captive portal systel log improvements
Fix flaky IpPrefixTest.
Removing bogus file added by mistake
frameworks-test: adding missing @SmallTest
Netd events: record connect() success/errno
Add missing dependency.
Show notification for always-on app VPN
The Android Automerger [Fri, 27 Jan 2017 06:39:41 +0000 (06:39 +0000)]
Merge commit '
48a1136c8b3000c651e8bcd86325acd1dce6e4ec' into nyc-mr1-dev-plus-aosp
* commit '
48a1136c8b3000c651e8bcd86325acd1dce6e4ec':
Implement metered tracking for NetworkStats summary queries.
The Android Automerger [Fri, 27 Jan 2017 06:39:05 +0000 (06:39 +0000)]
Merge commit '
a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus-aosp
* commit '
a19056c35d16ddb5a6c1d3343729701b8939f1e1': (35 commits)
NetworkMonitor: send one DNS probe per web probe
NetworkMonitor metrics: add first validation information
APF: also drop any ICMPv6 RSs
ConnectivityServiceTest: fix testAvoidBadWifiSettings
Fix ConnectivityServiceTest testRequestBenchmark
Switch over to new "time.android.com" NTP pool.
Define API for metering network stats buckets.
Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
Use @Ignore to explicitly disable a @Test method.
Fixed NetworkStatsServiceTest and converted it to JUnit4.
VPN network stat accounting changes.
ConnectivityThread: use lazy holder idiom
ConnectivityManager: use ConnectivityThread looper
ConnectivityManager: a simpler CallbackHandler
Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
Add a null check for the OnStartTetheringCallback.
TokenBucket for rate-limiting and throttling
IpConnectivityMetrics reads buffer size in settings
CaptivePortalLogin: set mixed content policy to compatibility.
Add IP conn metrics to dumpsys and bug reports
...
koji.x.shigehara [Fri, 20 Nov 2015 10:42:53 +0000 (19:42 +0900)]
Handles #9 as Dial number
Adding #9 as a country-specific exception of MMI codes so that
we can treat it as Dial number. This config change is necessary
to fulfill carrier's requirement.
Test: manual - check dialing #9
Bug:
34755732
Change-Id: I485e48cf30610ff012f84d43935454e693b0d94d
Paul Navin [Thu, 26 Jan 2017 23:56:08 +0000 (23:56 +0000)]
Add hidden API for whether permission review mode is on.
BUG:
34240393
Change-Id: I68e55767a7da1d457a6cedd210aac9e339fb996c
Daniel Nishi [Fri, 27 Jan 2017 00:43:02 +0000 (00:43 +0000)]
Merge "Add a flag to enable/disable the diskstats logging service." into nyc-mr2-dev
am:
56d29925ac
Change-Id: Ibb4ae749d9eaa0cc10f2ebb721c2b94fa13cac38
Daniel Nishi [Fri, 27 Jan 2017 00:42:54 +0000 (00:42 +0000)]
Add a flag to enable/disable the diskstats logging service.
am:
88e45dcd1f
Change-Id: Ie822eea68dc0a02c8fad1a838ff9bf23f738106f
Bill Yi [Fri, 27 Jan 2017 00:38:24 +0000 (00:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
6470caa2e2 -s ours
Change-Id: I6cea2b032629810b13efba6e2efb18ba2e1e7b0f
Bill Yi [Fri, 27 Jan 2017 00:38:20 +0000 (00:38 +0000)]
Import translations. DO NOT MERGE
am:
951b1616fc -s ours
Change-Id: Id69967bfaa808912b8d31bffabdc0d414454961c
Daniel Nishi [Fri, 27 Jan 2017 00:35:22 +0000 (00:35 +0000)]
Merge "Add a flag to enable/disable the diskstats logging service." into nyc-mr2-dev
Lorenzo Colitti [Fri, 27 Jan 2017 00:34:13 +0000 (00:34 +0000)]
Merge changes from topic 'net-sync-aosp-with-stage-aosp' into stage-aosp-master
* changes:
Captive portals: login activity probes like NetworkMonitor
Logging improvements in CaptivePortalLoginActivity
Captive portal systel log improvements
Fix flaky IpPrefixTest.
Removing bogus file added by mistake
frameworks-test: adding missing @SmallTest
Netd events: record connect() success/errno
Add missing dependency.
Show notification for always-on app VPN
Implement metered tracking for NetworkStats summary queries.
NetworkMonitor: send one DNS probe per web probe
NetworkMonitor metrics: add first validation information
APF: also drop any ICMPv6 RSs
ConnectivityServiceTest: fix testAvoidBadWifiSettings
Fix ConnectivityServiceTest testRequestBenchmark
Switch over to new "time.android.com" NTP pool.
Define API for metering network stats buckets.
Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
Use @Ignore to explicitly disable a @Test method.
Fixed NetworkStatsServiceTest and converted it to JUnit4.
VPN network stat accounting changes.
ConnectivityThread: use lazy holder idiom
ConnectivityManager: use ConnectivityThread looper
ConnectivityManager: a simpler CallbackHandler
Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
Add a null check for the OnStartTetheringCallback.
TokenBucket for rate-limiting and throttling
IpConnectivityMetrics reads buffer size in settings
CaptivePortalLogin: set mixed content policy to compatibility.
Add IP conn metrics to dumpsys and bug reports
IpConnectivity metrics: add version number
[CS] Remove timeout event after first available
ApfTest: tag tests with @SmallTest or @MediumTest
Unbreak TetherInterfaceStateMachineTest.
Move the connectivity tests to frameworks/base/tests/net.
De-guava BroadcastInterceptingContext and move it to testutils.
Move FakeSettingsProvider to a common location.
ConnectivityServiceTest: mark flaky test as such
Add option to skip and avoid captive portals.
ApfFilter: use elapsedRealTime for RA lifetime
Do not synchronize boolean reads/writes
ApfFilter: systematically use u8, u16, u32 getters
Add fuzzing tests to ApfFilter RA processing
Support timeouts for requestNetwork() invocations.
Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network.
TreeHugger Robot [Fri, 27 Jan 2017 00:26:05 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Pavlin Radoslavov [Thu, 26 Jan 2017 23:55:43 +0000 (23:55 +0000)]
Merge "Increase the character limit for "Use System Selection" message" am:
a7ce460921 am:
d0386d8c07
am:
798e1862bd
Change-Id: I52bd0ba6cee2435648f1ccf8a53bc9d76526973a
Pavlin Radoslavov [Thu, 26 Jan 2017 23:46:49 +0000 (23:46 +0000)]
Merge "Increase the character limit for "Use System Selection" message" am:
a7ce460921
am:
d0386d8c07
Change-Id: I34e41269fd5d47024e211daa4b5c48124e7db0a8
Pavlin Radoslavov [Thu, 26 Jan 2017 23:41:39 +0000 (23:41 +0000)]
Merge "Increase the character limit for "Use System Selection" message"
am:
a7ce460921
Change-Id: I3092241c8b1a6e458b3dc2a1332abbf0d19cf786
Treehugger Robot [Thu, 26 Jan 2017 23:34:36 +0000 (23:34 +0000)]
Merge "Increase the character limit for "Use System Selection" message"
Peter Qiu [Thu, 26 Jan 2017 23:11:17 +0000 (23:11 +0000)]
Merge changes If5025361,Iabe27cd8 am:
0a649bffcc am:
0773d2cc0d
am:
26bdc1f273
Change-Id: I9576f50cc7a922a684efb9ab4e1a57eac766280f
Peter Qiu [Thu, 26 Jan 2017 23:09:59 +0000 (23:09 +0000)]
hotspot2: added remaining parameters to PasspointConfiguration am:
ddf6fa06c6 am:
44bcb75926
am:
8badc8566a
Change-Id: I700aa39aed04e002643371b552647ada2492c6bf
Peter Qiu [Thu, 26 Jan 2017 23:09:07 +0000 (23:09 +0000)]
hotspot2: add support for complete PerProviderSubscription/Policy subtree am:
2d7af45e93 am:
01e738a040
am:
6251e52cc0
Change-Id: I1305266ff24105e5b9326868f3212f8a27802fea
Peter Qiu [Thu, 26 Jan 2017 23:03:03 +0000 (23:03 +0000)]
Merge changes If5025361,Iabe27cd8 am:
0a649bffcc
am:
0773d2cc0d
Change-Id: Ie890d96d2e2741cefc2e20957a65a0cd65c2fe13
Peter Qiu [Thu, 26 Jan 2017 23:01:35 +0000 (23:01 +0000)]
hotspot2: added remaining parameters to PasspointConfiguration am:
ddf6fa06c6
am:
44bcb75926
Change-Id: Ibb587721014dd25243f7423864f1d5019ee42fde
Peter Qiu [Thu, 26 Jan 2017 23:00:38 +0000 (23:00 +0000)]
hotspot2: add support for complete PerProviderSubscription/Policy subtree am:
2d7af45e93
am:
01e738a040
Change-Id: Ic35247930e4c7a99c5408593287926adcc1be8b9
Peter Qiu [Thu, 26 Jan 2017 22:53:13 +0000 (22:53 +0000)]
Merge changes If5025361,Iabe27cd8
am:
0a649bffcc
Change-Id: Ia66d523ed565704178315d66bd19ffe02cbb7560
Peter Qiu [Thu, 26 Jan 2017 22:53:04 +0000 (22:53 +0000)]
hotspot2: added remaining parameters to PasspointConfiguration
am:
ddf6fa06c6
Change-Id: I023acc0ae2920391de8a8de8ee95152f510ca9bd
Peter Qiu [Thu, 26 Jan 2017 22:52:11 +0000 (22:52 +0000)]
hotspot2: add support for complete PerProviderSubscription/Policy subtree
am:
2d7af45e93
Change-Id: Icf253102520e81766e726d9247c9614b6c0ebacd
Treehugger Robot [Thu, 26 Jan 2017 22:41:17 +0000 (22:41 +0000)]
Merge changes If5025361,Iabe27cd8
* changes:
hotspot2: added remaining parameters to PasspointConfiguration
hotspot2: add support for complete PerProviderSubscription/Policy subtree
Daniel Nishi [Wed, 25 Jan 2017 19:43:55 +0000 (11:43 -0800)]
Add a flag to enable/disable the diskstats logging service.
Bug:
34704947
Test: Service tests
Change-Id: I224cfb38682f1fd2bd33750b664bd3aacdaa4bde
Winson Chung [Thu, 26 Jan 2017 22:23:18 +0000 (22:23 +0000)]
Merge "DO NOT MERGE Fixing crash in SystemUI fetching task description icons." into nyc-mr2-dev
am:
c52a3cb704
Change-Id: If0c3bb685dfd6a13d816c8ef01a291e3988cf5a5
Winson Chung [Thu, 26 Jan 2017 22:23:11 +0000 (22:23 +0000)]
DO NOT MERGE Fixing crash in SystemUI fetching task description icons.
am:
452ff6db94
Change-Id: Ibbc3312c882c2c5cfd250b2a7062e365a0fde5a7
Winson Chung [Thu, 26 Jan 2017 22:17:08 +0000 (22:17 +0000)]
Merge "DO NOT MERGE Fixing crash in SystemUI fetching task description icons." into nyc-mr2-dev
Pavlin Radoslavov [Thu, 26 Jan 2017 21:25:40 +0000 (13:25 -0800)]
Increase the character limit for "Use System Selection" message
The character limit for message "Use System Selection (Default)"
has been increased from 40 to 50.
Test: UI visual inspection
Bug:
34662759
Change-Id: I9aba6847ddab27bb0456fb6dfd429692732f07c2
Peter Qiu [Thu, 26 Jan 2017 20:35:03 +0000 (20:35 +0000)]
Merge "wifi: WifiManager API change for supporting Passpoint Release 2" am:
8150581742 am:
358fe50e4d
am:
afc65709ee
Change-Id: If5b97a53b453c6ee347ce4667b3bcba4ee24dd9e
Peter Qiu [Thu, 26 Jan 2017 20:31:19 +0000 (20:31 +0000)]
Merge "wifi: WifiManager API change for supporting Passpoint Release 2" am:
8150581742
am:
358fe50e4d
Change-Id: Idc004300acfc3db7036ea31466fe392454fd144c
Peter Qiu [Thu, 26 Jan 2017 20:25:06 +0000 (20:25 +0000)]
Merge "wifi: WifiManager API change for supporting Passpoint Release 2"
am:
8150581742
Change-Id: I71e7bd9ccdb20ca78e4c8e1b2f653363d668425c
Treehugger Robot [Thu, 26 Jan 2017 19:51:36 +0000 (19:51 +0000)]
Merge "wifi: WifiManager API change for supporting Passpoint Release 2"
Pavlin Radoslavov [Thu, 26 Jan 2017 19:31:07 +0000 (19:31 +0000)]
Merge "Integration of the AAC codec for A2DP source" am:
22f97c83fb am:
f23e80bb9b
am:
d364208388
Change-Id: Ice6067732c4a94d30410a8f90cbea51b869539eb
Pavlin Radoslavov [Thu, 26 Jan 2017 19:25:37 +0000 (19:25 +0000)]
Merge "Integration of the AAC codec for A2DP source" am:
22f97c83fb
am:
f23e80bb9b
Change-Id: If2d85eba17f7ece5b3d19e3ee8fc86b7cf9bc062
Pavlin Radoslavov [Thu, 26 Jan 2017 19:20:08 +0000 (19:20 +0000)]
Merge "Integration of the AAC codec for A2DP source"
am:
22f97c83fb
Change-Id: I22838db2b87f83a3832f78d74d08a6f988264284
Treehugger Robot [Thu, 26 Jan 2017 19:12:54 +0000 (19:12 +0000)]
Merge "Integration of the AAC codec for A2DP source"
OSDN Git Service
