OSDN Git Service

android-x86/frameworks-base.git
7 years agoDon't move stack to bottom when creating task at bottom
Wale Ogunwale [Thu, 20 Jul 2017 08:00:41 +0000 (08:00 +0000)]
Don't move stack to bottom when creating task at bottom
am: 8cee0336bb

Change-Id: Ic55fc2d7f7ef6b58ae8bd708e8e84b97744e30e3

7 years agoMerge "Add unit test for IpSecService" am: 9e3f886dca am: 3182454f28
Di Lu [Thu, 20 Jul 2017 07:50:21 +0000 (07:50 +0000)]
Merge "Add unit test for IpSecService" am: 9e3f886dca am: 3182454f28
am: 345db82674

Change-Id: Ia4d85bcf5c42774d7b48cb1cd648754b6dd16b69

7 years agoDon't move stack to bottom when creating task at bottom
Wale Ogunwale [Tue, 18 Jul 2017 13:33:01 +0000 (06:33 -0700)]
Don't move stack to bottom when creating task at bottom

When creating a task, only move the parents of the task if we are creating
the task at the top of the stack. i.e. creating the task at the top of its
stack will move the stack forward and creating the task at the bottom of
the stack shouldn't move the stack backwards. Creating a task at the bottom
is used for things like restoring a task from recents to use for other things
and for background user, so shouldn't affect visibility of its parent stack.

Change-Id: Ifcaf7c5a95294631dff675ac5c7d87f059b1792a
Fixes: 62352722
Test: go/wm-smoke
(cherry picked from commit 1f5b92fd53ad0193235ae3e6cbc54a4120ac2457)

7 years agoMerge "Add unit test for IpSecService" am: 9e3f886dca
Di Lu [Thu, 20 Jul 2017 07:43:12 +0000 (07:43 +0000)]
Merge "Add unit test for IpSecService" am: 9e3f886dca
am: 3182454f28

Change-Id: Iee7cc50b7f4715d9c6797356be5cac705407d4bc

7 years agoMerge "Add unit test for IpSecService"
Di Lu [Thu, 20 Jul 2017 07:36:19 +0000 (07:36 +0000)]
Merge "Add unit test for IpSecService"
am: 9e3f886dca

Change-Id: I16fb89239e641ac39a8a7adeafd72b7fe03935ed

7 years agoMerge "Add unit test for IpSecService"
Di Lu [Thu, 20 Jul 2017 07:27:16 +0000 (07:27 +0000)]
Merge "Add unit test for IpSecService"

7 years agoMerge "Add unit test for IpSecManager" am: dd494fa91c am: 73b7292a05
Di Lu [Thu, 20 Jul 2017 06:04:11 +0000 (06:04 +0000)]
Merge "Add unit test for IpSecManager" am: dd494fa91c am: 73b7292a05
am: eb7bc05b32

Change-Id: I399513b63dd5c06bab2946be315cc5c5689dff29

7 years agoMerge "Add unit test for IpSecManager" am: dd494fa91c
Di Lu [Thu, 20 Jul 2017 05:57:40 +0000 (05:57 +0000)]
Merge "Add unit test for IpSecManager" am: dd494fa91c
am: 73b7292a05

Change-Id: I33cb28b9ca07126e4f1b2631604fccf94ae4b530

7 years agoMerge "Add unit test for IpSecManager"
Di Lu [Thu, 20 Jul 2017 05:52:10 +0000 (05:52 +0000)]
Merge "Add unit test for IpSecManager"
am: dd494fa91c

Change-Id: I56c336eb8234b31154b6a7defd95ce76ea0800d8

7 years agoMerge "Zygote: Poll with timeout for pid" am: 89d119abe6 am: 6078facf1f
Andreas Gampe [Thu, 20 Jul 2017 05:49:05 +0000 (05:49 +0000)]
Merge "Zygote: Poll with timeout for pid" am: 89d119abe6 am: 6078facf1f
am: 57ba0ddc91

Change-Id: Idac309f0674a33ef9dd3a6769c217568828f8f8d

7 years agoMerge "Add unit test for IpSecManager"
Di Lu [Thu, 20 Jul 2017 05:42:53 +0000 (05:42 +0000)]
Merge "Add unit test for IpSecManager"

7 years agoMerge "Zygote: Poll with timeout for pid" am: 89d119abe6
Andreas Gampe [Thu, 20 Jul 2017 05:42:34 +0000 (05:42 +0000)]
Merge "Zygote: Poll with timeout for pid" am: 89d119abe6
am: 6078facf1f

