Commit Graph

283982 Commits

Author SHA1 Message Date
Erik Kline
bb54baba04 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am: 75dfc5bd91
am: 0f901af920

Change-Id: I891abf2a1a4138b9d80b8544ac6d09deda8d3d62
2017-03-07 13:38:07 +00:00
Erik Kline
0f901af920 Merge "request{LinkProperties,NetworkCapabilities} no longer needed"
am: 75dfc5bd91

Change-Id: I79b9323be242ed5d2bf83962f78c613a465a20b8
2017-03-07 13:33:29 +00:00
Treehugger Robot
75dfc5bd91 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" 2017-03-07 13:27:11 +00:00
Erik Kline
465c46d555 request{LinkProperties,NetworkCapabilities} no longer needed
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toggling between WiFi and mobile
Bug: 32163131
Change-Id: I57edf5114b6361f320577c7870e40f8b3cdf74ce
2017-03-07 17:18:06 +09:00
Erik Kline
b48eb4f71a Merge "Handle null NetworkState updates" am: ae758b2c7f
am: 4cf8f7a8cd

Change-Id: I47cdb040baed8c4c700ff7412a01d79f8edccbd2
2017-03-07 06:36:13 +00:00
Erik Kline
4cf8f7a8cd Merge "Handle null NetworkState updates"
am: ae758b2c7f

Change-Id: I9d8d5c176804344a40f6646acf65d2d8a5cd976f
2017-03-07 06:31:48 +00:00
Treehugger Robot
ae758b2c7f Merge "Handle null NetworkState updates" 2017-03-07 06:24:17 +00:00
Erik Kline
3765538bab Merge "Always send all available state when calling onAvailable()." am: affbb8b6a9
am: e0a62a4398

Change-Id: Ie9bd779526e967790cbc51de52a64bbf7cd493a5
2017-03-07 06:04:13 +00:00
Erik Kline
e0a62a4398 Merge "Always send all available state when calling onAvailable()."
am: affbb8b6a9

Change-Id: I81e70fecf060a4103b51084a60a32c78f6219f6b
2017-03-07 06:00:09 +00:00
Treehugger Robot
affbb8b6a9 Merge "Always send all available state when calling onAvailable()." 2017-03-07 05:51:41 +00:00
Erik Kline
34baa3da4e Handle null NetworkState updates
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering to WiFi and mobile switching works
Bug: 32163131
Change-Id: I2d4ef7c135ae6eb50cc31236f2fd20080536ea6a
2017-03-07 13:17:53 +09:00
Erik Kline
c75d4fad22 Always send all available state when calling onAvailable().
The state that needs to be transferred includes:
    - NetworkCapabilities
    - LinkProperties
    - whether the network is currently suspended

Additionally:
    - Rename notifyNetworkCallback() to notifyNetworkAvailable()
      in order to clarify its real function.
    - fix previous copy/paste error in unittest

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - USB tethering with mobile and Wi-Fi upstream toggling
Bug: 32163131
Change-Id: Ib4460bcd5d08863a9feac9e8ab41a238897bb3ea
2017-03-07 12:57:26 +09:00
Tyler Gunn
c49b011151 Merge "API review cleanups/changes." am: 9324d6513b
am: dd4bc7c69c

Change-Id: I40b7b0f025de54e6f92764949ba3d06370d45cd6
2017-03-07 02:57:41 +00:00
Ruchi Kandoi
61d2a43fa9 Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" am: 7b0d16249c
am: 9377a53aa9

Change-Id: Ib8196c580da8fc8602e2a88945050b84545576e8
2017-03-07 02:53:09 +00:00
Erik Kline
afc5f223e9 Merge "Start of tethering OffloadController" am: 121006f428
am: 4568fa4a82

Change-Id: Ib1a7b2cad37e85335d498a12d36f0209b33d5c26
2017-03-07 02:52:09 +00:00
Tyler Gunn
dd4bc7c69c Merge "API review cleanups/changes."
am: 9324d6513b

Change-Id: Iaeb4bbb5e551bf4206ea2ab4372d1ba0533c4709
2017-03-07 02:49:54 +00:00
Ruchi Kandoi
9377a53aa9 Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field"
am: 7b0d16249c

