Vikas Marwaha
8b5315f588
Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev am: e768104f9b
...
am: 358ec57382
2017-04-14 18:36:10 +00:00
Alan Viverette
14b3375e43
Merge "Remove unnecessary casts on calls to findViewById" into oc-dev am: 7c8ab2651b
...
am: efc602c307
2017-04-14 18:25:53 +00:00
Alan Viverette
568b59c62c
Merge "Update more implementations of findViewById()" into oc-dev am: b7f0db8d89
...
am: 2de6b0dab0
2017-04-14 18:24:27 +00:00
Chad Brubaker
65cf224a3a
Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev am: 8ee12087e6
...
am: 4ad2d2b4d0
2017-04-14 18:18:33 +00:00
Hugo Benichi
61bfec0cbd
Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2 am: 4d80366762 am: e505b37ec5
...
am: 9b7453f3c6
2017-04-14 18:17:31 +00:00
Vikas Marwaha
358ec57382
Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev
...
am: e768104f9b
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
Andrew Scull
1b67465918
Merge "Service for OEM lock management." into oc-dev am: e52a1bfede
...
am: d4be031c76
2017-04-14 18:01:24 +00:00
Hugo Benichi
f24e74942b
Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5 am: 4479901ff3
...
am: 43cdbc943d
2017-04-14 17:55:26 +00:00
Jorim Jaggi
7f86cd606d
Merge "Make sure theme attributes don't get lost" into oc-dev am: 9d2f03ec5d
...
am: 5cf511907d
2017-04-14 17:54:07 +00:00
Romain Guy
870163ce34
Merge "Fix javadoc typos" into oc-dev am: 4b6e82d237
...
am: 299ae2f422
2017-04-14 17:51:58 +00:00
Andrii Kulian
7ce72dac6d
Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev am: c66b6ff997
...
am: aa412973d9
2017-04-14 17:46:46 +00:00
Svet Ganov
19feef5229
Merge "Allow custom buttons in autofill UI" into oc-dev am: 249c4d709a
...
am: 489cef380a
2017-04-14 17:38:13 +00:00
Dmitry Dementyev
25b5fa9d79
Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am: 2a30085e5c" into oc-dev-plus-aosp
...
am: 0bf753d2e5
2017-04-14 17:33:46 +00:00
Svet Ganov
3b436b15b7
Merge "Check for non-null parent before delegating to it am: 3a74243ae4" into oc-dev-plus-aosp
...
am: 37933ae25b
2017-04-14 17:23:00 +00:00
Yifan Hong
1ac3406335
Merge "Add Java API for libvintf." into oc-dev am: c223d70e64
...
am: 38bf613c0f
2017-04-14 17:05:01 +00:00
Alan Viverette
efc602c307
Merge "Remove unnecessary casts on calls to findViewById" into oc-dev
...
am: 7c8ab2651b
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
Dianne Hackborn
52a29573ee
Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am: 676bd21542
...
am: 9596d71664
2017-04-14 16:48:32 +00:00
Alan Viverette
2de6b0dab0
Merge "Update more implementations of findViewById()" into oc-dev
...
am: b7f0db8d89
2017-04-14 16:33:14 +00:00
Peng Xu
3242ee7920
Merge "Address review suggestions for sensor direct report related APIs" into oc-dev am: 5ebb159a92
...
am: 70004dd19c
2017-04-14 16:28:04 +00:00
TreeHugger Robot
b7f0db8d89
Merge "Update more implementations of findViewById()" into oc-dev
2017-04-14 16:26:27 +00:00
Makoto Onuki
c40f2ab76e
Merge "Actually remove the chooser APIs" into oc-dev am: fbadd6dac9
...
am: efda6390c9
2017-04-14 16:25:50 +00:00
Evan Rosky
3efa8c8fed
Merge "Improve rect-level focus ordering" into oc-dev am: 197052d6cb
...
am: d6072f2900
2017-04-14 16:23:44 +00:00
Jean-Michel Trivi
dc36701751
Merge "Fix A11y volume persisting/restore" into oc-dev am: 076a0bd0bf
...
am: 350b39fbc8
2017-04-14 16:16:46 +00:00
Chad Brubaker
4ad2d2b4d0
Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev
...
am: 8ee12087e6
2017-04-14 16:14:24 +00:00
Bookatz
c2c9363c7a
Merge "Collect background stats: syncs" into oc-dev am: a8fc7bff5a
...
am: 53b7ff2014
2017-04-14 16:11:50 +00:00
Jeremy Joslin
ce66b0d019
Merge "Add more NetworkRecommendationProvider documentation." into oc-dev am: 5879aa4b03
...
am: 9bcbf38e79
2017-04-14 16:10:34 +00:00
Adam Lesinski
08551954aa
Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev am: 4124851b64
...
am: b8dc42fcf3
2017-04-14 16:09:37 +00:00
Adam Lesinski
c7c66e7f78
Merge "Update docs for obtainStyledAttribute" into oc-dev am: 80b7a214ba
...
am: f8235c3631
2017-04-14 16:07:45 +00:00
Chad Brubaker
8ee12087e6
Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev
2017-04-14 16:07:15 +00:00
Adam Lesinski
c96e4b0f76
Merge "BatteryStats: Remove reading of cpu power" into oc-dev am: af85d84050
...
am: 51d94c82af
2017-04-14 16:04:32 +00:00
Dianne Hackborn
cc04f02b44
Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev am: 29c70437b3
...
am: 76c71a01e2
2017-04-14 16:01:58 +00:00
Hugo Benichi
9b7453f3c6
Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2 am: 4d80366762
...
am: e505b37ec5
2017-04-14 15:36:10 +00:00
Chris Tate
d593e402c2
Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev am: 117ac766a9
...
am: 636915a2ed
2017-04-14 15:34:16 +00:00
Seigo Nonaka
659c9cfac3
Merge "Introduce setFallbackTypeface" into oc-dev am: 729a515e5e
...
am: 17452ee553
2017-04-14 15:31:25 +00:00
Hugo Benichi
e505b37ec5
Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2
...
am: 4d80366762
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
Roozbeh Pournader
20041c2d00
Merge "Switch i18n listeners to use IME hint locales" into oc-dev am: da97b66f41
...
am: 18fcf3f0d7
2017-04-14 13:15:32 +00:00
Chris Wren
12ac68a26f
Merge "don't interpret milliseconds as nanoseconds" into oc-dev am: de12503268
...
am: a881fc2e2c
2017-04-14 13:14:37 +00:00
Andrew Solovay
47cdd3d8e9
Merge "doc: Add note to Context.bindService()" into oc-dev am: 2c63aa3be7
...
am: 7cfe7cf19b
2017-04-14 13:09:59 +00: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
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
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
2017-04-14 07:07:46 +00:00
Hugo Benichi
4479901ff3
Merge "Captive portal: rotate fallback urls" am: 76b3537dfd
...
am: 605eafe0a5
2017-04-14 07:00:41 +00:00