Change-Id: I360bf86dbd5ff0c0d3b0fd6bb207692fe1142bd1

7 years agoMerge "Zygote: Poll with timeout for pid"
Andreas Gampe [Thu, 20 Jul 2017 05:36:42 +0000 (05:36 +0000)]
Merge "Zygote: Poll with timeout for pid"
am: 89d119abe6

Change-Id: I704192c4a2e1d0509f0f3c19b42945f2c00669ed

7 years agoMerge "Zygote: Poll with timeout for pid"
Treehugger Robot [Thu, 20 Jul 2017 05:25:24 +0000 (05:25 +0000)]
Merge "Zygote: Poll with timeout for pid"

7 years agoMerge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev
Jeff Davidson [Thu, 20 Jul 2017 04:32:21 +0000 (04:32 +0000)]
Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev
am: acdcf37e4b

Change-Id: I10cc2501e38837f816c564716a6d157bc8f57ed6

7 years agoAdd unit test for IpSecService
ludi [Fri, 12 May 2017 16:15:00 +0000 (09:15 -0700)]
Add unit test for IpSecService

Test: runtest frameworks-net

Bug:38259578
Change-Id: I4a049d5fdec79e36692e3b12306bd0758c19ad75

7 years agoMerge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 04:24:50 +0000 (04:24 +0000)]
Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev

7 years agoMerge "Ping the StatusBar about power key events. am: c3a503d8fd" into oc-dr1-dev...
Android Build Merger (Role) [Thu, 20 Jul 2017 04:03:46 +0000 (04:03 +0000)]
Merge "Ping the StatusBar about power key events. am: c3a503d8fd" into oc-dr1-dev-plus-aosp

7 years agoPing the StatusBar about power key events.
Philip Quinn [Thu, 20 Jul 2017 04:01:51 +0000 (04:01 +0000)]
Ping the StatusBar about power key events.
am: c3a503d8fd

Change-Id: I53c473abae0a58216bfa810d2e5df2da294d411d

7 years agoMerge "Add Configuration to APF Policy" am: d27a6d62c6 am: 70291ef1d7
Ahmed ElArabawy [Thu, 20 Jul 2017 04:01:11 +0000 (04:01 +0000)]
Merge "Add Configuration to APF Policy" am: d27a6d62c6 am: 70291ef1d7
am: 2d0f47c40f  -s ours

Change-Id: I1a456d4a649001d7de04f9de3a2b2a76167b19cf

7 years agoMerge "WifiInfo - document packet counters and rates" into oc-dr1-dev
Michael Plass [Thu, 20 Jul 2017 03:57:25 +0000 (03:57 +0000)]
Merge "WifiInfo - document packet counters and rates" into oc-dr1-dev
am: 8d51d3e512

Change-Id: Ic2e4c5d748ea33a3249fbd0b6520de347c6654ce

7 years agoMerge "Add Configuration to APF Policy" am: d27a6d62c6
Ahmed ElArabawy [Thu, 20 Jul 2017 03:54:03 +0000 (03:54 +0000)]
Merge "Add Configuration to APF Policy" am: d27a6d62c6
am: 70291ef1d7

Change-Id: Ib2881c42b6eb149ac4f964d9d8d29ac74a057000

7 years agoPing the StatusBar about power key events.
Philip Quinn [Wed, 19 Jul 2017 06:23:41 +0000 (23:23 -0700)]
Ping the StatusBar about power key events.

Bug: 63183852
Test: runtest systemui

Change-Id: I5d8209396e3e761b404c1071a7004f34c6e6c927

7 years agoMerge "WifiInfo - document packet counters and rates" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 03:49:56 +0000 (03:49 +0000)]
Merge "WifiInfo - document packet counters and rates" into oc-dr1-dev

7 years agoMerge "Add Configuration to APF Policy"
Ahmed ElArabawy [Thu, 20 Jul 2017 03:46:08 +0000 (03:46 +0000)]
Merge "Add Configuration to APF Policy"
am: d27a6d62c6

Change-Id: I491bad86e4e9ae7a813ac214b06273719a583079

7 years agoMerge "Add Configuration to APF Policy"
Treehugger Robot [Thu, 20 Jul 2017 03:34:57 +0000 (03:34 +0000)]
Merge "Add Configuration to APF Policy"

