OSDN Git Service
Adrian Roos [Thu, 20 Jul 2017 16:46:00 +0000 (16:46 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev am:
29119b6f5f
am:
21929b83ac
Change-Id: I3a6c265dedfd33c0706bcad9ed12d3a2b9e3ba1d
Geoffrey Pitsch [Thu, 20 Jul 2017 16:44:41 +0000 (16:44 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev am:
67c483fd12
am:
ea53021e18
Change-Id: I57f7795c24c101c3f55911ef42344daa926c7aff
Geoffrey Pitsch [Thu, 20 Jul 2017 16:43:17 +0000 (16:43 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev am:
3ca605e28c
am:
4158c7a215 -s ours
Change-Id: I97fb6e08e7047aeb2c10d02627e0f389b621dd93
Adrian Roos [Thu, 20 Jul 2017 16:18:38 +0000 (16:18 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev am:
29119b6f5f
am:
747938ed61
Change-Id: I42fa84171dbc77d973365040e026b7962e116475
Adrian Roos [Thu, 20 Jul 2017 16:12:21 +0000 (16:12 +0000)]
Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev
am:
29119b6f5f
Change-Id: I5deca2c8224d629eadc18a7f7742c6f8d43b133d
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
Geoffrey Pitsch [Thu, 20 Jul 2017 16:05:05 +0000 (16:05 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev am:
67c483fd12
am:
fef6d5cad6
Change-Id: I5ff20066ac0133923784154bcbf90c723f8bbc6b
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
Geoffrey Pitsch [Thu, 20 Jul 2017 15:58:15 +0000 (15:58 +0000)]
Merge "Fix owner info to be center-aligned" into oc-dr1-dev
am:
67c483fd12
Change-Id: I59bc4ac9f712da83df2ff31bc083f408949f727e
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
Geoffrey Pitsch [Thu, 20 Jul 2017 15:58:06 +0000 (15:58 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev am:
3ca605e28c -s ours
am:
b2541cdfa6
Change-Id: I48675a66413664afef96451d4c2f0316ae91fe19
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
Geoffrey Pitsch [Thu, 20 Jul 2017 15:51:40 +0000 (15:51 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev
am:
3ca605e28c -s ours
Change-Id: Iacd4376b1e1f665fb72ca6e4fd7b8cabff88dc7c
Adrian Roos [Thu, 20 Jul 2017 15:44:41 +0000 (15:44 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev am:
6c5ce43b39
am:
1308367fd1
Change-Id: I44e6610b137fbe4b13a980b15517b6303de51077
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
Adrian Roos [Thu, 20 Jul 2017 15:41:09 +0000 (15:41 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev am:
6c5ce43b39
am:
6dfd8aa791
Change-Id: Ib04c87888bf7979f9c81ac730364307348676223
Adrian Roos [Thu, 20 Jul 2017 15:38:06 +0000 (15:38 +0000)]
Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev
am:
6c5ce43b39
Change-Id: I8bf76bd42a41055ec7e7b9352dce5577a381540c
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
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
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
Android Build Merger (Role) [Thu, 20 Jul 2017 14:22:36 +0000 (14:22 +0000)]
Merge "Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
9051bbf2cb am:
9ffdf2bc56" into oc-mr1-dev-plus-aosp
Benjamin Miller [Thu, 20 Jul 2017 14:21:14 +0000 (14:21 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
9051bbf2cb
am:
9ffdf2bc56
Change-Id: Iff44c7d7d6fa2adca84fcbca5ed14f9c92f784a2
Android Build Merger (Role) [Thu, 20 Jul 2017 14:20:35 +0000 (14:20 +0000)]
Merge "Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
aeb503f7ca am:
97c8fea260" into oc-mr1-dev-plus-aosp
Benjamin Miller [Thu, 20 Jul 2017 14:19:18 +0000 (14:19 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
aeb503f7ca
am:
97c8fea260
Change-Id: I8b8d9dca22fe021480a5c7f78555e55e9a0ce84b
Benjamin Miller [Thu, 20 Jul 2017 14:18:05 +0000 (14:18 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4 am:
aeb503f7ca
am:
ca4f0f98a2
Change-Id: I0be1fae85526b21dfafd14971035eb33af765da3
Android Build Merger (Role) [Thu, 20 Jul 2017 14:15:59 +0000 (14:15 +0000)]
Merge changes from topic 'am-
993c43530b0f4dacbb88b40a1b1760de' into oc-mr1-dev-plus-aosp
* changes:
Keyguard: only show after screen fully turned off am:
4757c8ccf8 am:
793e0eea6a
StatusBar: Switch status bar to using the new lifecycles am:
731d4dfe60 am:
be0f74979d
Adrian Roos [Thu, 20 Jul 2017 14:14:11 +0000 (14:14 +0000)]
Keyguard: only show after screen fully turned off am:
4757c8ccf8
am:
793e0eea6a
Change-Id: I6ba824429f752810730a715ceec03f0f68514af2
Adrian Roos [Thu, 20 Jul 2017 14:13:23 +0000 (14:13 +0000)]
Keyguard: only show after screen fully turned off am:
4757c8ccf8
am:
7f0c9be1cc
Change-Id: Id880b68be856501aab777f3613070c3d078f117b
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
Adrian Roos [Thu, 20 Jul 2017 14:13:14 +0000 (14:13 +0000)]
StatusBar: Switch status bar to using the new lifecycles am:
731d4dfe60
am:
be0f74979d
Change-Id: Icb0abf102d9a6f8ebc43e100d8f6ae7f879b5288
Adrian Roos [Thu, 20 Jul 2017 14:12:03 +0000 (14:12 +0000)]
StatusBar: Switch status bar to using the new lifecycles am:
731d4dfe60
am:
a91fb78a05
Change-Id: I1d665855a25b8da8093a213bbcea533652a853f8
Benjamin Miller [Thu, 20 Jul 2017 14:09:07 +0000 (14:09 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am:
baa85250d4
am:
aeb503f7ca
Change-Id: Iff0d3dbea379e2e90a2cf7fc82675eac2c088e11
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
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
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
Adrian Roos [Thu, 20 Jul 2017 14:03:00 +0000 (14:03 +0000)]
Keyguard: only show after screen fully turned off
am:
4757c8ccf8
Change-Id: Iadb07f0e33b1de9d266a9cd91d606a72e94de704
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
Adrian Roos [Thu, 20 Jul 2017 14:02:05 +0000 (14:02 +0000)]
StatusBar: Switch status bar to using the new lifecycles
am:
731d4dfe60
Change-Id: Iad1cea70608c9b2a48bd5e6308ad2e135dc0f720
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
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
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
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.
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
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
Android Build Merger (Role) [Thu, 20 Jul 2017 11:38:29 +0000 (11:38 +0000)]
Merge "Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am:
d3878b5e12 am:
41234fdc6c" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 20 Jul 2017 11:36:00 +0000 (11:36 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am:
d3878b5e12
am:
520caf4a75
Change-Id: I1dd6043af695b882612d17d8bbd7ca8195c960d4
Adrian Roos [Thu, 20 Jul 2017 11:36:00 +0000 (11:36 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am:
d3878b5e12
am:
41234fdc6c
Change-Id: I65b7d753348403be479a556e6b0d201ea363a982
Adrian Roos [Thu, 20 Jul 2017 11:29:59 +0000 (11:29 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
am:
d3878b5e12
Change-Id: I11ddc51a8c71d22b5420def8a4c0f3f57954a081
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
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
Bill Yi [Thu, 20 Jul 2017 10:38:10 +0000 (10:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
57c60d3b8c -s ours
am:
3c7e41a6e9 -s ours
Change-Id: I2076be4bf62ef1b354e5e30ff001a80404ecc127
Bill Yi [Thu, 20 Jul 2017 10:31:42 +0000 (10:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
57c60d3b8c -s ours
am:
ac2abee039 -s ours
Change-Id: If0b55bb356eb9958d8b036ddb4ff70d178c64355
Bill Yi [Thu, 20 Jul 2017 10:31:32 +0000 (10:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
57c60d3b8c -s ours
Change-Id: I6bf7ec12c4e7d35322d4e53e8c0b6f60878e7b97
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
TreeHugger Robot [Thu, 20 Jul 2017 10:20:21 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Android Build Merger (Role) [Thu, 20 Jul 2017 10:12:02 +0000 (10:12 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3f9462d6a3 -s ours am:
612bc3c9b8 -s ours" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 20 Jul 2017 10:11:43 +0000 (10:11 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3f9462d6a3 -s ours am:
3b79072040 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 20 Jul 2017 10:10:40 +0000 (10:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3f9462d6a3 -s ours
am:
612bc3c9b8 -s ours
Change-Id: I49ba3fcfb6851646fb344beadf05c11005452b2b
Bill Yi [Thu, 20 Jul 2017 10:10:15 +0000 (10:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3f9462d6a3 -s ours
am:
3b79072040 -s ours
Change-Id: I2355fc5b35b5fd65c04676336e77a7714e4c7925
Android Build Merger (Role) [Thu, 20 Jul 2017 10:10:12 +0000 (10:10 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
6564d7d123 -s ours am:
dfd75c536f -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 20 Jul 2017 10:08:45 +0000 (10:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
6564d7d123 -s ours
am:
dfd75c536f -s ours
Change-Id: If8ab0ac81b196e61796bb21d5294d2e30d5415a1
Bill Yi [Thu, 20 Jul 2017 10:08:42 +0000 (10:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
6564d7d123 -s ours
am:
9b94308cec -s ours
Change-Id: If5e639d09b5d809a687a49181dfdddddcbb91f6d
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: I67cf707cf9eb5184865edfea8535b81d413e0807
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
Bill Yi [Thu, 20 Jul 2017 09:59:43 +0000 (09:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
6564d7d123 -s ours
Change-Id: Iac082addbf3aa178053f4eb27a91d0b842646898
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
TreeHugger Robot [Thu, 20 Jul 2017 09:53:20 +0000 (09:53 +0000)]
Merge "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
Android Build Merger (Role) [Thu, 20 Jul 2017 08:45:26 +0000 (08:45 +0000)]
Merge "Don't move stack to bottom when creating task at bottom am:
8cee0336bb am:
72a19b6d0b" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 20 Jul 2017 08:45:06 +0000 (08:45 +0000)]
Merge "Don't move stack to bottom when creating task at bottom am:
8cee0336bb am:
89dba67748" into oc-mr1-dev-plus-aosp
Wale Ogunwale [Thu, 20 Jul 2017 08:44:12 +0000 (08:44 +0000)]
Don't move stack to bottom when creating task at bottom am:
8cee0336bb
am:
72a19b6d0b
Change-Id: Id40abea748286f59273ea85a3925b9875e6801fa
Wale Ogunwale [Thu, 20 Jul 2017 08:43:43 +0000 (08:43 +0000)]
Don't move stack to bottom when creating task at bottom am:
8cee0336bb
am:
89dba67748
Change-Id: Iaf223c4444e70b0fc6d9a50e1e774c602163a12c
Di Lu [Thu, 20 Jul 2017 08:42:27 +0000 (08:42 +0000)]
Merge "Add unit test for IpSecService" am:
9e3f886dca am:
3182454f28 am:
345db82674
am:
636033782b
Change-Id: I788e4e8466a76f80d1f15330e6d3b91b73be1d32
Di Lu [Thu, 20 Jul 2017 08:38:36 +0000 (08:38 +0000)]
Merge "Add unit test for IpSecManager" am:
dd494fa91c am:
73b7292a05 am:
eb7bc05b32
am:
aadf75714a
Change-Id: Iecf36183010f78920ef4112b9b0a0febf4ece82c
Wale Ogunwale [Thu, 20 Jul 2017 08:38:13 +0000 (08:38 +0000)]
Don't move stack to bottom when creating task at bottom
am:
8cee0336bb
Change-Id: I81914112fe2be1c3c69298d4cc5e9db302df618d
Andreas Gampe [Thu, 20 Jul 2017 08:36:57 +0000 (08:36 +0000)]
Merge "Zygote: Poll with timeout for pid" am:
89d119abe6 am:
6078facf1f am:
57ba0ddc91
am:
d3e7126645 -s ours
Change-Id: I92025790fe2d6d9db9f57f51c31d5ddc5c022034
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
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
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)
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
Di Lu [Thu, 20 Jul 2017 07:36:19 +0000 (07:36 +0000)]
Merge "Add unit test for IpSecService"
am:
9e3f886dca
Change-Id: I16fb89239e641ac39a8a7adeafd72b7fe03935ed
Di Lu [Thu, 20 Jul 2017 07:27:16 +0000 (07:27 +0000)]
Merge "Add unit test for IpSecService"
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
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
Di Lu [Thu, 20 Jul 2017 05:52:10 +0000 (05:52 +0000)]
Merge "Add unit test for IpSecManager"
am:
dd494fa91c
Change-Id: I56c336eb8234b31154b6a7defd95ce76ea0800d8
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
Di Lu [Thu, 20 Jul 2017 05:42:53 +0000 (05:42 +0000)]
Merge "Add unit test for IpSecManager"
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
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
Treehugger Robot [Thu, 20 Jul 2017 05:25:24 +0000 (05:25 +0000)]
Merge "Zygote: Poll with timeout for pid"
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
Jeff Davidson [Thu, 20 Jul 2017 04:38:28 +0000 (04:38 +0000)]
Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev am:
acdcf37e4b
am:
10238e562a
Change-Id: If5106972654149f5cb53aedae45964397dcfb69d
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
Sudheer Shanka [Thu, 20 Jul 2017 04:28:19 +0000 (04:28 +0000)]
Merge "Assign cpu times to correct battery state bucket."
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
TreeHugger Robot [Thu, 20 Jul 2017 04:24:50 +0000 (04:24 +0000)]
Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev
Philip Quinn [Thu, 20 Jul 2017 04:11:22 +0000 (04:11 +0000)]
Merge "Ping the StatusBar about power key events. am:
c3a503d8fd" into oc-dr1-dev-plus-aosp
am:
c5f9c329c1
Change-Id: I2906e0d6faae5a800cb70e13e5fb8fe590fe0bfa
Ahmed ElArabawy [Thu, 20 Jul 2017 04:09:02 +0000 (04:09 +0000)]
Merge "Add Configuration to APF Policy" am:
d27a6d62c6 am:
70291ef1d7 am:
2d0f47c40f -s ours
am:
7e8c7b806e -s ours
Change-Id: Ib093c053dad3f4560579c57c980cfc14e203cfa9
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
Michael Plass [Thu, 20 Jul 2017 04:02:27 +0000 (04:02 +0000)]
Merge "WifiInfo - document packet counters and rates" into oc-dr1-dev am:
8d51d3e512
am:
231610fc1a
Change-Id: I4e0f4c17c9d09ec2c4f181705052912d370be0eb
OSDN Git Service
