Commit Graph

277484 Commits

Author SHA1 Message Date
Etan Cohen
a29bcecad9 Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
am: bc3d106b97

Change-Id: I1019b5c514424043144351aa893b4f5048e4207e
2016-09-23 04:07:30 +00:00
Lorenzo Colitti
dc9bf7f516 Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev am: a703ecdd0c
am: 57dd2e5eff

Change-Id: I7d47b6c065f45edeecf3fd5df133545dad561d0f
2016-09-23 04:02:09 +00:00
Lorenzo Colitti
c411ec9e35 Restrict access to background networks to CHANGE_NETWORK_STATE. am: fbe9b1ad6f
am: 8bfa4053c2

Change-Id: Ie4179344aa12e38d2e2a5fab43e028ca0c97150d
2016-09-23 04:01:07 +00:00
Etan Cohen
bc3d106b97 Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." 2016-09-23 03:59:40 +00:00
Lorenzo Colitti
57dd2e5eff Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev
am: a703ecdd0c

Change-Id: I8fa53ac5143bd5df0177a11e5961acef63072007
2016-09-23 03:57:34 +00:00
Lorenzo Colitti
8bfa4053c2 Restrict access to background networks to CHANGE_NETWORK_STATE.
am: fbe9b1ad6f

Change-Id: Iaf4ccd24298f680cab39bf9b87604eb16bc53aa5
2016-09-23 03:57:32 +00:00
Hugo Benichi
73c86c2c1c Merge "New IpConnectivityMetrics service" into nyc-mr1-dev am: a5af1fb7b4
am: 89b6c6862c

Change-Id: I63400325f5fa27004db840ee455ee5d565655b03
2016-09-23 03:55:12 +00:00
Hugo Benichi
0daeac5dd4 New IpConnectivityMetrics service am: eab511b582
am: 3a353a2044

Change-Id: I5cf485edd3ab1ebb81a2a9d35dfb8bd6d8bcc305
2016-09-23 03:54:06 +00:00
TreeHugger Robot
a703ecdd0c Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev 2016-09-23 03:51:15 +00:00
Hugo Benichi
89b6c6862c Merge "New IpConnectivityMetrics service" into nyc-mr1-dev
am: a5af1fb7b4

Change-Id: Ia3860add87e1d4ee5d28abf1f0f4e4299e6e7a0b
2016-09-23 03:49:07 +00:00
Hugo Benichi
3a353a2044 New IpConnectivityMetrics service
am: eab511b582

Change-Id: Iad65f10f079be13570e1f687dacb30f4f657a163
2016-09-23 03:49:04 +00:00
TreeHugger Robot
a5af1fb7b4 Merge "New IpConnectivityMetrics service" into nyc-mr1-dev 2016-09-23 03:44:28 +00:00
Lorenzo Colitti
fbe9b1ad6f Restrict access to background networks to CHANGE_NETWORK_STATE.
When a network goes into the background, tell netd to set the
network's permission to NETWORK. Also, close all TCP sockets on
that network, to prevent long-lived TCP connections from staying
on it and possibly continuing to use metered data.

Bug: 23113288
Change-Id: Ie89c1940b6739160e25c6e9022b8b977afb3e16e
2016-09-23 11:27:13 +09:00
Kevin Hufnagle
e20b3d78e3 docs: Removed all instances of "i.e." in IntentFilter parameter
descriptions.

Bug: 5877117
Change-Id: Iccb16589a72d3180330f13ec224578a0c5ad81c6
2016-09-22 18:33:57 -07:00
Jeff Sharkey
fccdc49982 Merge "Limit LOCALE_CHANGED broadcast when init'ing." into nyc-mr1-dev am: 2adff0ec34
am: 2b6f25134b

Change-Id: I479d82e335293410f394cf6963eff4582274a9e1
2016-09-23 01:05:04 +00:00
Jeff Sharkey
1561aae308 Limit LOCALE_CHANGED broadcast when init'ing. am: d26e1ff2de
am: 8c54ee72b1

Change-Id: I790c21c47c7af00e76f7c816bbfe635d58d852d8
2016-09-23 01:04:12 +00:00
Jeff Sharkey
2b6f25134b Merge "Limit LOCALE_CHANGED broadcast when init'ing." into nyc-mr1-dev
am: 2adff0ec34

Change-Id: I7ed24ecc01cf1a1ef38308474522b3e322e517a7
2016-09-23 00:57:33 +00:00
Jeff Sharkey
8c54ee72b1 Limit LOCALE_CHANGED broadcast when init'ing.
am: d26e1ff2de