7 years agoMerge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944
Steven Moreland [Thu, 20 Jul 2017 03:05:02 +0000 (03:05 +0000)]
Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944
am: c840945a78

Change-Id: I654e14f0d1b495450db81592a2e564e308746350

7 years agoMerge "frameworks/base: use proper nativehelper headers" am: 826eafd958
Steven Moreland [Thu, 20 Jul 2017 02:58:46 +0000 (02:58 +0000)]
Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958
am: 5c091dc944

Change-Id: I582cc33d13d04950ca066074c292141605f3ca27

7 years agoMerge "frameworks/base: use proper nativehelper headers"
Steven Moreland [Thu, 20 Jul 2017 02:50:53 +0000 (02:50 +0000)]
Merge "frameworks/base: use proper nativehelper headers"
am: 826eafd958

Change-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2

7 years agoZygote: Poll with timeout for pid
Andreas Gampe [Thu, 13 Jul 2017 02:17:52 +0000 (19:17 -0700)]
Zygote: Poll with timeout for pid

Do not use a blocking readInt. Poll for available bytes with a timeout.

(cherry picked from commit cbc421406193308667a38b0bebc16c4064a19e83)

Bug: 63638768
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: Ib2131c00aa47dd10bb940d8678bbbfb5a0346ad5

7 years agoMerge "Fix format of subsystem power stats" into oc-dr1-dev
Ahmed ElArabawy [Thu, 20 Jul 2017 02:43:54 +0000 (02:43 +0000)]
Merge "Fix format of subsystem power stats" into oc-dr1-dev
am: 5512504bba

Change-Id: I3f6b818d34a2a54f73a7192d10d462b68d6e6ed0

7 years agoMerge "frameworks/base: use proper nativehelper headers"
Treehugger Robot [Thu, 20 Jul 2017 02:42:49 +0000 (02:42 +0000)]
Merge "frameworks/base: use proper nativehelper headers"

7 years agoMerge "Fix format of subsystem power stats" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 02:37:56 +0000 (02:37 +0000)]
Merge "Fix format of subsystem power stats" into oc-dr1-dev

7 years agoAdd Configuration to APF Policy
Ahmed ElArabawy [Tue, 13 Jun 2017 01:01:11 +0000 (18:01 -0700)]
Add Configuration to APF Policy

in b/37702435 battery was drained due to reception of
Ethernet frames with Eth-type < 0x600 (non ehternet II frames)

This change adds an XML file to drop/allow these frames
Dropping helps tp avoid acquiring a wakelock for the
reception of these packets, while allowing them may be needed
for some protocols
The Change allow the OEM to override the system settings

Bug: 37702435
Test: runtest frameworks-net
Merged-In: Idb6c215896ef230a8136ff4ecefc90ccdc5c1c6d
Merged-In: I16346bb98a0b9259f7c3f51e318c472cfc1bb492

Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
(cherry pick from commit 4dd7c58fc8fcc5a2c50de5e8eff05ddc5c3b0b8b)

Change-Id: Ie466baf1e6395d6c28245e41179232ea8e523845

7 years agoAdd unit test for IpSecManager
ludi [Fri, 12 May 2017 16:15:00 +0000 (09:15 -0700)]
Add unit test for IpSecManager

Test: runtest frameworks-net

Bug:38259578
Change-Id: Idb76aab899ccb7145bef2b7dce36e115c25fa6ca

7 years agoExpose KeyguardMonitor.isOccluded().
Philip Quinn [Thu, 20 Jul 2017 01:34:02 +0000 (01:34 +0000)]
Expose KeyguardMonitor.isOccluded().
am: 1659b400b5

Change-Id: I299c5a9b2fb93157622afa905c4c55918f46bf3e

7 years agoExpose KeyguardMonitor.isOccluded().
Philip Quinn [Wed, 19 Jul 2017 08:15:56 +0000 (01:15 -0700)]
Expose KeyguardMonitor.isOccluded().

Bug: 63806767
Test: runtest systemui

Change-Id: I36b96974c7a27e31ddbc3e8cdddf2516cce87b21

7 years agoMerge "Add config_demoModePackage to symbols" into oc-dr1-dev
Christine Franks [Thu, 20 Jul 2017 01:15:48 +0000 (01:15 +0000)]
Merge "Add config_demoModePackage to symbols" into oc-dr1-dev
am: 3789b629c7

