OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Fix layering of non-IME target windows in IME-target app in split-screen....
Robert Carr [Fri, 20 Apr 2018 19:41:15 +0000 (12:41 -0700)]
Merge "Fix layering of non-IME target windows in IME-target app in split-screen." into pi-dev
am: 12a6cd7457

Change-Id: Ie5b6c1967b4bfeed601fd7a32387ab8dbce0dc2a

6 years agoMerge "Fix layering of non-IME target windows in IME-target app in split-screen....
TreeHugger Robot [Fri, 20 Apr 2018 19:29:15 +0000 (19:29 +0000)]
Merge "Fix layering of non-IME target windows in IME-target app in split-screen." into pi-dev

6 years agoMerge "Fix fraction and dimension type in Resource.proto" into pi-dev
Michael Wachenschwanz [Fri, 20 Apr 2018 19:25:47 +0000 (12:25 -0700)]
Merge "Fix fraction and dimension type in Resource.proto" into pi-dev
am: 1a12311433

Change-Id: I2463fab9dd5705a4af11fa17aebf0c23c7c12d07

6 years agoMerge "SmartLinkify - handle keyboard clicks" into pi-dev
Abodunrinwa Toki [Fri, 20 Apr 2018 19:05:24 +0000 (12:05 -0700)]
Merge "SmartLinkify - handle keyboard clicks" into pi-dev
am: 686fab1464

Change-Id: I90f3d9ca20c9bb5a5f3c62da061e74d8517b5864

6 years agoMerge "Fix fraction and dimension type in Resource.proto" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 18:59:11 +0000 (18:59 +0000)]
Merge "Fix fraction and dimension type in Resource.proto" into pi-dev

6 years agoMerge "SmartLinkify - handle keyboard clicks" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 18:44:02 +0000 (18:44 +0000)]
Merge "SmartLinkify - handle keyboard clicks" into pi-dev

6 years agoMerge "Catch double unbind of dead service" am: 03cdc95f1c
Tobias Lindskog [Fri, 20 Apr 2018 18:42:45 +0000 (11:42 -0700)]
Merge "Catch double unbind of dead service" am: 03cdc95f1c
am: e0d33bc32e

Change-Id: Id994365fa971ecb722d4314b436e2c2bcacf3bf8

6 years agoMerge "Catch double unbind of dead service"
Tobias Lindskog [Fri, 20 Apr 2018 18:35:18 +0000 (11:35 -0700)]
Merge "Catch double unbind of dead service"
am: 03cdc95f1c

Change-Id: I9ff4cb306e807d769a1dd5acca06a2703b666040

6 years agoFix fraction and dimension type in Resource.proto
Michael Wachenschwanz [Thu, 19 Apr 2018 01:52:47 +0000 (18:52 -0700)]
Fix fraction and dimension type in Resource.proto

Change fraction and dimnesion type from float to uint32

Change-Id: I641dc42cf7b6bdd8bc16c8cdbd573ec3281a084a
Fixes: 78182701
Test: aapt2_tests

6 years agoMerge ""Guest" icon should be a default user icon." into pi-dev
Jovana Knezevic [Fri, 20 Apr 2018 17:32:33 +0000 (10:32 -0700)]
Merge ""Guest" icon should be a default user icon." into pi-dev
am: e44eb9201f

Change-Id: Iaff857f2418b0336fb96c4baed3649e9efccb1fc

6 years agoMerge ""Guest" icon should be a default user icon." into pi-dev
Jovana Knezevic [Fri, 20 Apr 2018 17:21:52 +0000 (17:21 +0000)]
Merge ""Guest" icon should be a default user icon." into pi-dev

6 years agoMerge "Catch double unbind of dead service"
Treehugger Robot [Fri, 20 Apr 2018 17:14:39 +0000 (17:14 +0000)]
Merge "Catch double unbind of dead service"

6 years agoMerge "No divider between floating toolbar item groups" into pi-dev
Mihai Popa [Fri, 20 Apr 2018 17:09:08 +0000 (10:09 -0700)]
Merge "No divider between floating toolbar item groups" into pi-dev
am: cbfe423122

Change-Id: Ie1c2304fc59da877f3fc80a718113deb4eb1ae7c

6 years agoMerge "Ensure QS tile secondary text marquees." into pi-dev
Amin Shaikh [Fri, 20 Apr 2018 17:04:16 +0000 (10:04 -0700)]
Merge "Ensure QS tile secondary text marquees." into pi-dev
am: 2cb02549dd

Change-Id: Id656bad12b4cee728b649013825fc6cfa9af3fd5

6 years agoMerge "No divider between floating toolbar item groups" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 16:53:31 +0000 (16:53 +0000)]
Merge "No divider between floating toolbar item groups" into pi-dev

