OSDN Git Service
Erik Kline [Mon, 17 Apr 2017 05:29:00 +0000 (05:29 +0000)]
Merge changes I76ae853c,If94102c7 into oc-dev am:
7eb8260236
am:
feac32ced9
Change-Id: Id87d4ef2a14572c93bece1f19b3da8f73980d708
Erik Kline [Mon, 17 Apr 2017 05:19:35 +0000 (05:19 +0000)]
Merge changes I76ae853c,If94102c7 into oc-dev
am:
7eb8260236
Change-Id: I29e7e076b74842098d5de36aa965a736f1a2863c
TreeHugger Robot [Mon, 17 Apr 2017 05:11:14 +0000 (05:11 +0000)]
Merge changes I76ae853c,If94102c7 into oc-dev
* changes:
Ignore potential SystemProperties errors when setting net.dns
Make ConnectivityServiceTest pass on wifi-only devices.
Winson Chung [Mon, 17 Apr 2017 02:00:18 +0000 (02:00 +0000)]
Use vsync choreographer when moving PIP. am:
487737b876
am:
4cc5518c80
Change-Id: I43e66e892ae3e67336e18d9a55d6074bc0e75167
Winson Chung [Mon, 17 Apr 2017 01:50:43 +0000 (01:50 +0000)]
Use vsync choreographer when moving PIP.
am:
487737b876
Change-Id: Ifc6c5a57748432bf1173b27d5377ed573c70ba65
Hugo Benichi [Wed, 22 Mar 2017 08:07:57 +0000 (17:07 +0900)]
ConnectivityManager: unify prety printing of callback types.
And also remove some small code duplication (checkNotNull).
Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
Winson Chung [Wed, 5 Apr 2017 21:17:08 +0000 (14:17 -0700)]
Use vsync choreographer when moving PIP.
Bug:
36371375
Test: Enter PIP, move PIP
Change-Id: I5956a3ed9e92a4cdd4bf0a55723b9f1574c1a86f
Tyler Gunn [Sat, 15 Apr 2017 22:35:11 +0000 (22:35 +0000)]
Merge "Expose phone account register/unregister intents." am:
24299f5b06 am:
b993a44272 am:
d046aa9103
am:
03dbae246e -s ours
Change-Id: I0b7e021287a51b71d8ac996a659fc3383445ddb3
Nathan Harold [Sat, 15 Apr 2017 22:33:43 +0000 (22:33 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am:
02278a5a02 am:
d50a325553 am:
661278432d
am:
23e6899924
Change-Id: I53c03893629be1662f3f5922011d600b19e878bf
Tyler Gunn [Sat, 15 Apr 2017 22:28:09 +0000 (22:28 +0000)]
Merge "Expose phone account register/unregister intents." am:
24299f5b06 am:
b993a44272
am:
d046aa9103
Change-Id: Iece85cdaee561d2e32c634bed2f2bc03a635450c
Nathan Harold [Sat, 15 Apr 2017 22:26:36 +0000 (22:26 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am:
02278a5a02 am:
d50a325553
am:
661278432d
Change-Id: Ie6ed56a31df7a4b9e0730693561786562eb42fc9
Rebecca Silberstein [Sat, 15 Apr 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Add a default SSID prefix for local only hotspot" into oc-dev am:
d8837b6fca
am:
f7ff103c55
Change-Id: I365fb0b25e02f76c32a05217d98112a4c3241a4e
Rebecca Silberstein [Sat, 15 Apr 2017 20:42:34 +0000 (20:42 +0000)]
Merge "Add a default SSID prefix for local only hotspot" into oc-dev
am:
d8837b6fca
Change-Id: I8703b838c83a71f5be27d07e1a514bf4c8d22a17
Rebecca Silberstein [Sat, 15 Apr 2017 20:37:32 +0000 (20:37 +0000)]
Merge "Add a default SSID prefix for local only hotspot" into oc-dev
Ray Essick [Sat, 15 Apr 2017 19:08:10 +0000 (19:08 +0000)]
Merge "Rework getMetrics() api per API council" into oc-dev am:
abbea1df6b
am:
b3934d9043
Change-Id: I0f463f2d04da9a5ecd8ddcad965ce8821b0ee116
Ray Essick [Sat, 15 Apr 2017 19:01:18 +0000 (19:01 +0000)]
Merge "Rework getMetrics() api per API council" into oc-dev
am:
abbea1df6b
Change-Id: I9b8911d615e9521007a1cbb14514d05aef172f57
TreeHugger Robot [Sat, 15 Apr 2017 18:52:01 +0000 (18:52 +0000)]
Merge "Rework getMetrics() api per API council" into oc-dev
Yifan Hong [Sat, 15 Apr 2017 10:11:24 +0000 (10:11 +0000)]
Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev am:
35edfc1fdc
am:
6955963d18
Change-Id: I04617ab2fc8775616aa76f326a2360e6c7bebf69
Yifan Hong [Sat, 15 Apr 2017 10:04:52 +0000 (10:04 +0000)]
Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev
am:
35edfc1fdc
Change-Id: I0b604d7e6faf1b72bb7271fbb4ad7056f9d800ae
TreeHugger Robot [Sat, 15 Apr 2017 10:01:21 +0000 (10:01 +0000)]
Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev
Stephen Chen [Sat, 15 Apr 2017 09:17:51 +0000 (09:17 +0000)]
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev am:
e587591c5a
am:
45a1fa12c0
Change-Id: Ibade5d0264b49cc2e3a5f28af4d520ebff5b0c40
Stephen Chen [Sat, 15 Apr 2017 09:13:41 +0000 (09:13 +0000)]
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev
am:
e587591c5a
Change-Id: I7546e77a0a591ce25b2c771c30b4506d5666cc3f
TreeHugger Robot [Sat, 15 Apr 2017 09:04:30 +0000 (09:04 +0000)]
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev
Kevin Chyn [Sat, 15 Apr 2017 07:16:41 +0000 (07:16 +0000)]
Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev am:
4ea09f5ca4
am:
54b5b6d710
Change-Id: Ic865f205b44d3ba1b851b571a69b97c7a393a958
Kevin Chyn [Sat, 15 Apr 2017 07:11:00 +0000 (07:11 +0000)]
Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev
am:
4ea09f5ca4
Change-Id: I9aa9104818078c058f5f5cefaf3e442873a072e8
TreeHugger Robot [Sat, 15 Apr 2017 07:05:44 +0000 (07:05 +0000)]
Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev
Tyler Gunn [Sat, 15 Apr 2017 06:17:18 +0000 (06:17 +0000)]
Merge "Expose phone account register/unregister intents." am:
24299f5b06
am:
b993a44272
Change-Id: Ic3f8044b7df278b33208fae671abef21ae8f55d2
Tyler Gunn [Sat, 15 Apr 2017 06:13:21 +0000 (06:13 +0000)]
Merge "Expose phone account register/unregister intents."
am:
24299f5b06
Change-Id: Ifbc60e3221bee3813e2c854305144af901067b13
Treehugger Robot [Sat, 15 Apr 2017 06:07:25 +0000 (06:07 +0000)]
Merge "Expose phone account register/unregister intents."
Jorim Jaggi [Sat, 15 Apr 2017 05:02:07 +0000 (05:02 +0000)]
Merge "Wallpaper color extraction API stub" into oc-dev am:
6acf7a7b45
am:
9b24dd3186
Change-Id: Iae905316d4a489de425d0dd8da1b0cf35c559f82
Tyler Gunn [Fri, 14 Apr 2017 20:43:30 +0000 (13:43 -0700)]
Expose phone account register/unregister intents.
These were previously @SystemApi. Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.
Test: Manual
Bug:
37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
Jorim Jaggi [Sat, 15 Apr 2017 04:56:51 +0000 (04:56 +0000)]
Merge "Wallpaper color extraction API stub" into oc-dev
am:
6acf7a7b45
Change-Id: I6d4e70f45b60fc76e017a982f70a2a7b14b3a3a9
Jorim Jaggi [Sat, 15 Apr 2017 04:52:20 +0000 (04:52 +0000)]
Merge "Wallpaper color extraction API stub" into oc-dev
Tyler Gunn [Sat, 15 Apr 2017 04:50:04 +0000 (04:50 +0000)]
Merge "Expose phone account register/unregister intents."
Eugene Susla [Sat, 15 Apr 2017 04:28:02 +0000 (04:28 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev am:
0d88904744
am:
0fb1104b25
Change-Id: I33326544bd1eef9abc900ea13cb2fdf32ad06cbe
Eugene Susla [Sat, 15 Apr 2017 04:22:48 +0000 (04:22 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev
am:
0d88904744
Change-Id: Ie6093be3e7699481473eeb597bc4d604728330a2
TreeHugger Robot [Sat, 15 Apr 2017 04:15:34 +0000 (04:15 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev
Svetoslav Ganov [Sat, 15 Apr 2017 03:37:56 +0000 (03:37 +0000)]
Merge "Add support for multiple fill contexts" into oc-dev am:
41200eac71
am:
721b28f029
Change-Id: I1e3da29514943c1e7476db8bc6a1cbba46b7a116
Svetoslav Ganov [Sat, 15 Apr 2017 03:33:02 +0000 (03:33 +0000)]
Merge "Add support for multiple fill contexts" into oc-dev
am:
41200eac71
Change-Id: I9a66bc2d97efbc19fd0cbfd57dfb13323e3ab31a
Svetoslav Ganov [Sat, 15 Apr 2017 03:29:08 +0000 (03:29 +0000)]
Merge "Add support for multiple fill contexts" into oc-dev
Etan Cohen [Sat, 15 Apr 2017 02:42:20 +0000 (02:42 +0000)]
Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev am:
d98f26e4f3 -s ours
am:
f9e3b532b7 -s ours
Change-Id: Ic2dcb3a90f8e241bcf43a06e785816c81a9da8b1
Etan Cohen [Sat, 15 Apr 2017 02:32:31 +0000 (02:32 +0000)]
Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev
am:
d98f26e4f3 -s ours
Change-Id: Ic728d22ee9d7407df5437e3da0468387f5c098c2
TreeHugger Robot [Sat, 15 Apr 2017 02:16:10 +0000 (02:16 +0000)]
Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev
* changes:
[CM] Unhide the NetworkSpecifier as object API
Make the NetworkSpecifier a class instead of a string.
Add test coverage for NetworkSpecifiers.
Adrian Roos [Sat, 15 Apr 2017 02:02:40 +0000 (02:02 +0000)]
Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev am:
490ef3cda4
am:
153159130f
Change-Id: Iabcf85cb191df80d1a24277dd420e3045838ded8
Eugene Susla [Mon, 10 Apr 2017 18:51:58 +0000 (11:51 -0700)]
API for notification listener for Companioon apps
Test: 1. Trigger the confitrmation dialog.
Ensure it looks exactly like the one from settings.
2. Call an API without associating the appa first
Ensure exception is thrown with a message mentioning the need to associate 1st
Change-Id: I94d4116e1988db869ed445ae3fd018c50590e3f4
Nathan Harold [Sat, 15 Apr 2017 01:59:13 +0000 (01:59 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am:
02278a5a02
am:
d50a325553
Change-Id: I6d55820dc1710035fcab839f6cae809fa44f16da
Yohei Yukawa [Sat, 15 Apr 2017 01:59:05 +0000 (01:59 +0000)]
Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev am:
e61d56fb70
am:
7096e0e076
Change-Id: I8138d58c3fade77ea2311faa728224d0199ae3f6
Adrian Roos [Sat, 15 Apr 2017 01:58:55 +0000 (01:58 +0000)]
Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev
am:
490ef3cda4
Change-Id: I6a808b422c23e0bd695d8422150e57ed9cf874ad
Nathan Harold [Sat, 15 Apr 2017 01:52:24 +0000 (01:52 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE"
am:
02278a5a02
Change-Id: I473f438a0336b8c5183f385f062493abb53966fe
Yohei Yukawa [Sat, 15 Apr 2017 01:51:55 +0000 (01:51 +0000)]
Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev
am:
e61d56fb70
Change-Id: If566134ba9f8ac40cf73a92745b45262681531c9
Adrian Roos [Sat, 15 Apr 2017 01:48:25 +0000 (01:48 +0000)]
Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev
Amith Yamasani [Sat, 15 Apr 2017 01:47:05 +0000 (01:47 +0000)]
Merge "BLE scan API using PendingIntent" into oc-dev am:
7859022e8e
am:
3eca1577fe
Change-Id: I226c5a770d41e3d096658da3148a4089fa3a29f3
TreeHugger Robot [Sat, 15 Apr 2017 01:44:30 +0000 (01:44 +0000)]
Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev
Treehugger Robot [Sat, 15 Apr 2017 01:42:58 +0000 (01:42 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE"
Tyler Gunn [Fri, 14 Apr 2017 20:43:30 +0000 (13:43 -0700)]
Expose phone account register/unregister intents.
These were previously @SystemApi. Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.
Cherry-pick from aosp-master to resolve merge conflicts.
Test: Manual
Bug:
37106957
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
Amith Yamasani [Sat, 15 Apr 2017 01:41:29 +0000 (01:41 +0000)]
Merge "BLE scan API using PendingIntent" into oc-dev
am:
7859022e8e
Change-Id: Ic694cf7dae7e7c151155787da5b079699cec93ed
Wale Ogunwale [Sat, 15 Apr 2017 01:34:27 +0000 (01:34 +0000)]
Merge "Reduce effect on PipMenuActivity during animation" into oc-dev am:
47dea3b16d
am:
a1ba99cbb0
Change-Id: I62498300c52361aad5a81ec7bec58c2e98748347
TreeHugger Robot [Sat, 15 Apr 2017 01:34:03 +0000 (01:34 +0000)]
Merge "BLE scan API using PendingIntent" into oc-dev
Lucas Dupin [Sat, 15 Apr 2017 01:33:08 +0000 (18:33 -0700)]
Wallpaper color extraction API stub
Now it's possible to listen to changes on wallpaper colors by
registering a listener on WallpaperManager. It's also possible
to get the current wallpaper text color hints.
Bug:
36856508
Test: compilation
Change-Id: I5102cb7be9a4af60b85fc8913154a79dfe5c21a0
TreeHugger Robot [Sat, 15 Apr 2017 01:31:06 +0000 (01:31 +0000)]
Merge "Null-check mNavigationBar when returning its view."
Wale Ogunwale [Sat, 15 Apr 2017 01:28:03 +0000 (01:28 +0000)]
Merge "Reduce effect on PipMenuActivity during animation" into oc-dev
am:
47dea3b16d
Change-Id: I57a59e7fe55c50bb69dad7e0de3b8b11a2bb9638
Dianne Hackborn [Sat, 15 Apr 2017 01:27:26 +0000 (01:27 +0000)]
Merge "Introduce a new JobServiceEngine class." into oc-dev am:
aaeb512331
am:
09d3418582
Change-Id: Id5a22d0d77f76cfeb85048dcc9e02edc5773e57d
Philip P. Moltmann [Sat, 15 Apr 2017 01:22:16 +0000 (01:22 +0000)]
Merge "Remove autofillMode attribute" into oc-dev am:
a05f1fdd93
am:
a624433bf0
Change-Id: Idd7b711a67378287eb5a6da3374f2d84e4710a8c
Jeff Sharkey [Sat, 15 Apr 2017 01:19:38 +0000 (01:19 +0000)]
Merge "Clear identity to handle ALLOCATE_AGGRESSIVE." into oc-dev am:
dec3638c1f
am:
5b0d782531
Change-Id: I1e5e8fb84a8489aa1cabc32572e55d6898c02592
TreeHugger Robot [Sat, 15 Apr 2017 01:18:31 +0000 (01:18 +0000)]
Merge "Reduce effect on PipMenuActivity during animation" into oc-dev
Sudheer Shanka [Sat, 15 Apr 2017 01:18:27 +0000 (01:18 +0000)]
Merge "Add new api Activity.getStartInitiatedTime." into oc-dev am:
2359f016e2
am:
225e594388
Change-Id: I64b956ebf369aa19e42920d71fdcac7713ce2c32
Amith Yamasani [Sat, 15 Apr 2017 01:17:16 +0000 (01:17 +0000)]
Merge "MASTER_CLEAR action should not be public" into oc-dev am:
baf1d7036e
am:
6c608ebafb
Change-Id: I76776f7f44a855bde12d6967ef4778523ae89f7a
Phil Burk [Sat, 15 Apr 2017 01:16:05 +0000 (01:16 +0000)]
Merge "BluetoothMidi: request higher priority, for lower latency" into oc-dev am:
e49ad6c70a
am:
8a99d67db0
Change-Id: I97fb3470de4432a5ab408cbad4505b764b8a2b4d
TreeHugger Robot [Sat, 15 Apr 2017 01:08:22 +0000 (01:08 +0000)]
Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager."
Dianne Hackborn [Sat, 15 Apr 2017 01:02:31 +0000 (01:02 +0000)]
Merge "Introduce a new JobServiceEngine class." into oc-dev
am:
aaeb512331
Change-Id: I68e306a970096cdd7d65b13865f70081679759ec
Philip P. Moltmann [Sat, 15 Apr 2017 00:56:44 +0000 (00:56 +0000)]
Merge "Remove autofillMode attribute" into oc-dev
am:
a05f1fdd93
Change-Id: Ib5a661b27a23e7dbaa277a3d3ea1d85a4ab7ba72
Dianne Hackborn [Sat, 15 Apr 2017 00:55:50 +0000 (00:55 +0000)]
Merge "Introduce a new JobServiceEngine class." into oc-dev
TreeHugger Robot [Sat, 15 Apr 2017 00:50:45 +0000 (00:50 +0000)]
Merge "Remove autofillMode attribute" into oc-dev
Stephen Chen [Wed, 29 Mar 2017 22:51:42 +0000 (15:51 -0700)]
Remove ScoredNetwork.BADGING constants.
Bug:
35323372
Bug:
35114358
Test: make, runtest --path
frameworks/base/core/tests/coretests/src/android/net/ScoredNetworkTest.java
Change-Id: I9640e374abe428235d94e0407d9d21f390550d2f
Svet Ganov [Fri, 14 Apr 2017 04:56:16 +0000 (21:56 -0700)]
Add support for multiple fill contexts
When saving data filled by the user the platform provides to
an autofill provider the state of the UI allowing the provider
to interpret this state and store relevant information.
A limitation of the current design is that the fill provider
needs to interpret the screen content twice, once handling a
fill request and once handling a save request. To address this
we are introducing a id for each fill request allowing the
autofill provider to associate arbitrary state with each fill
request and store it in the client data bundle later passed
to save.
Another limitation of the current design is that if the screen
changes dynamically while the user interacts with the app the
UI state passed on save represents a static snapshot, therefore
it is not possible to the autofill provider to determine the
context in which the data in the UI was filled. We could
keep the views and have deltas for views being removed/added
/moved/changed but this is not enough as the fill provider
needs to know not only what changed but what changed for every
fill request and in one session there could be multiple fill
requests. To address this we provide a list of fill contexts
on save each of which has the id of the corresponding fill
request. This allows the fill provider to know the exact context
in which the data was popuplated and also use its custom client
state for this fill request if desired.
This change deprecates the old APIs and the new ones delegate
to the old ones. Once the clients migrate to the new APIs we
will remove the old ones.
Test: all autofill CTS tests pass
Change-Id: Idcebcc671aa3c078a305d8c358e225274fccc588
Jeff Sharkey [Sat, 15 Apr 2017 00:36:24 +0000 (00:36 +0000)]
Merge "Clear identity to handle ALLOCATE_AGGRESSIVE." into oc-dev
am:
dec3638c1f
Change-Id: I9cc266dd67fac65859d86f77f085eb45b4e73701
Kevin Chyn [Mon, 10 Apr 2017 21:53:59 +0000 (14:53 -0700)]
Keyguard should authenticate with FP even after getting valid FP
There may be strange states where the user is already authenticated
but still on the lockscreen. The user should be able to dismiss
keyguard in that state.
Fixes:
29306222
Test: unlock phone
go back to keyguard
swipe up screen half way
touch fingerprint sensor (icon should change to unlocked)
then touch fingerprint sensor again (keyguard should be dismissed)
Test: unlock phone and go to settings -> Pixel Imprint
lock phone, unlock phone with fingerprint
touch sensor again and make sure Pixel Imprint page also responds to FP
do this test at least 10 times
Change-Id: I86acd520a06a68fab3548dd4cf6153a7833114fe
TreeHugger Robot [Sat, 15 Apr 2017 00:30:27 +0000 (00:30 +0000)]
Merge "Clear identity to handle ALLOCATE_AGGRESSIVE." into oc-dev
Ray Essick [Fri, 14 Apr 2017 17:22:55 +0000 (10:22 -0700)]
Rework getMetrics() api per API council
Reworking the media metrics getMetrics() calls (currently in MediaCodec,
MediaExtractor, MediaPlayer, and MediaRecorder) to fit new direction
from the API Council.
Drop the MediaMetricsSet that we had in the first round; go back
to a PersistableBundle as the return type. Moves the key definitions
from MediaMetricsSet.MediaCodec to MediaCodec.MetricsConstants
Bug:
37083862
Test: ran the corresponding CTS tests
Change-Id: I7905959ad2109887dd8fd16f0eb2831247abab2a
Makoto Onuki [Sat, 15 Apr 2017 00:19:01 +0000 (17:19 -0700)]
resolve merge conflicts of
25e893c7d5d3 to master
Test: build
Change-Id: I43d3eb486d8a6600cfc793d6324b8fe23a241f0f
Sudheer Shanka [Sat, 15 Apr 2017 00:17:26 +0000 (00:17 +0000)]
Merge "Add new api Activity.getStartInitiatedTime." into oc-dev
am:
2359f016e2
Change-Id: I8a2ab94f67894736188fd62df8503dfa637ad9ed
Sudheer Shanka [Sat, 15 Apr 2017 00:09:26 +0000 (00:09 +0000)]
Merge "Add new api Activity.getStartInitiatedTime." into oc-dev
Android Build Merger (Role) [Sat, 15 Apr 2017 00:02:49 +0000 (00:02 +0000)]
Merge "Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev am:
21da54587b am:
3b3d9f8415"
TreeHugger Robot [Sat, 15 Apr 2017 00:02:22 +0000 (00:02 +0000)]
Merge "Cleanup that wasn't uploaded with ag/
2094132"
Svetoslav Ganov [Sat, 15 Apr 2017 00:02:01 +0000 (00:02 +0000)]
Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev am:
21da54587b
am:
3b3d9f8415
Change-Id: If448d00811124f5a12d9cae166e2c81a83d13f02
Roozbeh Pournader [Sat, 15 Apr 2017 00:00:36 +0000 (00:00 +0000)]
Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev am:
2a05c5edb7
am:
2ad47527f8
Change-Id: Ib0639bc5e7b5e761d800b3e87915b59cd8523bb0
Eugene Susla [Fri, 14 Apr 2017 23:59:25 +0000 (23:59 +0000)]
[DO NOT MERGE] Add an opnion to use advertised name for renaming am:
75fb821029
am:
ac4e846ccd
Change-Id: I9296605dab1f6f0839d4e08fa4d35329aa19a454
Eugene Susla [Fri, 14 Apr 2017 23:58:16 +0000 (23:58 +0000)]
[DO NOT MERGE] Stop scan on device chooser activity backgrounded am:
200c37f413
am:
c242b76a4b
Change-Id: I0bda2f7f098721c3adf13adaa9016d02244a30b3
Eugene Susla [Fri, 14 Apr 2017 23:57:06 +0000 (23:57 +0000)]
[DO NOT MERGE] Improve the error msg when started not for result am:
5423b4e0a8
am:
24cf2d9d72
Change-Id: I8b55e20253230f838555162a9d57c4f5f6ae56b4
Amith Yamasani [Fri, 14 Apr 2017 23:57:05 +0000 (23:57 +0000)]
Merge "MASTER_CLEAR action should not be public" into oc-dev
am:
baf1d7036e
Change-Id: I361e8369ec16da7d032680530223463228921616
Svetoslav Ganov [Fri, 14 Apr 2017 23:55:56 +0000 (23:55 +0000)]
Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev am:
728ce60465
am:
c9741d133d -s ours
Change-Id: I62123b943a59fb73302f2a094cd8133da15d5060
Phil Burk [Fri, 14 Apr 2017 23:55:42 +0000 (23:55 +0000)]
Merge "BluetoothMidi: request higher priority, for lower latency" into oc-dev
am:
e49ad6c70a
Change-Id: Idcece5b34d81cdeb43eb9196d7d29c3023605782
Philip Quinn [Fri, 14 Apr 2017 17:06:52 +0000 (10:06 -0700)]
Null-check mNavigationBar when returning its view.
Without this check there's no way to avoid a NullPointerException if
getNavigationBarView() is called before the navigation bar fragment is
created.
Bug:
36852229
Bug:
37330416
Bug:
37331698
Fixes:
36508501
Test: make -j; cannot reproduce bugs.
Change-Id: Ia3c9b4eaea26b78cdc39a446918047eb1f440d70
TreeHugger Robot [Fri, 14 Apr 2017 23:50:22 +0000 (23:50 +0000)]
Merge "MASTER_CLEAR action should not be public" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 23:49:13 +0000 (23:49 +0000)]
Merge "BluetoothMidi: request higher priority, for lower latency" into oc-dev
Makoto Onuki [Fri, 14 Apr 2017 23:39:03 +0000 (23:39 +0000)]
Merge "Fix the wrong IMPORTANCE_ values." into oc-dev
am:
5f085792f6
Change-Id: I263f5cd22bf45a0b7f2f8599d28807e6464a5c2c
Svetoslav Ganov [Fri, 14 Apr 2017 23:34:22 +0000 (23:34 +0000)]
Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev
am:
21da54587b
Change-Id: I332d4aeeb7eb14a0b51a60382c8efedf4e1d5375
Roozbeh Pournader [Fri, 14 Apr 2017 23:33:01 +0000 (23:33 +0000)]
Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev
am:
2a05c5edb7
Change-Id: I4752951eee34ec5e98368a1b0a68ecb3cbf449cb
Eugene Susla [Fri, 14 Apr 2017 23:31:53 +0000 (23:31 +0000)]
[DO NOT MERGE] Add an opnion to use advertised name for renaming
am:
75fb821029
Change-Id: Iead08333400d2ddc0568ae3b7f09f6ccb7fdbc1f
Eugene Susla [Fri, 14 Apr 2017 23:30:46 +0000 (23:30 +0000)]
[DO NOT MERGE] Stop scan on device chooser activity backgrounded
am:
200c37f413
Change-Id: I29fbe568cccac08e6fa28ec8cf1c027290d35efc
OSDN Git Service