Change-Id: I35ccc367fc1182c1cf8c470d8bfcf6dcf27d2825
2017-03-07 02:46:54 +00:00
Erik Kline
4568fa4a82 Merge "Start of tethering OffloadController"
am: 121006f428

Change-Id: I590569818c7d7ac50dcc61bd7058bd7c5cad4e77
2017-03-07 02:45:51 +00:00
Tyler Gunn
9324d6513b Merge "API review cleanups/changes." 2017-03-07 01:55:59 +00:00
Treehugger Robot
7b0d16249c Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" 2017-03-07 01:27:18 +00:00
Treehugger Robot
121006f428 Merge "Start of tethering OffloadController" 2017-03-07 01:00:57 +00:00
Andre Eisenbach
6af673dd01 Merge "BluetoothManagerService: continue teardown when BLE apps registered" am: ba0992f4c4
am: 9b3d4cb3a7

Change-Id: I4274d7908d09401496782005b560634376d820cf
2017-03-07 00:41:56 +00:00
Yang Ni
04d8f0c843 Merge "Removed close guards for Element and Type objects" am: 97c9b57cec
am: 25684ceff5

Change-Id: I09f9b62e9d6de92f7114638d4a8fdd82024214da
2017-03-07 00:40:57 +00:00
Andre Eisenbach
9b3d4cb3a7 Merge "BluetoothManagerService: continue teardown when BLE apps registered"
am: ba0992f4c4

Change-Id: Iac58de264ca48184d2ddd0cf4aeb9a3d5719539c
2017-03-07 00:37:31 +00:00
Yang Ni
25684ceff5 Merge "Removed close guards for Element and Type objects"
am: 97c9b57cec

Change-Id: I28b4149b6a0ace42dff2ca4ce9a1803b0baa4430
2017-03-07 00:36:19 +00:00
Andre Eisenbach
ba0992f4c4 Merge "BluetoothManagerService: continue teardown when BLE apps registered" 2017-03-06 21:25:40 +00:00
Martin Brabham
c2b0622634 BluetoothManagerService: continue teardown when BLE apps registered
When the adapter is toggled off; when there are BLE apps registered, a
request is sent to unregister all of the BLE apps.  Upon unregister each app
will call through to this function via a callback.  When this gets called if
the ble app count is 0, we can disable everything.  I am keeping track of the
flag so that we know explicitly where we are coming from.

Bug: 34707848
Test: Compile
Change-Id: I9a8322a6fa918e7b410770894c257ec9f7d8d1f5
2017-03-06 21:25:33 +00:00
Yang Ni
97c9b57cec Merge "Removed close guards for Element and Type objects" 2017-03-06 21:25:29 +00:00
Ruchi Kandoi
2b527ac293 nfc: First chunked NDEF record of TNF doesn't contain the type field
Test: CTS test passes
Bug: 34943312
Change-Id: I08f37ee76810f642b35ae8bde05ef0e2eff921e0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-03-06 13:10:20 -08:00
Tom Cherry
1344c034c5 Merge "Check for spurious wake ups" am: 3a3cd0a27f
am: c2dcebe6e6

Change-Id: I6777a0845cbfbef3681e3f3779779c83001c0456
2017-03-06 20:06:31 +00:00
Tom Cherry
c2dcebe6e6 Merge "Check for spurious wake ups"
am: 3a3cd0a27f

Change-Id: Ia445070278f5a80c85b48e06ddf614d462db45af
2017-03-06 19:57:18 +00:00
Tom Cherry
3a3cd0a27f Merge "Check for spurious wake ups" 2017-03-06 19:25:59 +00:00
Tyler Gunn
159f35c8e4 API review cleanups/changes.
- Change onCreateIncomingConnectionFailed/onCreateOutgoingConnectionFailed
to accept the connection mgr phone account as the first parameter.
- For the video APIs, pass the target SDK of the caller into along so
that the Telecom permission check can have fallback behavior for older API
versions.
- Add guidance for how UX should be shown in onShowIncomingCallUi API.
API guidance follows how the Dialer app shows its notification and full
screen UX.