6 years agoMerge "Ensure QS tile secondary text marquees." into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 16:52:42 +0000 (16:52 +0000)]
Merge "Ensure QS tile secondary text marquees." into pi-dev

6 years agoEnsure QS tile secondary text marquees.
Amin Shaikh [Fri, 20 Apr 2018 15:27:46 +0000 (11:27 -0400)]
Ensure QS tile secondary text marquees.

Update the logic to marquee only the currently selected page.

Change-Id: Idc2398e1c67c614414ae4298c43a1609431c62fa
Fixes: 78159844
Test: visual

6 years agoMerge "Defer resizing invisible stacks while drag resizing" into pi-dev
Adrian Roos [Fri, 20 Apr 2018 15:00:08 +0000 (08:00 -0700)]
Merge "Defer resizing invisible stacks while drag resizing" into pi-dev
am: 5e12ebfffd

Change-Id: I9252974e456740921a5778bd167e115d25e0d7bc

6 years agoMerge "Defer resizing invisible stacks while drag resizing" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 14:43:38 +0000 (14:43 +0000)]
Merge "Defer resizing invisible stacks while drag resizing" into pi-dev

6 years agoMerge "Add way to use sysui as a broadcast relay for slices" into pi-dev
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

6 years agoMerge "Don't check program selector's type for equality." into pi-dev
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

6 years agoMerge "Add way to use sysui as a broadcast relay for slices" into pi-dev
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

6 years agoMerge "Don't check program selector's type for equality." 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

6 years agoMerge "WM: Only update magnification bounds when they are visible" into pi-dev
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

6 years agoSmartLinkify - handle keyboard clicks
Abodunrinwa Toki [Mon, 16 Apr 2018 09:05:16 +0000 (10:05 +0100)]
SmartLinkify - handle keyboard clicks

Bug: 77998709
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: Ibb95a736248643949a7b521368374084f9f133ca

6 years agoMerge "WM: Only update magnification bounds when they are visible" into pi-dev
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

6 years agoDefer resizing invisible stacks while drag resizing
Adrian Roos [Thu, 19 Apr 2018 16:58:22 +0000 (18:58 +0200)]
Defer resizing invisible stacks while drag resizing

Works around a source of jank when drag resizing in split
screen mode: instead of immediately resizing the (potentially
numerous) invisible secondary stacks, we defer that until
the user lets go of the handle.

Change-Id: I3b9faa83005fa86185d4e51b2849e3a826b7f6a9
Fixes: 78214347
Test: Open a gazillion (resizeable) tasks. Enter split screen. Drag handle, verify there is no jank
Test: atest RectTest

6 years agoAdd way to use sysui as a broadcast relay for slices
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

6 years agoMerge "AOD: Add additional delayed dozeTimeTick after unpausing" into pi-dev
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

6 years agoMerge "AOD: Add additional delayed dozeTimeTick after unpausing" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 12:04:12 +0000 (12:04 +0000)]
Merge "AOD: Add additional delayed dozeTimeTick after unpausing" into pi-dev

6 years agoMerge "Adjust APF interpreter tests to match APFv4" into pi-dev
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

6 years agoMerge "Add the list of private DNS addresses to LinkProperties" into pi-dev
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

6 years agoMerge "Adjust APF interpreter tests to match APFv4" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 11:41:52 +0000 (11:41 +0000)]
Merge "Adjust APF interpreter tests to match APFv4" into pi-dev

6 years agoMerge "Add the list of private DNS addresses to LinkProperties" into pi-dev
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

6 years agoMerge "Fix cutout with temp inset bounds" 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

6 years agoMerge "Fix cutout with temp inset bounds" into pi-dev
Jorim Jaggi [Fri, 20 Apr 2018 11:09:16 +0000 (11:09 +0000)]
Merge "Fix cutout with temp inset bounds" into pi-dev

6 years agoNo divider between floating toolbar item groups
Mihai Popa [Tue, 17 Apr 2018 15:21:10 +0000 (16:21 +0100)]
No divider between floating toolbar item groups

The CL removes the vertical divider that used to exist between adjacent
menu item groups in the floating toolbar, as well as the extra padding
between these, in order to adapt to the new UX requirements. The CL also
centers the text view inside a button, when there is no icon shown at
the left of the text view. This is only relevant when the minimum size
of the button is larger than the text measured width, and we want the
text to be centered inside the button in this case.

Bug: 74032743
Test: manual testing
Change-Id: I309c729eb842d9388066bfb43eb18f33dbfe10b8

6 years agoMerge "Add intrinsics on light greylist" 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

6 years agoMerge "Add intrinsics on light greylist" into pi-dev
David Brazdil [Fri, 20 Apr 2018 10:45:26 +0000 (10:45 +0000)]
Merge "Add intrinsics on light greylist" into pi-dev