Change-Id: I859bc8f2f1d314bb6a50741cb8e393be94cdbae6

7 years agoMerge "Add config_demoModePackage to symbols" into oc-dr1-dev
Christine Franks [Thu, 20 Jul 2017 01:04:51 +0000 (01:04 +0000)]
Merge "Add config_demoModePackage to symbols" into oc-dr1-dev

7 years agoMerge "proto: add system message descriptor for Wi-Fi wrong password notification...
Peter Qiu [Thu, 20 Jul 2017 00:50:42 +0000 (00:50 +0000)]
Merge "proto: add system message descriptor for Wi-Fi wrong password notification" into oc-dr1-dev
am: 7bd4b3912b

Change-Id: If2ac1228a2af3c0c59c603ed6de02b69c8e45b6c

7 years agoMerge "proto: add system message descriptor for Wi-Fi wrong password notification...
TreeHugger Robot [Thu, 20 Jul 2017 00:46:05 +0000 (00:46 +0000)]
Merge "proto: add system message descriptor for Wi-Fi wrong password notification" into oc-dr1-dev

7 years agoMerge "Add details to Download progress callback" am: b440b572d7 am: 5f047a68d9
Robert Greenwalt [Thu, 20 Jul 2017 00:42:21 +0000 (00:42 +0000)]
Merge "Add details to Download progress callback" am: b440b572d7 am: 5f047a68d9
am: 12286b2608

Change-Id: Iff3707dab4ee737e5de2b1b8bded811f919553a8

7 years agoMerge "Add details to Download progress callback" am: b440b572d7
Robert Greenwalt [Thu, 20 Jul 2017 00:36:53 +0000 (00:36 +0000)]
Merge "Add details to Download progress callback" am: b440b572d7
am: 5f047a68d9

Change-Id: I5b26730aacb9209f08b33204fb88be02c324609a

7 years agoMerge "Add details to Download progress callback"
Robert Greenwalt [Thu, 20 Jul 2017 00:30:50 +0000 (00:30 +0000)]
Merge "Add details to Download progress callback"
am: b440b572d7

Change-Id: Idb7ebf8ec5d0b6b341c97dab05efc94e9e629011

7 years agoMerge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev
Sungsoo Lim [Thu, 20 Jul 2017 00:25:11 +0000 (00:25 +0000)]
Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev
am: 7b3bd1d547

Change-Id: I0bf675f16c233b8b0a83f7bf20c9a42e3b76cbbb

7 years agoMerge "Add details to Download progress callback"
Treehugger Robot [Thu, 20 Jul 2017 00:23:48 +0000 (00:23 +0000)]
Merge "Add details to Download progress callback"

7 years agoMerge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 00:18:20 +0000 (00:18 +0000)]
Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev

7 years agoAdd config_demoModePackage to symbols
Christine Franks [Wed, 19 Jul 2017 22:41:34 +0000 (15:41 -0700)]
Add config_demoModePackage to symbols

Bug: 62712426
Test: make -j100
Change-Id: I95a398a74d273d0aa7639989a367e902b305fa6c

7 years agoMerge "Add timezone for Telecom event date formatting" am: bf296640e6 am: 5af59940d1
Hall Liu [Thu, 20 Jul 2017 00:13:08 +0000 (00:13 +0000)]
Merge "Add timezone for Telecom event date formatting" am: bf296640e6 am: 5af59940d1
am: af3d7f990a

Change-Id: I1ca12b34a39a45512c9df6a2daeb5f72cd686f3e

7 years agoMerge "Fix snooze not dismissing when it should" into oc-dr1-dev
Mady Mellor [Thu, 20 Jul 2017 00:09:05 +0000 (00:09 +0000)]
Merge "Fix snooze not dismissing when it should" into oc-dr1-dev
am: f113a07d9e

Change-Id: I71e7c2757c1fab1dfdcd59ab3dbf695179899fe7

7 years agoMerge "Add timezone for Telecom event date formatting" am: bf296640e6
Hall Liu [Thu, 20 Jul 2017 00:06:40 +0000 (00:06 +0000)]
Merge "Add timezone for Telecom event date formatting" am: bf296640e6
am: 5af59940d1

Change-Id: I3030838f38aa9593d57f9d844d0e9553c3b76997

7 years agoMerge "Fix race condition of removing surface." into oc-dr1-dev
Seigo Nonaka [Thu, 20 Jul 2017 00:04:16 +0000 (00:04 +0000)]
Merge "Fix race condition of removing surface." into oc-dr1-dev
am: e6685b2bcd

