Commit Graph

69424 Commits

Author SHA1 Message Date
Eugene Susla
ac4e846ccd [DO NOT MERGE] Add an opnion to use advertised name for renaming
am: 75fb821029

Change-Id: Iead08333400d2ddc0568ae3b7f09f6ccb7fdbc1f
2017-04-14 23:31:53 +00:00
Eugene Susla
c242b76a4b [DO NOT MERGE] Stop scan on device chooser activity backgrounded
am: 200c37f413

Change-Id: I29fbe568cccac08e6fa28ec8cf1c027290d35efc
2017-04-14 23:30:46 +00:00
Eugene Susla
75fb821029 [DO NOT MERGE] Add an opnion to use advertised name for renaming
Test: Use new API, make sure renaming works
Change-Id: I9251c5db24495b8594fadce2beab3347a1aec884
2017-04-14 23:19:42 +00:00
Svetoslav Ganov
c9741d133d Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev
am: 728ce60465

Change-Id: Ic89d0c7084e56e24a358191660aeebe917df6b4b
2017-04-14 23:18:03 +00:00
Eugene Susla
200c37f413 [DO NOT MERGE] Stop scan on device chooser activity backgrounded
This effectively treats chooser activity pause event as cancel.

Bug: 30932767
Test: Install two toy apps and call associate API from both.
  Ensure foreground app always end up showing fresh data.

Change-Id: I7f5742e9878245550f678efd244bf84c427baef3
2017-04-14 23:17:04 +00:00
Svetoslav Ganov
728ce60465 Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev 2017-04-14 23:11:30 +00:00
Eugene Susla
3c9aa1767c [DO NOT MERGE] Fix a bug with filtering by raw bytes
(when such filter is not provided)
See change in BluetoothDeviceFilterUtils

Bug: 30932767
Test: Call API with a BLE filter with no raw bytes filter, matching some device.
Ensure that the device eventually shows up.

Change-Id: I4397fa33dd0c48771c8a754791a171f2d0bd64eb
2017-04-14 23:10:20 +00:00
Philip P. Moltmann
ae774ec189 Merge "Fix some racines in AutofillManager" into oc-dev
am: 2ddd69ce1a

Change-Id: Iec8454a36985484148b821f598446d5305c601bc
2017-04-14 22:11:06 +00:00
TreeHugger Robot
2ddd69ce1a Merge "Fix some racines in AutofillManager" into oc-dev 2017-04-14 22:04:38 +00:00
Nathan Harold
9361283073 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev
* changes:
  Add FileDescriptor Versions of applyTransportModeTransform()
  IpSecManager and IpSecAlgorithm API Tweaks
2017-04-14 20:21:17 +00:00
Philip P. Moltmann
e048a65639 Fix some racines in AutofillManager
- The session might be gone by the time the handler is called, hence check
  the sessionID
- Access getClientLocked() and mSession only under mLock.

Test: cts-tradefed run cts-dev AutoFillServiceTestsCases
Change-Id: I445a24557589afadb1f5372b63ef9db88021b609
2017-04-14 12:50:03 -07:00
Christopher Tate
b5573283ab Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev
am: 28dab313ee

Change-Id: I369ba9ee166d4812f2df929903691352e7bafe11
2017-04-14 19:09:27 +00:00
TreeHugger Robot
28dab313ee Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 2017-04-14 19:04:35 +00:00
Vikas Marwaha
358ec57382 Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev
am: e768104f9b

Change-Id: Ica12fabb8ab667da444cb70a54dafa26225a1458
2017-04-14 18:13:49 +00:00
Vikas Marwaha
e768104f9b Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 2017-04-14 18:06:24 +00:00
Alan Viverette
efc602c307 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev
am: 7c8ab2651b

Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
2017-04-14 17:04:19 +00:00
TreeHugger Robot
7c8ab2651b Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 2017-04-14 16:56:28 +00:00
Alan Viverette
2de6b0dab0 Merge "Update more implementations of findViewById()" into oc-dev
am: b7f0db8d89

Change-Id: Iaa7a100c54305623e908ec325575d936ecbaf26a
2017-04-14 16:33:14 +00:00
TreeHugger Robot
b7f0db8d89 Merge "Update more implementations of findViewById()" into oc-dev 2017-04-14 16:26:27 +00:00
Chad Brubaker
4ad2d2b4d0 Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev
am: 8ee12087e6

