OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Extend adoptable override to force on or off." into pi-dev am: 130a2503d8
Jeff Sharkey [Sat, 21 Apr 2018 00:39:45 +0000 (17:39 -0700)]
Merge "Extend adoptable override to force on or off." into pi-dev am: 130a2503d8
am: 64a615eefe

Change-Id: Ic80dd00d179adac426daed862236b03936b60bd7

6 years agoMerge "Don't require post-execution state for onActivityResult" into pi-dev am: 5007c...
Andrii Kulian [Sat, 21 Apr 2018 00:25:23 +0000 (17:25 -0700)]
Merge "Don't require post-execution state for onActivityResult" into pi-dev am: 5007c67a70
am: 33fd905c37

Change-Id: Ia05f8c33ce038d76c3c1753ac58b6b82a3b6a679

6 years agoMerge "Extend adoptable override to force on or off." into pi-dev
Jeff Sharkey [Sat, 21 Apr 2018 00:20:16 +0000 (17:20 -0700)]
Merge "Extend adoptable override to force on or off." into pi-dev
am: 130a2503d8

Change-Id: Ic5bb21ec16f4603d87b5b659f041ee0a08b8d039

6 years agoMerge "Don't require post-execution state for onActivityResult" into pi-dev
Andrii Kulian [Sat, 21 Apr 2018 00:10:42 +0000 (17:10 -0700)]
Merge "Don't require post-execution state for onActivityResult" into pi-dev
am: 5007c67a70

Change-Id: I6ea56c0e6e68afd354426194bd0d4536129abe86

6 years agoMerge "Extend adoptable override to force on or off." into pi-dev
Jeff Sharkey [Fri, 20 Apr 2018 23:24:28 +0000 (23:24 +0000)]
Merge "Extend adoptable override to force on or off." into pi-dev

6 years agoMerge "Don't require post-execution state for onActivityResult" into pi-dev
Andrii Kulian [Fri, 20 Apr 2018 23:21:25 +0000 (23:21 +0000)]
Merge "Don't require post-execution state for onActivityResult" into pi-dev

6 years agoMerge "Fix issue with translucent animations" into pi-dev am: a93ab56ed8
Jorim Jaggi [Fri, 20 Apr 2018 22:57:56 +0000 (15:57 -0700)]
Merge "Fix issue with translucent animations" into pi-dev am: a93ab56ed8
am: 4f16f016f6

Change-Id: Id68b47434ecf0d9ac093e166d8905d52080af8ea

6 years agoMerge "Fix issue with translucent animations" into pi-dev
Jorim Jaggi [Fri, 20 Apr 2018 22:47:54 +0000 (15:47 -0700)]
Merge "Fix issue with translucent animations" into pi-dev
am: a93ab56ed8

Change-Id: Ieec6e5d765c1694e112187c330841c8c06edcd23

6 years agoMerge "Fix issue with translucent animations" into pi-dev
Jorim Jaggi [Fri, 20 Apr 2018 22:32:59 +0000 (22:32 +0000)]
Merge "Fix issue with translucent animations" into pi-dev

6 years agoMerge "Migrated SystemUI & SettingsLib to androidx"
Aurimas Liutikas [Fri, 20 Apr 2018 21:43:30 +0000 (21:43 +0000)]
Merge "Migrated SystemUI & SettingsLib to androidx"

6 years agoMerge "Give CTS a way to force-poll network stats." into pi-dev am: 46e58e1b40
Jeff Sharkey [Fri, 20 Apr 2018 21:07:19 +0000 (14:07 -0700)]
Merge "Give CTS a way to force-poll network stats." into pi-dev am: 46e58e1b40
am: 77c7b732c4

Change-Id: I93be7a46fc345efc31e98975c65a287f2d344220

6 years agoMerge "GetActiveNotifications should never return null" into pi-dev am: 66dfd01292
Julia Reynolds [Fri, 20 Apr 2018 20:54:52 +0000 (13:54 -0700)]
Merge "GetActiveNotifications should never return null" into pi-dev am: 66dfd01292
am: a643f89ce1

Change-Id: I6ab090f262e819babc334a9c1a41bc1cb4920c2e

6 years agoMerge "Give CTS a way to force-poll network stats." into pi-dev
Jeff Sharkey [Fri, 20 Apr 2018 20:51:02 +0000 (13:51 -0700)]
Merge "Give CTS a way to force-poll network stats." into pi-dev
am: 46e58e1b40