Change-Id: I3677cb6f07b2a7c60e72b3f70034fec42adb6dec

7 years agoRevert disabling of eSIM wipes/retains.
Jeff Davidson [Wed, 19 Jul 2017 23:55:45 +0000 (16:55 -0700)]
Revert disabling of eSIM wipes/retains.

This is a revert of change I414a16cde11e76ccc390e7a63a6803f5b402fe78.
As an additional safety latch, we bypass all logic (either wipe or
retain) if the eSIM has never been provisioned. An unprovisioned eSIM
cannot possibly have profiles - indeed, we don't show the "Wipe eSIM"
checkbox in this case - so there's no reason to tell the LPA to retain
them.

Bug: 63693573
Test: TreeHugger + factory reset local test
Change-Id: I1fea50db317388e81823bf1bd0977ffe787a05e0

7 years agoMerge "Fix snooze not dismissing when it should" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 00:00:46 +0000 (00:00 +0000)]
Merge "Fix snooze not dismissing when it should" into oc-dr1-dev

7 years agoMerge "Add timezone for Telecom event date formatting"
Hall Liu [Wed, 19 Jul 2017 23:58:16 +0000 (23:58 +0000)]
Merge "Add timezone for Telecom event date formatting"
am: bf296640e6

Change-Id: Ic9db643ff6d204f75aed44160003bbe0b685eb7e

7 years agoMerge "Fix race condition of removing surface." into oc-dr1-dev
Seigo Nonaka [Wed, 19 Jul 2017 23:54:11 +0000 (23:54 +0000)]
Merge "Fix race condition of removing surface." into oc-dr1-dev

7 years agoMerge "Reducing bitmap sizes in notifications" into oc-dr1-dev
Selim Cinek [Wed, 19 Jul 2017 23:47:16 +0000 (23:47 +0000)]
Merge "Reducing bitmap sizes in notifications" into oc-dr1-dev
am: 8ffa981686

Change-Id: I20fbb857570c0e7bb02659b9026b0800d5939bc2

7 years agoMerge "Add timezone for Telecom event date formatting"
Treehugger Robot [Wed, 19 Jul 2017 23:46:52 +0000 (23:46 +0000)]
Merge "Add timezone for Telecom event date formatting"

7 years agoMerge "Reducing bitmap sizes in notifications" into oc-dr1-dev
Selim Cinek [Wed, 19 Jul 2017 23:41:44 +0000 (23:41 +0000)]
Merge "Reducing bitmap sizes in notifications" into oc-dr1-dev

7 years agoMerge "Smoother system bars color transition" into oc-dr1-dev
Lucas Dupin [Wed, 19 Jul 2017 23:38:35 +0000 (23:38 +0000)]
Merge "Smoother system bars color transition" into oc-dr1-dev
am: b0bf1d479f

Change-Id: I264126a80f723a26fdaa2562afdfcdc51b4a97c0

7 years agoMerge "Smoother system bars color transition" into oc-dr1-dev
Lucas Dupin [Wed, 19 Jul 2017 23:32:04 +0000 (23:32 +0000)]
Merge "Smoother system bars color transition" into oc-dr1-dev

7 years agoFix format of subsystem power stats
Ahmed ElArabawy [Sat, 8 Jul 2017 00:48:13 +0000 (17:48 -0700)]
Fix format of subsystem power stats

The Subsystem power stats string in batteryStats dumpsys has an extra
newline that is causing PowerBug to skip the line when parsing the
history information.
Also, the string for subsystem power stats is missing a heading title
and has some redundant text

This commit fixes these format errors so powerbug can read and parse that
line successfully

Bug: 63447034
Test: Manual testing + Read the bugreport by historian and verify output

Change-Id: Idf971823dd5f769e653b4788b00fc025593d0d3d
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
7 years agoMerge "Type check before casting from CookieHandler to CookieManager" into oc-dr1-dev
Sungsoo Lim [Wed, 19 Jul 2017 22:52:10 +0000 (22:52 +0000)]
Merge "Type check before casting from CookieHandler to CookieManager" into oc-dr1-dev
am: 925abb706e

Change-Id: I50b447cc5aa86dc32787ff6dc0d5f71e3c042367