Change-Id: Ib735e27a05b787fab6c955a084e55870d1e9442c
2016-09-23 00:57:30 +00:00
TreeHugger Robot
2adff0ec34 Merge "Limit LOCALE_CHANGED broadcast when init'ing." into nyc-mr1-dev 2016-09-23 00:41:30 +00:00
Pavlin Radoslavov
3a68914f0e Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" into nyc-mr1-dev am: bad55aca70
am: 941a1ae107

Change-Id: Id79ee15fa2dcdf07dbc096542eb96a1f77f23953
2016-09-23 00:22:50 +00:00
Pavlin Radoslavov
2fe10b04fc Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind am: c7dda10ee9
am: 8854f6cf1a

Change-Id: Ie4b6feb51308d7e3f6c628d3c0b5417bd0c1dd23
2016-09-23 00:21:57 +00:00
Android Build Merger (Role)
5944234483 Merge "Merge "Add ipconnectivity.proto to services jar" into nyc-mr1-dev am: 239f78a455 am: e5a794a2f1" into nyc-mr1-dev-plus-aosp 2016-09-23 00:20:14 +00:00
Hugo Benichi
b2dcd2bb9c Merge "Add ipconnectivity.proto to services jar" into nyc-mr1-dev am: 239f78a455
am: e5a794a2f1

Change-Id: I8ec1ff2f4b26ba0162207d1e733440b2b7b1ac61
2016-09-23 00:19:20 +00:00
Android Build Merger (Role)
e2d7cd9358 Merge "Add ipconnectivity.proto to services jar am: 50a84c6210 am: 446a3847b4" into nyc-mr1-dev-plus-aosp 2016-09-23 00:19:07 +00:00
Hugo Benichi
7b6171821d Add ipconnectivity.proto to services jar am: 50a84c6210
am: 446a3847b4

Change-Id: I1fc947f98715a7a352753d85cd4ef4970be2b027
2016-09-23 00:18:31 +00:00
Android Build Merger (Role)
351c7e5ac8 Merge "Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5 am: 5b649ddcc6 -s ours am: e36701214a am: aec37971b2 am: c0024237c0 am: bc0d8bd646" into nyc-mr1-dev-plus-aosp 2016-09-23 00:18:15 +00:00
Pavlin Radoslavov
941a1ae107 Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" into nyc-mr1-dev
am: bad55aca70

Change-Id: Ib79f48efa4d526c404475744753ed1c7e39dc33a
2016-09-23 00:18:08 +00:00
Pavlin Radoslavov
8854f6cf1a Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind
am: c7dda10ee9

Change-Id: I49e5669a037080089b7be345d8dfb32744a5525a
2016-09-23 00:18:04 +00:00
Jaewan Kim
f0ca851536 Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5 am: 5b649ddcc6 -s ours am: e36701214a am: aec37971b2 am: c0024237c0
am: bc0d8bd646

Change-Id: Iec010dee2254f9596e04a7661c09dcad3f012778
2016-09-23 00:17:34 +00:00
Android Build Merger (Role)
71d2d264ac Merge "Merge "ConnectivityMetricsLoggerTest" into nyc-mr1-dev am: 3a6acc6d96 am: a2598a5a4d" into nyc-mr1-dev-plus-aosp 2016-09-23 00:17:15 +00:00
Hugo Benichi
ba12d0db26 Merge "ConnectivityMetricsLoggerTest" into nyc-mr1-dev am: 3a6acc6d96
am: a2598a5a4d

Change-Id: Ie8b8162010e6e04e6363fe1bf3186a004a95fc06
2016-09-23 00:16:32 +00:00
Android Build Merger (Role)
d9f8f2b08d Merge "ConnectivityMetricsLoggerTest am: b1af5e51c5 am: 63dffe336e" into nyc-mr1-dev-plus-aosp 2016-09-23 00:16:14 +00:00
Hugo Benichi
62138a1168 ConnectivityMetricsLoggerTest am: b1af5e51c5
am: 63dffe336e

Change-Id: Ib04cee45bc2da9020867d70eefdc0f9133530719
2016-09-23 00:15:34 +00:00
Android Build Merger (Role)
4ceae60a27 Merge "DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320 am: 03bad07418 am: afab98a69e -s ours am: 738c21253a am: 4c7df4ba37 am: 80743656b1 am: 1548fb1bd5" into nyc-mr1-dev-plus-aosp 2016-09-23 00:15:21 +00:00
Jaewan Kim
7b8426339f DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320 am: 03bad07418 am: afab98a69e -s ours am: 738c21253a am: 4c7df4ba37 am: 80743656b1
am: 1548fb1bd5