6 years agoMerge "Light grey java.net.HttpCookie fields." into pi-dev
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

6 years agoMerge "Add some widget APIS to light grey." into pi-dev
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

6 years agoMerge "Light grey java.net.HttpCookie fields." into pi-dev
Nicolas Geoffray [Fri, 20 Apr 2018 09:37:36 +0000 (09:37 +0000)]
Merge "Light grey java.net.HttpCookie fields." into pi-dev

6 years agoMerge "Add some widget APIS to light grey." 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

6 years agoAdjust APF interpreter tests to match APFv4
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)

6 years agoMerge "StrictMode: fix non-SDK API usage detection." into pi-dev
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

6 years agoMerge "StrictMode: fix non-SDK API usage detection." into pi-dev
Mathew Inwood [Fri, 20 Apr 2018 08:04:07 +0000 (08:04 +0000)]
Merge "StrictMode: fix non-SDK API usage detection." into pi-dev

6 years agoAdd the list of private DNS addresses to LinkProperties
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

6 years agoMerge changes I7c48a326,I7395ecd4 into pi-dev
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

6 years agoMerge changes I7c48a326,I7395ecd4 into pi-dev
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

6 years agoCatch double unbind of dead service
Tobias Lindskog [Mon, 12 Mar 2018 14:44:47 +0000 (15:44 +0100)]
Catch double unbind of dead service

If a service receives onBindingDied after it has successfully connected
once, unbindService would be called once from the onBindingDied and then
again from registerServiceLocked when the service was rebound.  This
second attempt would typically crash.

The first unbindService call has a try/catch, add one around the second
call as well.

Test: Manual.  Boots and reboots without problems.
Change-Id: Ie9eabbcb6ee89c05abc565427465cfd6906f3fa3

6 years agoFix wrong bouncer translation during hint animation
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

6 years agoMerge "apf: Add immediate encoding tests for LI" am: 9ee5bb0037
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

6 years agoMerge "ExifInterface: Prevent infinite loop" into pi-dev
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

6 years agoMerge "Never interact with "phone" while holding locks." into pi-dev
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

6 years agoMerge "apf: Add immediate encoding tests for LI"
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

6 years agoMerge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
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

6 years agoMerge "Add more trace categories." into pi-dev
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

6 years agoMerge "ExifInterface: Prevent infinite loop" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 02:43:54 +0000 (02:43 +0000)]
Merge "ExifInterface: Prevent infinite loop" into pi-dev

6 years agoMerge "Never interact with "phone" while holding locks." into pi-dev
Jeff Sharkey [Fri, 20 Apr 2018 02:38:09 +0000 (02:38 +0000)]
Merge "Never interact with "phone" while holding locks." into pi-dev

6 years agoMerge "Protect usage data with OP_GET_USAGE_STATS." 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

6 years agoKeep animating bouncer when fingerprint
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

6 years ago[automerger skipped] Merge "Fix the implementation of BluetoothCodecStatus.equals...
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

6 years agoMerge "Add more trace categories." into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 02:12:44 +0000 (02:12 +0000)]
Merge "Add more trace categories." into pi-dev

6 years agoMerge "Fix the implementation of BluetoothCodecStatus.equals()" 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

6 years agoMerge "Workaround to ensure we cancel the recents animation prior to starting home...
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

6 years agoMerge "Workaround to ensure we cancel the recents animation prior to starting home...
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

6 years agoMerge "Add support for reading a snapshot of the APF data" into pi-dev
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

6 years agoMerge "Allow more than one temp view to be registered at a time" into pi-dev
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

6 years agoExifInterface: Prevent infinite loop
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

6 years agoMerge "Add support for reading a snapshot of the APF data" into pi-dev
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

6 years agoMerge "Allow more than one temp view to be registered at a time" 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

6 years agoMerge "Merge "Fix the implementation of BluetoothCodecStatus.equals()" am: 3a1ca762c9...
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

6 years agoMerge "apf: Add immediate encoding tests for LI"
Treehugger Robot [Fri, 20 Apr 2018 01:09:33 +0000 (01:09 +0000)]
Merge "apf: Add immediate encoding tests for LI"

6 years agoMerge "Fix the implementation of BluetoothCodecStatus.equals()" am: 3a1ca762c9
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

6 years agoMerge "Clock padding and motion adjustments" into pi-dev
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

6 years agoMerge "Fix the implementation of BluetoothCodecStatus.equals()"
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

6 years agoAdd more trace categories.
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

6 years ago[automerger skipped] Merge "Actually resolve all IPs for Private DNS hostname" into...
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

6 years agoMerge "Add ability to set onShowListener to custom dialog pref" into pi-dev
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

