Chen Xu
fdbf599a08
Merge "cold sim clean up" into nyc-mr1-dev am: ba3428f01b
...
am: dc9ff70da1
2016-06-04 05:58:44 +00:00
fionaxu
dc9ff70da1
Merge "cold sim clean up" into nyc-mr1-dev
...
am: ba3428f01b
* commit 'ba3428f01b8cc112cd85d1c4ffcc1407a3b8b7c6':
cold sim clean up
Change-Id: I5a2e24d997408badd6db7576b2fa206eb9e5c4ca
2016-06-04 05:53:44 +00:00
fionaxu
5310c30967
cold sim clean up
...
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
to false if we want to hide "sign in" notification and placed
carrier-specific notification instead. it is set on connect, once set,
it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support
Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
2016-06-03 11:45:12 -07:00
Robin Lee
29f5ff0d7e
Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 4fb4490dfb am: 624febb525" into nyc-mr1-dev-plus-aosp
...
am: 57fba6df50
2016-05-25 21:38:32 +00:00
Robin Lee
9454788178
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 4fb4490dfb am: ef7e644fc5
...
am: 3b693c82ad
2016-05-25 21:37:36 +00:00
Android Build Merger (Role)
57fba6df50
Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 4fb4490dfb am: 624febb525" into nyc-mr1-dev-plus-aosp
2016-05-25 21:29:56 +00:00
Robin Lee
3b693c82ad
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 4fb4490dfb
...
am: ef7e644fc5
* commit 'ef7e644fc5ce23768cf11c2b397c7938a0971992':
Return legacy VPN info regardless of lockdown mode
Change-Id: I74b7cb240b959a8c67b8967b4a78338eb80f6a81
2016-05-25 21:28:27 +00:00
Robin Lee
a13e0c5aa6
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 4fb4490dfb
...
am: 624febb525
2016-05-25 21:28:21 +00:00
Robin Lee
624febb525
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
...
am: 4fb4490dfb
2016-05-25 21:20:43 +00:00
Jeff Sharkey
2a1ea5a666
Merge "API council feedback: hide and document." into nyc-dev am: 3e0e975a38 am: 8d5d9a0ff4
...
am: 8e401c2437
2016-05-25 21:06:47 +00:00
Jeff Sharkey
958359744a
Merge "API council feedback: hide and document." into nyc-dev am: 3e0e975a38 am: 19e2f49181
...
am: dfd98ed300
2016-05-25 21:06:41 +00:00
Robin Lee
4fb4490dfb
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
2016-05-25 21:05:55 +00:00
Jeff Sharkey
8e401c2437
Merge "API council feedback: hide and document." into nyc-dev am: 3e0e975a38
...
am: 8d5d9a0ff4
2016-05-25 21:01:32 +00:00
Jeff Sharkey
dfd98ed300
Merge "API council feedback: hide and document." into nyc-dev am: 3e0e975a38
...
am: 19e2f49181
* commit '19e2f49181b209d790f551b374d6d24002de7c9b':
API council feedback: hide and document.
Change-Id: I3715fc6e824f2a55517788299afe36145db597d7
2016-05-25 20:54:18 +00:00
Jeff Sharkey
8d5d9a0ff4
Merge "API council feedback: hide and document." into nyc-dev
...
am: 3e0e975a38
2016-05-25 20:51:03 +00:00
TreeHugger Robot
3e0e975a38
Merge "API council feedback: hide and document." into nyc-dev
2016-05-25 20:43:56 +00:00
TreeHugger Robot
4e64564222
Merge "Add missing @Deprecated annotations."
2016-05-25 17:46:40 +00:00
Hugo Benichi
70f5dd4931
Merge "Merge "Fix default network transition event recording" into nyc-dev am: c6246b996d am: 6a63f7b496" into nyc-mr1-dev-plus-aosp
...
am: 6b7c5ff9ac
2016-05-25 03:46:32 +00:00
Hugo Benichi
487952a816
Merge "Fix default network transition event recording" into nyc-dev am: c6246b996d am: 477091dd52
...
am: 2fcea4ad90
2016-05-25 03:41:14 +00:00
Android Build Merger (Role)
6b7c5ff9ac
Merge "Merge "Fix default network transition event recording" into nyc-dev am: c6246b996d am: 6a63f7b496" into nyc-mr1-dev-plus-aosp
2016-05-25 03:38:16 +00:00
Hugo Benichi
95a381714d
Merge "Fix default network transition event recording" into nyc-dev am: c6246b996d
...
am: 6a63f7b496
* commit '6a63f7b49651adb2a45c1c089e0ac06cc1f4158e':
Fix default network transition event recording
Change-Id: I94e4ff336a8102f4bc0e19acb705ba4838a1f17a
2016-05-25 03:37:22 +00:00
Hugo Benichi
2fcea4ad90
Merge "Fix default network transition event recording" into nyc-dev am: c6246b996d
...
am: 477091dd52
2016-05-25 03:37:19 +00:00
Hugo Benichi
477091dd52
Merge "Fix default network transition event recording" into nyc-dev
...
am: c6246b996d
2016-05-25 03:31:34 +00:00
Hugo Benichi
c6246b996d
Merge "Fix default network transition event recording" into nyc-dev
2016-05-25 03:22:32 +00:00
Hugo Benichi
d3e4645858
Fix default network transition event recording
...
When disconnecting from a default network X and falling back on another
connected network Y as the new default, ConnectivityService was
attempting to record this event as a X -> Y "atomic" transition.
In practice the default network connectivity is actually lost and
recovering default network takes some non-zero time.
This patch changes the event recording to always record disconnection as
X -> 0 events. At the same time, if there is a fallback network that is
elected as the new default ConnectivityService will also record a 0 -> Y
event.
This patch also improves pretty-printing of DefaultNetworkEvent.
Extract from $ adb shell dumpsys connectivity_metrics_logger --events
17:51:00.086: DefaultNetworkEvent(0 -> 100:CELLULAR)
17:51:25.232: DefaultNetworkEvent(100:IPv4 -> 101:WIFI) # wifi goes on
17:51:44.064: DefaultNetworkEvent(101:DUAL -> 0) # wifi goes off
17:51:44.187: DefaultNetworkEvent(0 -> 100:CELLULAR)
Bug: 28204408
Change-Id: I63252633235bf6ba833b9ac431a80dda75a93e67
2016-05-25 10:03:38 +09:00
Aurimas Liutikas
e80a0eb435
Add missing @Deprecated annotations.
...
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.
Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
2016-05-24 15:22:55 -07:00
Felipe Leme
6836591712
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f am: bf53edcadb
...
am: 31e3b72e85
2016-05-24 18:44:45 +00:00
Felipe Leme
31e3b72e85
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f
...
am: bf53edcadb
2016-05-24 18:23:58 +00:00
Felipe Leme
bf53edcadb
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
...
am: efd3a1749f
* commit 'efd3a1749f2737199643cc29bea6132a9786223b':
Fixed enforceMeteredApnPolicy when Data Saver is on.
Change-Id: I87b596346c058c7ac8efbebb67b43664f1be0fed
2016-05-24 18:13:16 +00:00
Felipe Leme
5902c444d7
Fixed enforceMeteredApnPolicy when Data Saver is on.
...
When enforceMeteredApnPolicy() is called when Data Saver mode is on and
the caller's UID is not whitelisted, it should add a
NET_CAPABILITY_NOT_METERED to the capabilities.
Change-Id: Ieed4f4a7634ee023ec58c91859263655e0ba62d4
Fixes: 28608499 (and https://code.google.com/p/android/issues/detail?id=208478 )
2016-05-23 09:43:53 -07:00
Jeff Sharkey
ca4340007e
API council feedback: hide and document.
...
Hide isMetered() and clarify moveDatabaseFrom() docs.
Bug: 28870582, 28775585
Change-Id: Iabe63045c39ce7f662488f4224b56387c3c59519
2016-05-20 11:34:55 -06:00
Erik Kline
fd19b7f91e
Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: bd4b5327db am: ef4e70afc3
...
am: 5a3f1a25b0
2016-05-19 04:34:18 +00:00
Erik Kline
7b12b8ca59
Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: bd4b5327db am: 8958153ac7
...
am: 8ab4a8d08a
2016-05-19 04:27:26 +00:00
Erik Kline
5a3f1a25b0
Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: bd4b5327db
...
am: ef4e70afc3
2016-05-19 04:27:24 +00:00
Erik Kline
8ab4a8d08a
Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: bd4b5327db
...
am: 8958153ac7
* commit '8958153ac7921349dd8770a33484ca96581277cc':
DHCPv4: lease expiration is fatal, renew failures are not
Change-Id: I314ceed6380af58fb3f6308dde11f2d29b324c66
2016-05-19 04:24:16 +00:00
Erik Kline
ef4e70afc3
Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev
...
am: bd4b5327db
2016-05-19 04:21:17 +00:00
Erik Kline
bd4b5327db
Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev
2016-05-19 04:12:40 +00:00
Robin Lee
86c5d3fb16
Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: f9773c5fdd am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp
...
am: 060efdabc8
2016-05-18 23:53:30 +00:00
Robin Lee
3f4104a2a1
Merge "Lock down networking when waiting for always-on" into nyc-dev am: f9773c5fdd am: 39db67ab88
...
am: d5c5c8f88b
2016-05-18 23:53:25 +00:00
Android Build Merger (Role)
060efdabc8
Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: f9773c5fdd am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp
2016-05-18 23:48:27 +00:00
Robin Lee
c832fae669
Merge "Lock down networking when waiting for always-on" into nyc-dev am: f9773c5fdd
...
am: 43fbfbf94c
* commit '43fbfbf94c5b8ae4353b73c36d85ff02fd36fc67':
Lock down networking when waiting for always-on
Change-Id: I883c68faafde99eb00c37962a517dceb4a4f9d32
2016-05-18 23:47:59 +00:00
Robin Lee
d5c5c8f88b
Merge "Lock down networking when waiting for always-on" into nyc-dev am: f9773c5fdd
...
am: 39db67ab88
2016-05-18 23:47:52 +00:00
Robin Lee
39db67ab88
Merge "Lock down networking when waiting for always-on" into nyc-dev
...
am: f9773c5fdd
2016-05-18 23:42:43 +00:00
Robin Lee
f9773c5fdd
Merge "Lock down networking when waiting for always-on" into nyc-dev
2016-05-18 23:37:24 +00:00
Robin Lee
1bb13dc5e1
Lock down networking when waiting for always-on
...
Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa
2016-05-19 00:26:53 +01:00
Erik Kline
7b0a58168e
DHCPv4: lease expiration is fatal, renew failures are not
...
Bug: 24837343
Change-Id: Ib330864f8376b0907390d581b48cff5446b3392b
2016-05-18 16:17:03 +09:00
Felipe Leme
3e99991a0b
Merge "Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 8debc39f17 am: 29052a804a" into nyc-mr1-dev-plus-aosp
...
am: f334dd564b
2016-05-17 19:08:04 +00:00
Felipe Leme
0a5393d82c
Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 8debc39f17 am: 3b91df7ccf
...
am: 7353aa4803
2016-05-17 19:07:18 +00:00
Android Build Merger (Role)
f334dd564b
Merge "Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 8debc39f17 am: 29052a804a" into nyc-mr1-dev-plus-aosp
2016-05-17 18:51:45 +00:00
Felipe Leme
a5333e4fc7
Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 8debc39f17
...
am: 29052a804a
2016-05-17 18:50:22 +00:00