Change-Id: Id2252b803a33ddadfef71618b3b9106c93c5be2a

6 years agoMerge "GetActiveNotifications should never return null" into pi-dev
Julia Reynolds [Fri, 20 Apr 2018 20:44:49 +0000 (13:44 -0700)]
Merge "GetActiveNotifications should never return null" into pi-dev
am: 66dfd01292

Change-Id: Iba293f70adda8e225d8b8c2f84465d95acbb18cf

6 years agoMerge "Give CTS a way to force-poll network stats." into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 20:40:32 +0000 (20:40 +0000)]
Merge "Give CTS a way to force-poll network stats." into pi-dev

6 years agoMerge "GetActiveNotifications should never return null" into pi-dev
Julia Reynolds [Fri, 20 Apr 2018 20:21:41 +0000 (20:21 +0000)]
Merge "GetActiveNotifications should never return null" into pi-dev

6 years ago[automerger skipped] Merge "Catch double unbind of dead service" into pi-dev am:...
Tobias Lindskog [Fri, 20 Apr 2018 20:13:32 +0000 (13:13 -0700)]
[automerger skipped] Merge "Catch double unbind of dead service" into pi-dev am: 6c2af1afa2  -s ours
am: f89a603753  -s ours

Change-Id: I2e984e59d7523fb3403a3402d0493bc3e5fba251

6 years agoMerge "Fix layering of non-IME target windows in IME-target app in split-screen....
Robert Carr [Fri, 20 Apr 2018 20:08:10 +0000 (13:08 -0700)]
Merge "Fix layering of non-IME target windows in IME-target app in split-screen." into pi-dev am: 12a6cd7457
am: c535b34937

Change-Id: I723e3faba0248c84a99eb38462a1089f55636116

6 years agoDon't require post-execution state for onActivityResult
Andrii Kulian [Thu, 19 Apr 2018 22:29:22 +0000 (15:29 -0700)]
Don't require post-execution state for onActivityResult

According to the documentation, onActivityResult() should be called
immediately before onResume(). This, however, was not always the case
in previous releases and fixing this caused some app compatibility
issues.
This CL removes required post execution state for ActivityResultItem.

Bug: 77695691
Test: ActivityLifecycleTests
Change-Id: Id8c02e9b49f9758aac616e37948570722d802de8

6 years ago[automerger skipped] Merge "Catch double unbind of dead service" into pi-dev
Tobias Lindskog [Fri, 20 Apr 2018 19:48:52 +0000 (12:48 -0700)]
[automerger skipped] Merge "Catch double unbind of dead service" into pi-dev
am: 6c2af1afa2  -s ours

Change-Id: I6eab8580911b7c84f21f4457d7fe3554110dd67e

6 years agoMigrated SystemUI & SettingsLib to androidx
Aurimas Liutikas [Tue, 17 Apr 2018 16:50:46 +0000 (09:50 -0700)]
Migrated SystemUI & SettingsLib to androidx

Test: make SystemUI SettingsLib
Bug:76692459
Change-Id: I248fdf4042a0a97bc6349091da21c936c2d37c95

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 fraction and dimension type in Resource.proto" into pi-dev am: 1a12311433
Michael Wachenschwanz [Fri, 20 Apr 2018 19:39:11 +0000 (12:39 -0700)]
Merge "Fix fraction and dimension type in Resource.proto" into pi-dev am: 1a12311433
am: 4dcb9b082b

Change-Id: I5068164f7904d21b3de56be20c37092faac751be

6 years agoMerge "Catch double unbind of dead service" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 19:31:42 +0000 (19:31 +0000)]
Merge "Catch double unbind of dead service" into pi-dev

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 am: 686fab1464
Abodunrinwa Toki [Fri, 20 Apr 2018 19:25:43 +0000 (12:25 -0700)]
Merge "SmartLinkify - handle keyboard clicks" into pi-dev am: 686fab1464
am: f8a770a515

Change-Id: I534794c28c13fc44829427a1d4dd567fe683c6b9

6 years agoExtend adoptable override to force on or off.
Jeff Sharkey [Fri, 20 Apr 2018 19:11:20 +0000 (13:11 -0600)]
Extend adoptable override to force on or off.

Virtual disks are adoptable by default, but for debugging purposes
we want to treat them as unadoptable in some cases.  Add the ability
for the "sm" shell command to force on/off, or return to default.

