OSDN Git Service
Jason Monk [Fri, 20 Apr 2018 14:19:10 +0000 (07:19 -0700)]
Merge "Add way to use sysui as a broadcast relay for slices" into pi-dev am:
ea56921d76
am:
a2045b83ff
Change-Id: I11eeab1fd42cfd5f00e42b797f17ef21e14bc530
Tomasz Wasilczyk [Fri, 20 Apr 2018 14:11:25 +0000 (07:11 -0700)]
Merge "Don't check program selector's type for equality." into pi-dev am:
a2015451a7
am:
74a2955d35
Change-Id: I2bcfc30020e0ee9bdee8e38dc124c9ea49df5ceb
Jason Monk [Fri, 20 Apr 2018 14:07:44 +0000 (07:07 -0700)]
Merge "Add way to use sysui as a broadcast relay for slices" into pi-dev
am:
ea56921d76
Change-Id: I99e4fc78627ca79eb7ed3f6eced0825c5345669f
Tomasz Wasilczyk [Fri, 20 Apr 2018 14:02:48 +0000 (07:02 -0700)]
Merge "Don't check program selector's type for equality." into pi-dev
am:
a2015451a7
Change-Id: Id2bf66e26c54a2a8cc86b408b240d6984fb5b97b
TreeHugger Robot [Fri, 20 Apr 2018 13:54:15 +0000 (13:54 +0000)]
Merge "Add way to use sysui as a broadcast relay for slices" into pi-dev
Tomasz Wasilczyk [Fri, 20 Apr 2018 13:49:39 +0000 (13:49 +0000)]
Merge "Don't check program selector's type for equality." into pi-dev
Adrian Roos [Fri, 20 Apr 2018 13:49:36 +0000 (06:49 -0700)]
Merge "WM: Only update magnification bounds when they are visible" into pi-dev am:
8788cffd05
am:
bcf3bd60b7
Change-Id: I8ae654a8f46a6d6e998a4597c6396da47334336e
Adrian Roos [Fri, 20 Apr 2018 13:41:02 +0000 (06:41 -0700)]
Merge "WM: Only update magnification bounds when they are visible" into pi-dev
am:
8788cffd05
Change-Id: I8b69b0f4d3f9d35e5e341a3638ac13106918f015
TreeHugger Robot [Fri, 20 Apr 2018 13:31:12 +0000 (13:31 +0000)]
Merge "WM: Only update magnification bounds when they are visible" into pi-dev
Adrian Roos [Fri, 20 Apr 2018 12:39:13 +0000 (05:39 -0700)]
Merge "AOD: Add additional delayed dozeTimeTick after unpausing" into pi-dev am:
d8c77c94ff
am:
67a2f7bdb3
Change-Id: I7cd1ae0e75b771078961c72ded9c64cc156bd3e1
Jason Monk [Fri, 20 Apr 2018 02:14:46 +0000 (22:14 -0400)]
Add way to use sysui as a broadcast relay for slices
Test: runtest systemui
Bug:
78139069
Change-Id: I64c4d56cca005cec7204bf45215bb7b0015f4571
Adrian Roos [Fri, 20 Apr 2018 12:31:58 +0000 (05:31 -0700)]
Merge "AOD: Add additional delayed dozeTimeTick after unpausing" into pi-dev
am:
d8c77c94ff
Change-Id: Icc60544a98e6a0357207d45600c8f943efc0d169
Bernie Innocenti [Fri, 20 Apr 2018 12:04:32 +0000 (05:04 -0700)]
Merge "Adjust APF interpreter tests to match APFv4" into pi-dev am:
580a1ed904
am:
260dc7fdf5
Change-Id: Ia8677ff90a2eb8c21cabd1e105680e6e3b4eb374
TreeHugger Robot [Fri, 20 Apr 2018 12:04:12 +0000 (12:04 +0000)]
Merge "AOD: Add additional delayed dozeTimeTick after unpausing" into pi-dev
Chalard Jean [Fri, 20 Apr 2018 11:59:52 +0000 (04:59 -0700)]
Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev am:
f12a2130a4
am:
1bb54ae872
Change-Id: I6bdbef78d078d68534c8e07e9af031ce374560ef
Bernie Innocenti [Fri, 20 Apr 2018 11:54:18 +0000 (04:54 -0700)]
Merge "Adjust APF interpreter tests to match APFv4" into pi-dev
am:
580a1ed904
Change-Id: Ibe5ad60bb0a7872e1d23ff181933a882fb5873f1
Chalard Jean [Fri, 20 Apr 2018 11:49:43 +0000 (04:49 -0700)]
Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev
am:
f12a2130a4
Change-Id: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
TreeHugger Robot [Fri, 20 Apr 2018 11:41:52 +0000 (11:41 +0000)]
Merge "Adjust APF interpreter tests to match APFv4" into pi-dev
Jorim Jaggi [Fri, 20 Apr 2018 11:26:21 +0000 (04:26 -0700)]
Merge "Fix cutout with temp inset bounds" into pi-dev am:
db704ca8bf
am:
011c9192f4
Change-Id: I6e5eea8b73a96738926040f7e98c74bda8c97068
TreeHugger Robot [Fri, 20 Apr 2018 11:23:56 +0000 (11:23 +0000)]
Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev
Jorim Jaggi [Fri, 20 Apr 2018 11:17:20 +0000 (04:17 -0700)]
Merge "Fix cutout with temp inset bounds" into pi-dev
am:
db704ca8bf
Change-Id: I53a97c7e9a64e583678f61cb12c5329cbf090c37
David Brazdil [Fri, 20 Apr 2018 11:10:43 +0000 (04:10 -0700)]
Merge "Add intrinsics on light greylist" into pi-dev am:
9aa2a33cf3
am:
b25bc44fb8
Change-Id: Ic618e37525a6f8aa3972251217a75e4904cf1382
Jorim Jaggi [Fri, 20 Apr 2018 11:09:16 +0000 (11:09 +0000)]
Merge "Fix cutout with temp inset bounds" into pi-dev
David Brazdil [Fri, 20 Apr 2018 10:59:17 +0000 (03:59 -0700)]
Merge "Add intrinsics on light greylist" into pi-dev
am:
9aa2a33cf3
Change-Id: I6ecc66df22631f0f5cd4766659f5d18530a96b43
Peter Visontay [Fri, 20 Apr 2018 10:55:09 +0000 (10:55 +0000)]
Merge "Add unit test for AppOps logic where a different op is used to control an app op."
David Brazdil [Fri, 20 Apr 2018 10:45:26 +0000 (10:45 +0000)]
Merge "Add intrinsics on light greylist" into pi-dev
Nicolas Geoffray [Fri, 20 Apr 2018 10:04:43 +0000 (03:04 -0700)]
Merge "Light grey java.net.HttpCookie fields." into pi-dev am:
75d3d96084
am:
07b8c37b7f
Change-Id: I0053c45c6bbb8192a896377c592c15928cecc045
Nicolas Geoffray [Fri, 20 Apr 2018 09:56:23 +0000 (02:56 -0700)]
Merge "Add some widget APIS to light grey." into pi-dev am:
2c321ccd7e
am:
f716803d11
Change-Id: Ieb3682bad102a37c02a76d9a68184c64930dcb76
Nicolas Geoffray [Fri, 20 Apr 2018 09:53:43 +0000 (02:53 -0700)]
Merge "Light grey java.net.HttpCookie fields." into pi-dev
am:
75d3d96084
Change-Id: I873079b40dcdce17655f08d9d50bacc93cb52e91
Nicolas Geoffray [Fri, 20 Apr 2018 09:48:56 +0000 (02:48 -0700)]
Merge "Add some widget APIS to light grey." into pi-dev
am:
2c321ccd7e
Change-Id: I85c636d73f89845c4657eb4adbe66ba8c0257eaa
Nicolas Geoffray [Fri, 20 Apr 2018 09:37:36 +0000 (09:37 +0000)]
Merge "Light grey java.net.HttpCookie fields." into pi-dev
Nicolas Geoffray [Fri, 20 Apr 2018 09:37:06 +0000 (09:37 +0000)]
Merge "Add some widget APIS to light grey." into pi-dev
Tarandeep Singh [Fri, 20 Apr 2018 08:41:23 +0000 (08:41 +0000)]
Merge "Make InputMethod core tests presubmit"
Bernie Innocenti [Mon, 16 Apr 2018 14:27:51 +0000 (23:27 +0900)]
Adjust APF interpreter tests to match APFv4
Change-Id: I4311c754f1cb79633d49c5c1c0b4e27c8dde727e
Bug:
73804303
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
(cherry picked from commit
545d9367e24d1d55b2539c02273f92c61da74af0)
Mathew Inwood [Fri, 20 Apr 2018 08:30:42 +0000 (01:30 -0700)]
Merge "StrictMode: fix non-SDK API usage detection." into pi-dev am:
c72ee1a4f2
am:
9e2b236462
Change-Id: I2def7ae679f683c22093349ffdab33d9009f20da
Mathew Inwood [Fri, 20 Apr 2018 08:20:19 +0000 (01:20 -0700)]
Merge "StrictMode: fix non-SDK API usage detection." into pi-dev
am:
c72ee1a4f2
Change-Id: If0db894c3cb9660eb187280cda21423866387799
Mathew Inwood [Fri, 20 Apr 2018 08:04:07 +0000 (08:04 +0000)]
Merge "StrictMode: fix non-SDK API usage detection." into pi-dev
Chalard Jean [Wed, 11 Apr 2018 07:36:41 +0000 (16:36 +0900)]
Add the list of private DNS addresses to LinkProperties
Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug:
73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
Lucas Dupin [Fri, 20 Apr 2018 07:46:25 +0000 (00:46 -0700)]
Merge changes I7c48a326,I7395ecd4 into pi-dev am:
4e4b6ff508
am:
b06836197b
Change-Id: I5c9494641ddad266f211789dd50af240b4831858
Lucas Dupin [Fri, 20 Apr 2018 07:38:47 +0000 (00:38 -0700)]
Merge changes I7c48a326,I7395ecd4 into pi-dev
am:
4e4b6ff508
Change-Id: I90fddaaf9a2fd3027d689bf356d2929c93323d5e
TreeHugger Robot [Fri, 20 Apr 2018 07:26:35 +0000 (07:26 +0000)]
Merge changes I7c48a326,I7395ecd4 into pi-dev
* changes:
Fix wrong bouncer translation during hint animation
Keep animating bouncer when fingerprint
Lucas Dupin [Fri, 20 Apr 2018 04:08:52 +0000 (12:08 +0800)]
Fix wrong bouncer translation during hint animation
It's not correct to assume that the bouncer translation is 0 when the
unlock hint animation is running. The correct translation is 1 since
the view is completely hidden.
FalsingManager was receiving the wrong bouncer state, and this caused
the rejection swipe gestures.
Change-Id: I7c48a326f054a2c09809e5a1096ca42907472eac
Fixes:
78108854
Test: tap on scrim, swipe notification
Test: turn on flasing logs, look at logcat
Test: go/sysui-bouncer-tests
TreeHugger Robot [Fri, 20 Apr 2018 03:39:12 +0000 (03:39 +0000)]
Merge "Add more trace categories."
Bernie Innocenti [Fri, 20 Apr 2018 03:32:11 +0000 (20:32 -0700)]
Merge "apf: Add immediate encoding tests for LI" am:
9ee5bb0037 am:
b0e8ab677b
am:
b5d0b5f9b5
Change-Id: I3cf8a3392456b827b06c1b0b3ffaa7fab1331389
Jin Seok Park [Fri, 20 Apr 2018 03:24:36 +0000 (20:24 -0700)]
Merge "ExifInterface: Prevent infinite loop" into pi-dev am:
6cc4575ced
am:
bedf1e4560
Change-Id: I68a6e502817d30443a69edc228b5ba803918f086
Bernie Innocenti [Fri, 20 Apr 2018 03:21:11 +0000 (20:21 -0700)]
Merge "apf: Add immediate encoding tests for LI" am:
9ee5bb0037
am:
b0e8ab677b
Change-Id: Ia02de6226d85713037fcd86726fec4a04d5d630a
Jeff Sharkey [Fri, 20 Apr 2018 03:19:12 +0000 (20:19 -0700)]
Merge "Never interact with "phone" while holding locks." into pi-dev am:
d101084db7
am:
bb583d87a4
Change-Id: I55fdbde2dcc469ea50e62eb2eb3d293a3ebfa4b4
Jin Seok Park [Fri, 20 Apr 2018 03:09:37 +0000 (20:09 -0700)]
Merge "ExifInterface: Prevent infinite loop" into pi-dev
am:
6cc4575ced
Change-Id: I67d83deefa067c16e98b2fbd64f48295a3bee69f
Jeff Sharkey [Fri, 20 Apr 2018 03:08:03 +0000 (20:08 -0700)]
Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev am:
ddb15c471c
am:
37bbe98e86
Change-Id: If8cfddaf96d28b3815dd6dca6aa52a7b9bd15da6
gopinath [Fri, 20 Apr 2018 03:03:07 +0000 (20:03 -0700)]
Merge "Add more trace categories." into pi-dev am:
6d9f7943fb
am:
b60c453620
Change-Id: Id8552da026c343728dd9ce5d633bd7f3aae0054c
Jeff Sharkey [Fri, 20 Apr 2018 03:00:48 +0000 (20:00 -0700)]
Merge "Never interact with "phone" while holding locks." into pi-dev
am:
d101084db7
Change-Id: I570994cd8ab5c7499dfa94b17e42687181637de0
Bernie Innocenti [Fri, 20 Apr 2018 02:57:40 +0000 (19:57 -0700)]
Merge "apf: Add immediate encoding tests for LI"
am:
9ee5bb0037
Change-Id: I1fa1423342efc4af8cf68a512b6ffe05a3c07f8b
Jeff Sharkey [Fri, 20 Apr 2018 02:55:24 +0000 (19:55 -0700)]
Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
am:
ddb15c471c
Change-Id: Ieccbac3a53b14f196a3ceb7924f7bb6880660c97
gopinath [Fri, 20 Apr 2018 02:50:52 +0000 (19:50 -0700)]
Merge "Add more trace categories." into pi-dev
am:
6d9f7943fb
Change-Id: Ib0817f4a53ab63e895a8a57d33841a362e358fa6
Pavlin Radoslavov [Fri, 20 Apr 2018 02:49:11 +0000 (19:49 -0700)]
[automerger skipped] Merge "Fix the implementation of BluetoothCodecStatus.equals()" into pi-dev am:
1c75189a0a -s ours
am:
17d9269377 -s ours
Change-Id: I2b9e013e3e1eb80913344f5a392cb2907cc031f4
TreeHugger Robot [Fri, 20 Apr 2018 02:43:54 +0000 (02:43 +0000)]
Merge "ExifInterface: Prevent infinite loop" into pi-dev
Winson Chung [Fri, 20 Apr 2018 02:42:10 +0000 (19:42 -0700)]
Merge "Workaround to ensure we cancel the recents animation prior to starting home" into pi-dev am:
1c0d00fac4
am:
c39572a1bf
Change-Id: Ic2e3c3230b8e17f502b23a20053169b39b76c032
Jeff Sharkey [Fri, 20 Apr 2018 02:38:09 +0000 (02:38 +0000)]
Merge "Never interact with "phone" while holding locks." into pi-dev
Jeff Sharkey [Fri, 20 Apr 2018 02:38:01 +0000 (02:38 +0000)]
Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
Lucas Dupin [Fri, 20 Apr 2018 02:28:07 +0000 (10:28 +0800)]
Keep animating bouncer when fingerprint
Before we wouldn't update the bouncer expansion after being unlocked,
this leads to a border case where the bouncer would be stuck if the user
authenticates with fingerprint while dragging up.
Change-Id: I7395ecd400957c656671640c7510fb279c671af3
Fixes:
78035213
Test: go/sysui-bouncer-tests
Pavlin Radoslavov [Fri, 20 Apr 2018 02:26:19 +0000 (19:26 -0700)]
[automerger skipped] Merge "Fix the implementation of BluetoothCodecStatus.equals()" into pi-dev
am:
1c75189a0a -s ours
Change-Id: I6317f4dd82a03daa5ec05844605b84baba72a9bc
Bernie Innocenti [Fri, 20 Apr 2018 02:15:11 +0000 (19:15 -0700)]
Merge "Add support for reading a snapshot of the APF data" into pi-dev am:
20c294be69
am:
146f33fcb3
Change-Id: I283fd5fb71f8a679911e58c487a4ac12a5190049
TreeHugger Robot [Fri, 20 Apr 2018 02:12:44 +0000 (02:12 +0000)]
Merge "Add more trace categories." into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 02:12:09 +0000 (02:12 +0000)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()" into pi-dev
Brad Stenning [Fri, 20 Apr 2018 02:07:59 +0000 (19:07 -0700)]
Merge "Allow more than one temp view to be registered at a time" into pi-dev am:
501889c7d1
am:
ecaf49e161
Change-Id: I3e8fa2b72c0c22d8e4dcc81003b1e2148f6bb932
Winson Chung [Fri, 20 Apr 2018 02:07:23 +0000 (19:07 -0700)]
Merge "Workaround to ensure we cancel the recents animation prior to starting home" into pi-dev
am:
1c0d00fac4
Change-Id: Iaf7247b5134efe7334edfa0d16a56fb8b31af392
Winson Chung [Fri, 20 Apr 2018 01:54:09 +0000 (01:54 +0000)]
Merge "Workaround to ensure we cancel the recents animation prior to starting home" into pi-dev
Pavlin Radoslavov [Fri, 20 Apr 2018 01:53:01 +0000 (18:53 -0700)]
Merge "Merge "Fix the implementation of BluetoothCodecStatus.equals()" am:
3a1ca762c9 am:
493dbf789f" into pi-dev-plus-aosp
am:
f6cd5882fa
Change-Id: Ibcd642fd8a56d6f62a1eda298c4b18db48953ab0
Bernie Innocenti [Fri, 20 Apr 2018 01:45:10 +0000 (18:45 -0700)]
Merge "Add support for reading a snapshot of the APF data" into pi-dev
am:
20c294be69
Change-Id: I3b940f5a3b795f85d244882eaa7eca56bd9e167d
Lucas Dupin [Fri, 20 Apr 2018 01:42:22 +0000 (18:42 -0700)]
Merge "Clock padding and motion adjustments" into pi-dev am:
96b4b4bd4e
am:
3f7fd45e2b
Change-Id: Ifc7ee7ad4345baa6b1ba991963a7d27561425c19
Brad Stenning [Fri, 20 Apr 2018 01:38:41 +0000 (18:38 -0700)]
Merge "Allow more than one temp view to be registered at a time" into pi-dev
am:
501889c7d1
Change-Id: I301a2dabdd968e50d6c145ec3208e237329091fb
Jin Seok Park [Fri, 30 Mar 2018 09:07:30 +0000 (18:07 +0900)]
ExifInterface: Prevent infinite loop
A corrupted image file may create two problems.
1. A corrupted IFD pointer may point to an IFD that has already
been read, thus creating an infinite loop and a stack overflow.
2. A corrupted IFD offset value may have a negative value, thus
prompting a random reading of the file and creating an infinite
loop.
This CL addresses these issues.
Bug:
63800695
Test: Run cts (ExifInterfaceTest)
Change-Id: I706a0c3eae6af8301af69407333ea88e5681df3c
Erik Kline [Fri, 20 Apr 2018 01:35:36 +0000 (18:35 -0700)]
[automerger skipped] Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev am:
dd08f4b96a -s ours
am:
cf4967bfec -s ours
Change-Id: I3fdd26fc64c676fc9302ee401940a97cfae09ab3
TreeHugger Robot [Fri, 20 Apr 2018 01:26:49 +0000 (01:26 +0000)]
Merge "Add support for reading a snapshot of the APF data" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 01:23:05 +0000 (01:23 +0000)]
Merge "Allow more than one temp view to be registered at a time" into pi-dev
Salvador Martinez [Fri, 20 Apr 2018 01:12:34 +0000 (18:12 -0700)]
Merge "Add ability to set onShowListener to custom dialog pref" into pi-dev am:
c2120a10f7
am:
2ab853d940
Change-Id: I3d8e378fc347678beaf5be3eda8e382aae88b9b3
Android Build Merger (Role) [Fri, 20 Apr 2018 01:09:56 +0000 (01:09 +0000)]
Merge "Merge "Fix the implementation of BluetoothCodecStatus.equals()" am:
3a1ca762c9 am:
493dbf789f" into pi-dev-plus-aosp
Treehugger Robot [Fri, 20 Apr 2018 01:09:33 +0000 (01:09 +0000)]
Merge "apf: Add immediate encoding tests for LI"
Pavlin Radoslavov [Fri, 20 Apr 2018 01:08:38 +0000 (18:08 -0700)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()" am:
3a1ca762c9
am:
493dbf789f
Change-Id: I5e10a7e35a7befe7d88cd875d7dbcc9b6a7bbb8f
Lucas Dupin [Fri, 20 Apr 2018 01:04:51 +0000 (18:04 -0700)]
Merge "Clock padding and motion adjustments" into pi-dev
am:
96b4b4bd4e
Change-Id: I932fab6fe4d87fc55e3275b2ca0903fd6b34a34f
Sanry Huang [Fri, 20 Apr 2018 01:04:10 +0000 (18:04 -0700)]
Merge "Fix b/
77867175: Clear all of NavigationPanel is missing" into pi-dev am:
f0b7418f1b
am:
82a4b03e6e
Change-Id: I119fd195425793626f9cba5fc85d43ea34169a85
Pavlin Radoslavov [Fri, 20 Apr 2018 00:59:36 +0000 (17:59 -0700)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()"
am:
3a1ca762c9
Change-Id: I159c2128068021b5ca5e0a7bf3eae218de0bdf1b
gopinath [Fri, 20 Apr 2018 00:54:06 +0000 (17:54 -0700)]
Add more trace categories.
Add tracing for additional filters as well.
Bug : b/
78244687, b/
78301352
Test: atest hot-nodropcache-stable-test
Change-Id: Ie6fd109b645c92dcfa414e3c41cc5f43032fe6fd
gopinath [Fri, 20 Apr 2018 00:54:06 +0000 (17:54 -0700)]
Add more trace categories.
Add tracing for additional filters as well.
Bug : b/
78244687, b/
78301352
Test: atest hot-nodropcache-stable-test
Change-Id: Ie6fd109b645c92dcfa414e3c41cc5f43032fe6fd
Erik Kline [Fri, 20 Apr 2018 00:53:50 +0000 (17:53 -0700)]
[automerger skipped] Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev
am:
dd08f4b96a -s ours
Change-Id: Id8753d01a14d062baaeb313437b15f03161d1477
Jack He [Fri, 20 Apr 2018 00:47:29 +0000 (17:47 -0700)]
Merge "AudioService: Add warning log when handleDeviceConnection failed" into pi-dev am:
6664f982a7
am:
107cbd78b3
Change-Id: I14936223b4ac35776659ecd47da7acadd591fbd2
Salvador Martinez [Fri, 20 Apr 2018 00:45:51 +0000 (17:45 -0700)]
Merge "Add ability to set onShowListener to custom dialog pref" into pi-dev
am:
c2120a10f7
Change-Id: I06fddba7f72558bdc2b32fb768e550317264dbfe
TreeHugger Robot [Fri, 20 Apr 2018 00:43:53 +0000 (00:43 +0000)]
Merge "Clock padding and motion adjustments" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 00:39:14 +0000 (00:39 +0000)]
Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev
Pavlin Radoslavov [Thu, 19 Apr 2018 21:16:15 +0000 (14:16 -0700)]
Fix the implementation of BluetoothCodecStatus.equals()
Previously, the BluetoothCodecStatus.equals() implementation
was incorrect when comparing arrays of capabilities.
In the new implementation, the arrays are compared correctly,
and also the ordering of the capabilities in each array is ignored.
Also, added unit tests for class BluetoothCodecConfig and class
BluetoothCodecStatus.
Bug:
73404858
Bug:
73379307
Test: Unit tests (in frameworks/base)
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecConfigTest.java
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecStatusTest.java
Change-Id: If22087465397b7c4175c33f7d1909a15d957fb24
Merged-In: If22087465397b7c4175c33f7d1909a15d957fb24
(cherry picked from commit
9d36e6babc38cf7017726a587b656bdd6f8b0051)
Sanry Huang [Fri, 20 Apr 2018 00:21:11 +0000 (17:21 -0700)]
Merge "Fix b/
77867175: Clear all of NavigationPanel is missing" into pi-dev
am:
f0b7418f1b
Change-Id: I31ed361998a6824a54af7ba27c503263fdcc6e1e
Felipe Leme [Fri, 20 Apr 2018 00:17:46 +0000 (17:17 -0700)]
Merge changes from topic "revert_save_info" into pi-dev am:
4dddd61fa8
am:
76af91dddb
Change-Id: Ib7e1b48958a5a92dbf5bb10eb3fc58b9baa8f242
TreeHugger Robot [Fri, 20 Apr 2018 00:15:45 +0000 (00:15 +0000)]
Merge "Add ability to set onShowListener to custom dialog pref" into pi-dev
Jack He [Fri, 20 Apr 2018 00:13:45 +0000 (17:13 -0700)]
Merge "AudioService: Add warning log when handleDeviceConnection failed" into pi-dev
am:
6664f982a7
Change-Id: Id5dfb9bb2176d2117a4b4fb1477bc7e3009ddc2e
Amin Shaikh [Fri, 20 Apr 2018 00:11:54 +0000 (17:11 -0700)]
Merge "Update wifi enabled state when connected." into pi-dev am:
8a87e9ddd8
am:
1ee437e493
Change-Id: I8465b8e902a525544af886d7453dd9de8b28e480
Sanry Huang [Fri, 20 Apr 2018 00:03:33 +0000 (00:03 +0000)]
Merge "Fix b/
77867175: Clear all of NavigationPanel is missing" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 23:57:37 +0000 (23:57 +0000)]
Merge "Migrated various apps under frameworks/base/packages/CaptivePortalLogin to androidx"
Treehugger Robot [Thu, 19 Apr 2018 23:55:31 +0000 (23:55 +0000)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()"
Felipe Leme [Thu, 19 Apr 2018 23:55:11 +0000 (16:55 -0700)]
Merge changes from topic "revert_save_info" into pi-dev
am:
4dddd61fa8
Change-Id: Iff89691076a2136bafa1130f97cb71fa1177737d
Amin Shaikh [Thu, 19 Apr 2018 23:52:59 +0000 (16:52 -0700)]
Merge "Allow QS expansion in switch access mode." into pi-dev am:
caa429eada
am:
32966e2ae1
Change-Id: I910f51aa99c993b38c1ff6510672290db3de032a
OSDN Git Service