Test: Manual, CTS.
Bug: 35767711
Bug: 35767096
Change-Id: Ib343f0eda1a4d067a38c553f33f140b4efcf3e48
2017-03-06 11:04:55 -08:00
Ajay Panicker
a38d289d8a Merge "Bluetooth: Use content observer for airplane mode" am: 8871623b8d -s ours
am: 4ddee9722d

Change-Id: Ia3653b1737eb48d52eed98c3b6ba99d8e95636d7
2017-03-06 18:26:56 +00:00
Ajay Panicker
4ddee9722d Merge "Bluetooth: Use content observer for airplane mode"
am: 8871623b8d  -s ours

Change-Id: I83e81bd944c36c0f96a213bf57f99e61a7b35404
2017-03-06 18:21:33 +00:00
Treehugger Robot
8871623b8d Merge "Bluetooth: Use content observer for airplane mode" 2017-03-06 17:59:03 +00:00
Ajay Panicker
b208a1f0ac Bluetooth: Use content observer for airplane mode
We are making this switch as the airplane mode switch intent is going away.

Fix: 35256299
Test: Toggle Airplane Mode
Change-Id: I3b1e5bbdf689b0db98cfbb0ab377198d34f0ba05
2017-03-06 17:55:34 +00:00
Hugo Benichi
22d4258a75 Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499." am: 704520c392
am: 4cf199383f

Change-Id: I79234b267fccb31dfd53cf970a8da039654e684b
2017-03-06 12:37:36 +00:00
Hugo Benichi
4cf199383f Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499."
am: 704520c392

Change-Id: Ia0ae78f8406b81377491407cf5ef8ca339952def
2017-03-06 12:30:05 +00:00
Hugo Benichi
704520c392 Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499." 2017-03-06 12:20:45 +00:00
Erik Kline
e0cce21f4d Start of tethering OffloadController
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Change-Id: If8f7df069f37f1b3d440d446ab1b160a52ba9e09
2017-03-06 19:34:38 +09:00
Hugo Benichi
649e32484e Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499.
This reverts commit faa70976b4.

Change-Id: I86c07c113f24753be7c977e6d7f570b99391e1b5
2017-03-06 06:16:51 +00:00
Paul Lawrence
fb350eb0c7 Merge "Make seccomp honor setenforce" am: c337e32bb0
am: 071dcc02b4

Change-Id: I95d2303229f38c3d0719d830deefd58cc3280278
2017-03-04 02:23:14 +00:00
Paul Lawrence
071dcc02b4 Merge "Make seccomp honor setenforce"
am: c337e32bb0

Change-Id: I9d1bfd35f7da304188da2d6aff6b937108ae4680
2017-03-04 02:17:43 +00:00
Treehugger Robot
c337e32bb0 Merge "Make seccomp honor setenforce" 2017-03-04 02:08:54 +00:00
Paul Lawrence
ffad2adfa5 Make seccomp honor setenforce
Note: This code is in frameworks, since we might want to have tools
linked against seccomp_policy that continue to enforce seccomp

Bug: 35950093
Test: Builds, Seccomp: 2 is in zygote & zygote64 status
      Run setenforce 0 && stop && start
      Seccomp: 0 is in zygote & zygote64 status

Change-Id: I797a6c29f58725f84089c570f784125fb99f57ce
2017-03-03 13:08:08 -08:00
Peter Qiu
8cf05dfe92 Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork" am: 6ac19c0d23
am: be39334afb

Change-Id: I922cadda8d9becd391dbaffc0da7e098bdda89f6
2017-03-03 19:16:14 +00:00
Peter Qiu
be39334afb Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork"
am: 6ac19c0d23

Change-Id: Ia4966b2d8109a85a94f59d7ec57b387a8f6f612e
2017-03-03 19:10:46 +00:00
Treehugger Robot
6ac19c0d23 Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork" 2017-03-03 19:02:28 +00:00
Yang Ni
45438c9402 Removed close guards for Element and Type objects
Bug: 28053769

These objects are tiny and unlikely to cause memory issues.

In addition, llvm-rs-cc auto-generated code contains such objects, which are
not visibible to developers and impossible to manually destroy, leaving
distracting warnings in Strict Mode.

Test: RsTest with StrictMode on and CTS tests

Change-Id: Iec68cca4f1259124b9f503a230c1a28b97ede1f3
2017-03-03 10:44:30 -08:00