7 years agoMerge "Select correct oat/odex when pinning the Camera APK" into oc-dr1-dev
John Eckerdal [Wed, 19 Jul 2017 22:49:21 +0000 (22:49 +0000)]
Merge "Select correct oat/odex when pinning the Camera APK" into oc-dr1-dev
am: 1a7d4c25b3

Change-Id: I230dfa9275ad5d873a0ce9e3fba201f0bbf01af2

7 years agoMerge "Type check before casting from CookieHandler to CookieManager" into oc-dr1-dev
Sungsoo Lim [Wed, 19 Jul 2017 22:41:02 +0000 (22:41 +0000)]
Merge "Type check before casting from CookieHandler to CookieManager" into oc-dr1-dev

7 years agoMerge "Select correct oat/odex when pinning the Camera APK" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 22:40:32 +0000 (22:40 +0000)]
Merge "Select correct oat/odex when pinning the Camera APK" into oc-dr1-dev

7 years agoMerge "Add Configuration to APF Policy" into oc-dr1-dev
Ahmed ElArabawy [Wed, 19 Jul 2017 22:11:40 +0000 (22:11 +0000)]
Merge "Add Configuration to APF Policy" into oc-dr1-dev
am: 1da6af31ff

Change-Id: I16346bb98a0b9259f7c3f51e318c472cfc1bb492

7 years agoAdd details to Download progress callback
Robert Greenwalt [Sat, 17 Jun 2017 00:37:20 +0000 (17:37 -0700)]
Add details to Download progress callback

Split decode into max size and current size.

Test: builds
Change-Id: Ice18d7f0e9ae99b3c24fe10843da80abd0d912d7

7 years agoMerge "Add Configuration to APF Policy" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 22:02:09 +0000 (22:02 +0000)]
Merge "Add Configuration to APF Policy" into oc-dr1-dev

7 years agoAdd timezone for Telecom event date formatting
Hall Liu [Wed, 19 Jul 2017 21:57:56 +0000 (14:57 -0700)]
Add timezone for Telecom event date formatting

Output event times in local time rather than in UTC for compatibility
with the rest of the timestamps in the bug report

Test: manual
Change-Id: I2d458f09aec635a43e3d0565e8f8da803124f368

7 years agoMerge "Default gradient should be the dark version" into oc-dr1-dev
Lucas Dupin [Wed, 19 Jul 2017 18:48:15 +0000 (18:48 +0000)]
Merge "Default gradient should be the dark version" into oc-dr1-dev
am: 4dfb200d1b

Change-Id: I72a0674c9a180f65536553e30f80317276073365

7 years agoFix snooze not dismissing when it should
Mady Mellor [Wed, 19 Jul 2017 17:52:47 +0000 (10:52 -0700)]
Fix snooze not dismissing when it should

Simply check whether the guts is a leavebehind, if it is allow it to
be dismissed.

Test: manual - snooze a notification, touch outside note that it disappears
             - show notification controls on a notification that will
               be removed, note that the controls remain, once 'done' is
               hit the notification is removed
Bug: 63788509
Change-Id: I42c97239f4e3e17f2e69322c94bd8e8f9d7f0737

7 years agoMerge "Default gradient should be the dark version" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 18:40:38 +0000 (18:40 +0000)]
Merge "Default gradient should be the dark version" into oc-dr1-dev

7 years agoType check before casting from CookieHandler to CookieManager
Sungsoo Lim [Mon, 17 Jul 2017 21:24:26 +0000 (14:24 -0700)]
Type check before casting from CookieHandler to CookieManager

CookieHandler.getDefault() doesn't always return CookieManager.

Bug: 63638018
Test: pass StreamingMediaPlayerTest#testHlsWithHeadersCookies
Test: manual with a test app
Change-Id: Ie7c19d38f779813f3fffb9abbcb3188a0fca3f45

7 years agoFix race condition of removing surface.
Seigo Nonaka [Tue, 18 Jul 2017 03:22:44 +0000 (20:22 -0700)]
Fix race condition of removing surface.

mContainer.startingSurface can be replaced between posting
mRemoveStartingWindow and actually surface.remove() is called.

1. removeStartingWindow is called, then mRemoveStartingWindow is posted
   to mHandler
2. transferStartingWindow is called, then mContainer.startingWindow is
   replaced with new surface.
3. mHandler pops the callback and surface.remove() is called.

Here the remove is only called for replaced surface and never called for
older surface.

To fix this issue, surely removes the surface when the
removeStartingWindow is called.

