OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev
Adrian Roos [Thu, 20 Jul 2017 16:12:11 +0000 (16:12 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev
am: 29119b6f5f

Change-Id: I71d3235402fd23ea82542bbb0957a7516ef77a66

7 years agoMerge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev
Adrian Roos [Thu, 20 Jul 2017 16:02:55 +0000 (16:02 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev

7 years agoMerge "Fix owner info to be center-aligned" into oc-dr1-dev
Geoffrey Pitsch [Thu, 20 Jul 2017 15:58:13 +0000 (15:58 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev
am: 67c483fd12

Change-Id: I0fd17dfaf70d07bf932b01d712e9cc94bf077660

7 years agoMerge "Fix owner info to be center-aligned" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 15:52:35 +0000 (15:52 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev

7 years agoMerge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev
Geoffrey Pitsch [Thu, 20 Jul 2017 15:41:14 +0000 (15:41 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev
am: 3ca605e28c

Change-Id: Ic4e1a653f38cf9e93f8262e55865a907dfbd2c83

7 years agoMerge "AOD: Hide owner info on ambient display" into oc-dr1-dev
Adrian Roos [Thu, 20 Jul 2017 15:35:04 +0000 (15:35 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev
am: 6c5ce43b39

Change-Id: I50047721cfdc25cba10e0af1545b8f7ec0e4e2e2

7 years agoMerge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev
Geoffrey Pitsch [Thu, 20 Jul 2017 15:33:41 +0000 (15:33 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev

7 years agoMerge "AOD: Hide owner info on ambient display" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 15:28:05 +0000 (15:28 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev

7 years agoMerge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc...
Benjamin Miller [Thu, 20 Jul 2017 14:13:15 +0000 (14:13 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am: baa85250d4
am: 9051bbf2cb

Change-Id: Ic770c60fc7407eae99e62e205a2ec55bac5a6980

7 years agoMerge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc...
Benjamin Miller [Thu, 20 Jul 2017 14:09:05 +0000 (14:09 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am: baa85250d4
am: aeb503f7ca

Change-Id: Id8a0ef9ecb0c4464da69a34f1d8a1fc2a1d41448

7 years agoMerge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
Benjamin Miller [Thu, 20 Jul 2017 14:05:31 +0000 (14:05 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
am: baa85250d4

Change-Id: I553b5b775cbdb42020405dfcc1b18032d4777597

7 years agoMerge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
Benjamin Miller [Thu, 20 Jul 2017 14:05:31 +0000 (14:05 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
am: baa85250d4

Change-Id: I9406e059aab1991209a234b6c4aa8767c25cda95

7 years agoKeyguard: only show after screen fully turned off
Adrian Roos [Thu, 20 Jul 2017 14:02:54 +0000 (14:02 +0000)]
Keyguard: only show after screen fully turned off
am: 4757c8ccf8

Change-Id: Iceb62f7c112afec4ac65c4e283a395b8c8fa31da

7 years agoStatusBar: Switch status bar to using the new lifecycles
Adrian Roos [Thu, 20 Jul 2017 14:02:01 +0000 (14:02 +0000)]
StatusBar: Switch status bar to using the new lifecycles
am: 731d4dfe60

Change-Id: I787e486dbf3f0226d9eb96fec5d1162c4c984892

7 years agoMerge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
Benjamin Miller [Thu, 20 Jul 2017 13:58:15 +0000 (13:58 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev

7 years agoAOD: Prevent animations and rotations while going to sleep
Adrian Roos [Wed, 19 Jul 2017 10:25:34 +0000 (12:25 +0200)]
AOD: Prevent animations and rotations while going to sleep

A recent change allowed animations while the screen is
turning on, but not fully turned on; this allows rotations
while the device is going to sleep though. To prevent that,
we now disallow animations if the device is going to sleep too.

In addition, we also prevent the rotation animation when the screen
is not fully on or non-interactive.

Change-Id: I9b84f68a02a07067e48b11c008bcaf4bcb7c41a0
Fixes: 63760853
Test: Turn phone to landscape on an app that can rotate. Press power button. Verify AOD shows without a rotation; go/wm-smoke

7 years agoAOD: Hide owner info on ambient display
Adrian Roos [Thu, 20 Jul 2017 13:14:25 +0000 (15:14 +0200)]
AOD: Hide owner info on ambient display

Change-Id: Iea27b111b4025e2ad4b9cd0139f18f1653ca17dc
Fixes: 63800919
Test: Set a dark wallpaper, set owner info; go to AOD, verify that owner info is not visible.

7 years agoKeyguard: only show after screen fully turned off
Adrian Roos [Tue, 18 Jul 2017 13:50:41 +0000 (15:50 +0200)]
Keyguard: only show after screen fully turned off

Fixes an issue where the keyguard was displayed before the screen
was turned off fully, causing the AOD screen to briefly show during
the screen off animation.

Change-Id: Idc4621995bd67c1db255fab5a8de60d3aeef5d18
Fixes: 63526727
Test: Turn screen off. Make sure the AOD clock is not visible

7 years agoStatusBar: Switch status bar to using the new lifecycles
Adrian Roos [Tue, 18 Jul 2017 13:10:39 +0000 (15:10 +0200)]
StatusBar: Switch status bar to using the new lifecycles

Also removes some now unneeded cruft from StatusBarKeyguardViewManager.

Bug: 62446740
Test: Try unlocking phone with fingerprint and regularly from all kinds of states (AOD1, AOD2, non-AOD ambient display)
Change-Id: I3560615ce77f0c2ad9944832baaa568c300af9bb

7 years agoMerge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
Adrian Roos [Thu, 20 Jul 2017 11:29:58 +0000 (11:29 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
am: d3878b5e12

Change-Id: Ibe7749ee616295426cdeae07deb9dc998c49e8e2

7 years agoMerge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
Adrian Roos [Thu, 20 Jul 2017 11:22:39 +0000 (11:22 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 10:25:13 +0000 (10:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 57c60d3b8c  -s ours

Change-Id: I60730d3e81bc72197f5582d203134e1b61711435

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 10:20:21 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 10:01:39 +0000 (10:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 3f9462d6a3  -s ours

Change-Id: I9801796f6d742693b880a924a134a33053ddbd5e

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 09:59:39 +0000 (09:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 6564d7d123  -s ours

Change-Id: I9e082bc72af2033aa0fcb3d565f77cba619f090c

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 09:53:20 +0000 (09:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 09:48:53 +0000 (09:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

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 agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Jul 2017 04:48:02 +0000 (21:48 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2ed6f707aa5196125419a43b85be6b9644364c24
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

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 agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Jul 2017 01:13:39 +0000 (18:13 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6f4be8da1bf25632b93d9ece8ae01dedeba2e568
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

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 agoImport translations. DO NOT MERGE
Bill Yi [Wed, 19 Jul 2017 22:34:38 +0000 (15:34 -0700)]
Import translations. DO NOT MERGE

Change-Id: I33e4b0269d92dd0dcca49ac2ff9f752713683c2e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

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