Bug: 7784965474132243
Test: manual
Change-Id: Ieda317396624ca081e5dd9568795483f684f9297

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 "Catch double unbind of dead service" am: 03cdc95f1c am: e0d33bc32e
Tobias Lindskog [Fri, 20 Apr 2018 18:54:49 +0000 (11:54 -0700)]
Merge "Catch double unbind of dead service" am: 03cdc95f1c am: e0d33bc32e
am: 7bccbef71a

Change-Id: Id2616eeff45b7da2eeda0fe83d41dff2db99366a

6 years agoGetActiveNotifications should never return null
Julia Reynolds [Fri, 20 Apr 2018 17:33:36 +0000 (13:33 -0400)]
GetActiveNotifications should never return null

Test: runtest systemui-notification
Change-Id: I53e7a4a2a9f05318dd97ffb096658a4f8bcebc8a
Fixes: 70396956

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 agoGive CTS a way to force-poll network stats.
Jeff Sharkey [Fri, 20 Apr 2018 16:59:09 +0000 (10:59 -0600)]
Give CTS a way to force-poll network stats.

Collecting network statistics is pretty heavy, which is why we're
throttling callers.  However, to keep CTS running fast, we provide a
way for tests to force a poll event, instead of making them wait for
the throttle timeout.

Bug: 77908520
Test: atest cts/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java
Change-Id: Ia792f0cd495023366ff8c4839df54e7da2ae8331

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 am: e44eb9201f
Jovana Knezevic [Fri, 20 Apr 2018 17:44:51 +0000 (10:44 -0700)]
Merge ""Guest" icon should be a default user icon." into pi-dev am: e44eb9201f
am: fdb30f53c5

Change-Id: I04ff14e8622d274c24e2ed34f51ac297878399bc

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 "No divider between floating toolbar item groups" into pi-dev am: cbfe423122
Mihai Popa [Fri, 20 Apr 2018 17:22:57 +0000 (10:22 -0700)]
Merge "No divider between floating toolbar item groups" into pi-dev am: cbfe423122
am: 33a030ccdf

Change-Id: I767a5453a141f23f794bed4ba00327e24d847515

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 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.

Fixes: 78345567
Test: Manual.  Boots and reboots without problems.
Change-Id: Ie9eabbcb6ee89c05abc565427465cfd6906f3fa3
Merged-In: Ie9eabbcb6ee89c05abc565427465cfd6906f3fa3

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

Change-Id: I3aca61ae94a6d37d3e19bfcc13d12ea2d1c9b130

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 am: 5e12ebfffd
Adrian Roos [Fri, 20 Apr 2018 15:07:53 +0000 (08:07 -0700)]
Merge "Defer resizing invisible stacks while drag resizing" into pi-dev am: 5e12ebfffd
am: 03d4aeda37

Change-Id: Ic4e21bcd38e09cd237fcf149ba308bfdbf77240d

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 am: ea56921d76
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

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

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 am...
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

6 years agoFix issue with translucent animations
Jorim Jaggi [Thu, 19 Apr 2018 15:48:38 +0000 (17:48 +0200)]
Fix issue with translucent animations

If a translucent has overridden their activityOpenEnter/exit
animation in the resources, they won't be used anymore because the
system always forces the translucent animations, which is a bug.

Instead, we only use the translucent animation in case the app has
not overridden their animations manually.

Test: Open WhatsApp profile picture.
Test: go/wm-smoke
Change-Id: I7e81815e78453392773ac2ac96c47540e6146381
Fixes: 78270476

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

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 "Adjust APF interpreter tests to match APFv4" into pi-dev am: 580a1ed904
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

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 "Add the list of private DNS addresses to LinkProperties" into pi-dev am: f12a2...
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

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 "Fix cutout with temp inset bounds" into pi-dev am: db704ca8bf
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

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 "Add intrinsics on light greylist" into pi-dev am: 9aa2a33cf3
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

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 unit test for AppOps logic where a different op is used to control an...
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."

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 am: 75d3d96084
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

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

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 agoMerge "Make InputMethod core tests presubmit"
Tarandeep Singh [Fri, 20 Apr 2018 08:41:23 +0000 (08:41 +0000)]
Merge "Make InputMethod core tests presubmit"

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 am: c72ee1a4f2
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

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 am: 4e4b6ff508
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

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 "Add more trace categories."
TreeHugger Robot [Fri, 20 Apr 2018 03:39:12 +0000 (03:39 +0000)]
Merge "Add more trace categories."