Bug: 63156080
Bug: 63784898
Test: Watch /proc/<pid>/fd
Change-Id: I55e2c1b8fba32b3a19603e6ad4743f07576abd48

7 years agoMerge "Always reevaluate whether to show the notification for USB_DEVICE_* intents...
Badhri Jagan Sridharan [Wed, 19 Jul 2017 18:11:25 +0000 (18:11 +0000)]
Merge "Always reevaluate whether to show the notification for USB_DEVICE_* intents" into oc-dr1-dev
am: d5f442d65b

Change-Id: I00374ea814200a8142e208f9fa2f7b7e2a45f4b0

7 years agoReducing bitmap sizes in notifications
Selim Cinek [Tue, 11 Jul 2017 11:19:59 +0000 (13:19 +0200)]
Reducing bitmap sizes in notifications

Bitmap sizes could be arbitrary large when they were sent
over to the system. We're now reducing them to reasonable
sizes.s

Also fixed that notification bitmaps were not put into
ashmem anymore since it got lost in a refactor.

Test: code inspection
Bug: 62319200
Merged-In: I87db7656e749666b9eab1f67fd497f155c407e18
Change-Id: I87db7656e749666b9eab1f67fd497f155c407e18

7 years agoMerge "Always reevaluate whether to show the notification for USB_DEVICE_* intents...
TreeHugger Robot [Wed, 19 Jul 2017 18:01:26 +0000 (18:01 +0000)]
Merge "Always reevaluate whether to show the notification for USB_DEVICE_* intents" into oc-dr1-dev

7 years agoMerge "Fix static analyzer complaints" am: a3bde81205 am: 3e0a8b1d2b
George Burgess IV [Wed, 19 Jul 2017 17:49:54 +0000 (17:49 +0000)]
Merge "Fix static analyzer complaints" am: a3bde81205 am: 3e0a8b1d2b
am: c6c395b6b1

Change-Id: I6b2e0d2f2aa60b347699e7149a0c2af3ea0f6c93

7 years agoMerge "Fix static analyzer complaints" am: a3bde81205
George Burgess IV [Wed, 19 Jul 2017 17:41:55 +0000 (17:41 +0000)]
Merge "Fix static analyzer complaints" am: a3bde81205
am: 3e0a8b1d2b

Change-Id: Ia66a6a5ab4fd59772a5df71ede75227d353e5d25

7 years agoMerge "Fix static analyzer complaints"
George Burgess IV [Wed, 19 Jul 2017 17:36:23 +0000 (17:36 +0000)]
Merge "Fix static analyzer complaints"
am: a3bde81205

Change-Id: I39f7b56c6abc0398cd517eef174b0620dbc50caa

7 years agoMerge "Fix static analyzer complaints"
Treehugger Robot [Wed, 19 Jul 2017 17:26:36 +0000 (17:26 +0000)]
Merge "Fix static analyzer complaints"

7 years agoframeworks/base: use proper nativehelper headers
Steven Moreland [Wed, 19 Jul 2017 16:50:45 +0000 (09:50 -0700)]
frameworks/base: use proper nativehelper headers

libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: modules using frameworks/base find headers
Bug: 63762847
Change-Id: I0f9f231acdebe460f279135462f43d3e32eff64d

7 years agoMerge ""Block notifications screen off" setting is used" into oc-dr1-dev
Beverly [Wed, 19 Jul 2017 15:26:12 +0000 (15:26 +0000)]
Merge ""Block notifications screen off" setting is used" into oc-dr1-dev
am: dc7b2bc5e3

Change-Id: I4d2f9058da7dfec5197edb6f7e25ed2d889ff756

7 years agoMerge ""Block notifications screen off" setting is used" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 15:21:32 +0000 (15:21 +0000)]
Merge ""Block notifications screen off" setting is used" into oc-dr1-dev