6 years agoMerge "Clock padding and motion adjustments" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 00:43:53 +0000 (00:43 +0000)]
Merge "Clock padding and motion adjustments" into pi-dev

6 years agoMerge "Actually resolve all IPs for Private DNS hostname" 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

6 years agoFix the implementation of BluetoothCodecStatus.equals()
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)

6 years agoMerge "Fix b/77867175: Clear all of NavigationPanel is missing" into pi-dev
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

6 years agoMerge "Add ability to set onShowListener to custom dialog pref" into pi-dev
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

6 years agoMerge "AudioService: Add warning log when handleDeviceConnection failed" 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

6 years agoMerge "Fix b/77867175: Clear all of NavigationPanel is missing" into pi-dev
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

6 years agoMerge "Fix the implementation of BluetoothCodecStatus.equals()"
Treehugger Robot [Thu, 19 Apr 2018 23:55:31 +0000 (23:55 +0000)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()"

6 years agoMerge changes from topic "revert_save_info" into pi-dev
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

6 years agoMerge "Update wifi enabled state when connected." into pi-dev
Amin Shaikh [Thu, 19 Apr 2018 23:49:03 +0000 (16:49 -0700)]
Merge "Update wifi enabled state when connected." into pi-dev
am: 8a87e9ddd8

Change-Id: Iaf5108f48f89406a9c0371fdbc97f5ad81bda559

6 years agoMerge "Allow QS expansion in switch access mode." into pi-dev
Amin Shaikh [Thu, 19 Apr 2018 23:44:08 +0000 (16:44 -0700)]
Merge "Allow QS expansion in switch access mode." into pi-dev
am: caa429eada

Change-Id: I9282dd8321a5fb5c9149d6e4287882ae757e8620

6 years agoMerge "AudioService: Add warning log when handleDeviceConnection failed" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 23:37:40 +0000 (23:37 +0000)]
Merge "AudioService: Add warning log when handleDeviceConnection failed" into pi-dev

6 years agoMerge changes from topic "revert_save_info" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 23:32:46 +0000 (23:32 +0000)]
Merge changes from topic "revert_save_info" into pi-dev

* changes:
  Document compatibility mode limitations.
  Revert "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode."

6 years agoMerge "Update wifi enabled state when connected." into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 23:30:08 +0000 (23:30 +0000)]
Merge "Update wifi enabled state when connected." into pi-dev

6 years agoMerge "Allow QS expansion in switch access mode." into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 23:29:13 +0000 (23:29 +0000)]
Merge "Allow QS expansion in switch access mode." into pi-dev

6 years agoMerge "Reset sticky navbar timeout when rotate btn shown" into pi-dev
Mike Digman [Thu, 19 Apr 2018 22:57:46 +0000 (15:57 -0700)]
Merge "Reset sticky navbar timeout when rotate btn shown" into pi-dev
am: 0b2f7503a8

Change-Id: I50fad5324559a37634a3f20dd7e40e9927e1feb4

6 years agoMerge "Reset sticky navbar timeout when rotate btn shown" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 22:32:10 +0000 (22:32 +0000)]
Merge "Reset sticky navbar timeout when rotate btn shown" into pi-dev

6 years agoDocument compatibility mode limitations.
Felipe Leme [Thu, 19 Apr 2018 17:33:20 +0000 (10:33 -0700)]
Document compatibility mode limitations.

Test: mmm -j108 frameworks/base/:doc-comment-check-docs

Fixes: 77655074

Change-Id: I527d882850442c7e6e9379b1b423673885e07f2b

6 years agoRevert "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode."
Felipe Leme [Wed, 18 Apr 2018 23:12:04 +0000 (16:12 -0700)]
Revert "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode."

Save has many limitations on compat mode, so we better not change the SaveInfo
behavior but rather document then.

This reverts commit 4f74a018c8ee9801f1d5ce2c7ec726251efc4fbf.

Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityTest \
CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest

Bug: 77655074

Change-Id: I36bd28ca546dcedefe75de7815b76b8b5827aee3

6 years agoMerge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev
Abodunrinwa Toki [Thu, 19 Apr 2018 22:20:09 +0000 (15:20 -0700)]
Merge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev
am: 993890fbf4

Change-Id: Ie71ca3cc2144b6f700f1e9376fc2f571d3e19ce7

6 years agoAllow more than one temp view to be registered at a time
Brad Stenning [Wed, 18 Apr 2018 17:28:24 +0000 (10:28 -0700)]
Allow more than one temp view to be registered at a time

Without this we can't put the status bar above the full screen user
selection page

Bug:77148007

Test: with a second set of hvac

Change-Id: If422ad4cd2c3ad6ef4beb1d919327fed96184ba6