Change-Id: I976f064a27e1dc4749677c13fde11a31f64fb55d
2016-09-23 00:14:37 +00:00
Android Build Merger (Role)
953a911d92 Merge changes from topic 'am-8d22a14a51734e83a1c32bee9a910e93' into nyc-mr1-dev-plus-aosp
* changes:
  Merge "Add RadioAccessFamily rank" into nyc-mr1-dev am: 6f0cbd9297 am: 653330b86f
  Add RadioAccessFamily rank am: de780c84b5 am: 86739bd8d6
2016-09-23 00:14:12 +00:00
Brad Ebinger
83536e1311 Merge "Add RadioAccessFamily rank" into nyc-mr1-dev am: 6f0cbd9297
am: 653330b86f

Change-Id: I4f569ae00e8b6526952609ab9c87508fa974c887
2016-09-23 00:12:06 +00:00
Brad Ebinger
d68c80d093 Add RadioAccessFamily rank am: de780c84b5
am: 86739bd8d6

Change-Id: I05c4d9d3269ca893b51529df96760bda5b31db8b
2016-09-23 00:11:10 +00:00
Android Build Merger (Role)
d1ab5ec02c Merge "Merge "SurfaceView: Force surface disconnection before reuse." into nyc-mr1-dev am: 9d88f86190 am: ffff62d51b" into nyc-mr1-dev-plus-aosp 2016-09-23 00:10:55 +00:00
Robert Carr
87056e5047 Merge "SurfaceView: Force surface disconnection before reuse." into nyc-mr1-dev am: 9d88f86190
am: ffff62d51b

Change-Id: I8357e881abae1e585ff6c81d0dce589ede2ed64a
2016-09-23 00:10:15 +00:00
Android Build Merger (Role)
9241f01a9a Merge "SurfaceView: Force surface disconnection before reuse. am: 387838be95 am: 288ce4fc42" into nyc-mr1-dev-plus-aosp 2016-09-23 00:10:01 +00:00
TreeHugger Robot
bad55aca70 Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" into nyc-mr1-dev 2016-09-23 00:09:42 +00:00
Robert Carr
cfaae3f795 SurfaceView: Force surface disconnection before reuse. am: 387838be95
am: 288ce4fc42

Change-Id: Ied020f66caa429249b9f0d8baf0978f0ece9362e
2016-09-23 00:09:19 +00:00
Android Build Merger (Role)
b9bae8cea8 Merge "Merge "Don't halt movement notifications when display is frozen." into nyc-mr1-dev am: 6f91c19337 am: b4c6575aaa" into nyc-mr1-dev-plus-aosp 2016-09-23 00:09:03 +00:00
Android Build Merger (Role)
ae2715b4de Merge changes from topic 'am-6e32dc27f0314ee78cc61c474b61ed96' into nyc-mr1-dev-plus-aosp
* changes:
  Merge changes from topic 'remove-set-frequency-band' am: 430904a4ab am: 5135fb8f04 am: 4fd00327fd
  Remove ability to set frequency from WifiAssociationTest am: 93ce63760d am: 4bec7b53b0 am: a04b2b5f36
  Remove WifiManager#get/setFrequencyBand am: 79ec1736be am: a7394a4a70 am: af51ffe814
2016-09-23 00:08:21 +00:00
Robert Carr
b052bf0829 Merge "Don't halt movement notifications when display is frozen." into nyc-mr1-dev am: 6f91c19337
am: b4c6575aaa

Change-Id: I145b76f95729b166fcf7c209e4b59f2230ca766c
2016-09-23 00:08:20 +00:00
Robert Carr
c6bbbedd2c Don't halt movement notifications when display is frozen. am: c67c2a91dd
am: ebc6d5df7e

Change-Id: I79829e04ad0393231af1c1fb9995fa3b3f761217
2016-09-23 00:07:23 +00:00
Christopher Wiley
8897ad1802 Merge changes from topic 'remove-set-frequency-band' am: 430904a4ab am: 5135fb8f04
am: 4fd00327fd

Change-Id: I680f8517f0176bf8cb9ef162b05f85dd854c2081
2016-09-23 00:06:59 +00:00
Jaewan Kim
044cc414d2 Merge "Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce -s ours am: 1c278e5652 am: bed7636243 am: dd883c7e87 am: 832179120f -s ours am: c547eeda12 am: f91952879c" into nyc-mr1-dev am: 9570466f2d
am: e0bd191caf

Change-Id: Ie28505a973cb6e6a17b43ba45b7eaeb4ad673a25
2016-09-23 00:06:23 +00:00
Christopher Wiley
625c3f82e1 Remove ability to set frequency from WifiAssociationTest am: 93ce63760d am: 4bec7b53b0
am: a04b2b5f36

Change-Id: I017e3313dee3e6986d7ea021696da87e70768672
2016-09-23 00:05:46 +00:00