Change-Id: I3f02d7e1b8dfba220fca62cea406650ed7851570
2017-04-14 16:14:24 +00:00
Chad Brubaker
8ee12087e6 Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev 2017-04-14 16:07:15 +00:00
Hugo Benichi
9b7453f3c6 Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2 am: 4d80366762
am: e505b37ec5

Change-Id: I99267e14ab04ce62c5c2385f24f5865e791a24a0
2017-04-14 15:36:10 +00:00
Hugo Benichi
e505b37ec5 Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2
am: 4d80366762

Change-Id: I8c5d3fba8aaa19e8ffd1146ddb68c4279140f921
2017-04-14 15:29:09 +00:00
Alan Viverette
51efddbd3b Remove unnecessary casts on calls to findViewById
Just frameworks/ this time. More paths to come.

Bug: 24137209
Test: make -j32
Change-Id: Iff27abd26fa43296ac2fff8f534fc6742d2ae80c
2017-04-14 11:15:50 -04:00
Treehugger Robot
1a8f04b1b2 Merge "ConnectivityManager: release all requests mapping to a callback." 2017-04-14 15:10:10 +00:00
Hugo Benichi
dafed3d008 ConnectivityManager: release all requests mapping to a callback.
This patch changes how callback unregistration works in order to be
consistent with undocumented use cases currently de-facto supported
by the API (although in a buggy way):
  - callback recycling: releasing then reregistering a callback again.
  - multiple request registrations with the same callback.

The second use case is not desirable but needs to be taken into account
for now for the purpose of correctly releasing NetworkRequests
registered in ConnectivityService.

In order to support request release in both use cases with minimal
amount of complexity for the time being the following changes are done:
  - request to callback unmapping is done synchronously at callback
    release time.
  - all requests associated to a callback are unmapped at callback
    release time.

This fixes the following issues:
  - a callback stops being triggered as soon as it is released.
    Otherwise when recycling the callback immediately, it is possible
    the previous request associated with it triggers it, confusing the
    app.
  - when a callback is registered multiple times, the requests are not
    leaked.
  - when a callback is registered multiple times and then released, the
    N-1 first registrations do not trigger the callback anymore.

In the future it would be desirable to enforce the intended 1:1 mapping
between callbacks and requests at registration time.

Bug: 35921499, 35955593, 20701525
Test: - added new tests in ConnectivityManagerTest to test releasing,
      recycling, and a disabled test for no multiple regristration.
      - new tests catch regression causing b/35921499, b/35955593.
Change-Id: Ia0917ac322fc049f76adb4743bc745989fed6d26
2017-04-14 22:17:21 +09:00
Hugo Benichi
a622b24d3a Merge "Captive portal: rotate fallback urls" into oc-dev 2017-04-14 12:28:42 +00:00
Andrew Scull
d4be031c76 Merge "Service for OEM lock management." into oc-dev
am: e52a1bfede

Change-Id: I074e29147417d6a358fd97e7e60cd4cfbed5c4df
2017-04-14 11:43:03 +00:00
Andrew Scull
e52a1bfede Merge "Service for OEM lock management." into oc-dev 2017-04-14 11:31:06 +00:00
Hugo Benichi
35025da669 Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.

Test: built, flashed, tested manually with various portal networks.
Bug: 36532213
Merged-In: I3c010bfee5b99db03a500776fbf47959a29d0578

(cherry picked from commit eef918a66c)

Change-Id: If4d9a091c3a04a33895032d9b0d05c1dc66968e7
2017-04-14 08:16:37 +00:00
Jakub Pawlowski
a51513747a Bluetooth 5 PHY simplification
Having PHY_LE_* constants defined in four different places, with one
value being different than others is misleading. Leave just PHY_LE_*
definitions in BluetoothDevice, and add PHY_LE*_MASK for the mask used
in PHY update API.

This patch also removes need to translate PHY value between PHY update
request and event, as mask is used for request, and the value is
returned in event.