7 years agoMerge "Adding 26 free short codes for DCB and other purposes" am: 1585b2e7b7 am:...
Carlos Vinueza [Wed, 19 Jul 2017 14:37:59 +0000 (14:37 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes" am: 1585b2e7b7 am: 3a6a8b9baa
am: 263e83370e

Change-Id: Iaa2f0574fd83fb1cbe6bfbe65424e12e10b1076f

7 years agoMerge "Adding 26 free short codes for DCB and other purposes" am: 1585b2e7b7
Carlos Vinueza [Wed, 19 Jul 2017 14:33:04 +0000 (14:33 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes" am: 1585b2e7b7
am: 3a6a8b9baa

Change-Id: I61ae7d0404463c160dd22675c84b0782f33a3c5d

7 years agoMerge "Fixes for increased usage of light navigation bar" into oc-dr1-dev
Jorim Jaggi [Wed, 19 Jul 2017 14:27:38 +0000 (14:27 +0000)]
Merge "Fixes for increased usage of light navigation bar" into oc-dr1-dev
am: 3dc5e0ae3a

Change-Id: Ied6d9ca3f60b66aceebb326c536aea0267d166ad

7 years agoMerge "Adding 26 free short codes for DCB and other purposes"
Carlos Vinueza [Wed, 19 Jul 2017 14:26:55 +0000 (14:26 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"
am: 1585b2e7b7

Change-Id: Ia85bdccb4c6b15c6b5b7974f4cb5cc34af04d8d1

7 years agoMerge "Fixes for increased usage of light navigation bar" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 14:19:54 +0000 (14:19 +0000)]
Merge "Fixes for increased usage of light navigation bar" into oc-dr1-dev

7 years agoMerge "Adding 26 free short codes for DCB and other purposes"
Treehugger Robot [Wed, 19 Jul 2017 14:13:36 +0000 (14:13 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"

7 years agoMerge "Add new configuration values for demo mode" into oc-dr1-dev
Christine Franks [Wed, 19 Jul 2017 14:06:05 +0000 (14:06 +0000)]
Merge "Add new configuration values for demo mode" into oc-dr1-dev
am: f2dc5c69a4

Change-Id: I84a07c360044384b397767c29ac3751060c60900

7 years agoMerge "Add new configuration values for demo mode" into oc-dr1-dev
Christine Franks [Wed, 19 Jul 2017 13:59:22 +0000 (13:59 +0000)]
Merge "Add new configuration values for demo mode" into oc-dr1-dev

7 years agoMerge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev
Jorim Jaggi [Wed, 19 Jul 2017 13:19:55 +0000 (13:19 +0000)]
Merge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev
am: f89512c731

Change-Id: If62e97a3a85d1cc0748fb40f91b233104f000e85

7 years agoMerge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 13:11:26 +0000 (13:11 +0000)]
Merge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev

7 years agoMerge "Send app transition starting event at right time" into oc-dr1-dev
Jorim Jaggi [Wed, 19 Jul 2017 11:52:02 +0000 (11:52 +0000)]
Merge "Send app transition starting event at right time" into oc-dr1-dev
am: 790e3ff6e3

Change-Id: Iadada99fc926de016dc78b1a82270ceda5039066

7 years agoMerge "Send app transition starting event at right time" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 11:45:50 +0000 (11:45 +0000)]
Merge "Send app transition starting event at right time" into oc-dr1-dev

7 years agoFix wrong nav bar animation when unlocking from AOD
Jorim Jaggi [Wed, 19 Jul 2017 11:14:18 +0000 (11:14 +0000)]
Fix wrong nav bar animation when unlocking from AOD
am: f5304ad7be

Change-Id: I19e8db94e2ad70c8d6e267b0a85e6885cf80305b

7 years agoFix wrong nav bar animation when unlocking from AOD
Jorim Jaggi [Mon, 17 Jul 2017 16:31:13 +0000 (18:31 +0200)]
Fix wrong nav bar animation when unlocking from AOD

Visibility of navigation bar was set too late. Set it earlier
such that it gets the right animation.

In addition to that, fixes a bug where Keyguard unlock animation
was terminated too early if there was already a scrim animation
pending.

Test: Wake-and-unlock from Aod
Bug: 63726451
Change-Id: I9a45fb27db68d56904c0fade40ea1173176beae8

7 years agoFixes for increased usage of light navigation bar
Jorim Jaggi [Mon, 17 Jul 2017 14:46:00 +0000 (16:46 +0200)]
Fixes for increased usage of light navigation bar

- Fix an issue where IME doesn't really cover nav area but still
became window to deterine light navigation.
- Only invert nav bar icons when expanding the shade if the scrim
is dark.
- Fix logic such that status bar always becomes the window to
dermine light nav bar on lockscreen.

Test: Open shade with light nav
Test: Open Keyguard in landscape in all apps
Test: Unlock phone with light nav

Change-Id: If024a8b81942a6675243b703c0509cd88de8d932
Fixes: 63539478
Fixes: 63533427
Fixes: 63577858