Bug: 30622771
Test: manual
Change-Id: I897effa1204a024465d55501c83c542566c4d37c
(cherry picked from commit 9e377194e3)
2017-04-14 07:33:55 +00:00
Hugo Benichi
43cdbc943d Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5
am: 4479901ff3

Change-Id: I7d20b9f247a30920df1938b680e63bc1739e1fa9
2017-04-14 07:07:46 +00:00
Hugo Benichi
4479901ff3 Merge "Captive portal: rotate fallback urls" am: 76b3537dfd
am: 605eafe0a5

Change-Id: I456d8a2af20dc2fa1553e0e27ec0280380ae6f38
2017-04-14 07:00:41 +00:00
Jorim Jaggi
5cf511907d Merge "Make sure theme attributes don't get lost" into oc-dev
am: 9d2f03ec5d

Change-Id: I4a2d163e18ce899eb97bfcff7c92de3a7ffb186c
2017-04-14 05:34:38 +00:00
TreeHugger Robot
9d2f03ec5d Merge "Make sure theme attributes don't get lost" into oc-dev 2017-04-14 05:24:45 +00:00
Romain Guy
299ae2f422 Merge "Fix javadoc typos" into oc-dev
am: 4b6e82d237

Change-Id: I03e9608a10deb04d3821bf411c033300bb6272ee
2017-04-14 05:20:55 +00:00
Andrii Kulian
aa412973d9 Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev
am: c66b6ff997

Change-Id: I1db901364853ceb5eaec1ac757fd6974db7ea2a9
2017-04-14 05:17:33 +00:00
TreeHugger Robot
4b6e82d237 Merge "Fix javadoc typos" into oc-dev 2017-04-14 05:06:43 +00:00
Andrii Kulian
c66b6ff997 Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev 2017-04-14 05:05:25 +00:00
Svet Ganov
489cef380a Merge "Allow custom buttons in autofill UI" into oc-dev
am: 249c4d709a

Change-Id: I25d94fe03626642ee8f456a78cfb502e1ca53b55
2017-04-14 04:36:40 +00:00
Dmitry Dementyev
11e1805ab3 Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev
am: 2a30085e5c

Change-Id: I2f583203d8b97f0a56c8b911d20098a3ed1772eb
2017-04-14 04:33:27 +00:00
Hugo Benichi
ed1e91e4f4 Merge changes Id0d536ff,I4fcd0ad7 into oc-dev
am: 0e8090b10e

Change-Id: I0b432e9d7aa5654a0aeac1d3d0a09e624bcbc9bc
2017-04-14 04:32:17 +00:00
Svet Ganov
162a93ca1c Check for non-null parent before delegating to it
am: 3a74243ae4

Change-Id: I294345cde604bf61175297ceb5ab11d23dbf6eb7
2017-04-14 04:26:02 +00:00
TreeHugger Robot
249c4d709a Merge "Allow custom buttons in autofill UI" into oc-dev 2017-04-14 04:22:10 +00:00
Yifan Hong
38bf613c0f Merge "Add Java API for libvintf." into oc-dev
am: c223d70e64

Change-Id: I4401faccfb5c6be29635983ec07dedb32b7f8c74
2017-04-14 04:13:04 +00:00
TreeHugger Robot
2a30085e5c Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev 2017-04-14 03:53:52 +00:00
TreeHugger Robot
0e8090b10e Merge changes Id0d536ff,I4fcd0ad7 into oc-dev
* changes:
  Connectivity metrics: add transports to connect stats
  Connectivity metrics: log DnsEvents in-band
2017-04-14 03:43:02 +00:00
Romain Guy
b3f69261c5 Fix javadoc typos
Bug: 37328228
Test: compiles
Change-Id: I75323ef5afb30381aa473ebe7172ebb145eac8f3
2017-04-13 20:06:41 -07:00
Lorenzo Colitti
d6af00f5e4 resolve merge conflicts of 4db137b059 to oc-dev-plus-aosp
Test: builds
Change-Id: I786ece9b82e47691855c8549e174345080964b91
2017-04-14 11:37:12 +09:00
Svet Ganov
3a74243ae4 Check for non-null parent before delegating to it
Test: manual

bug:37289681

Change-Id: If3055747471d4b7771256d8adaaa08b73641c09d
2017-04-14 02:31:53 +00:00