OSDN Git Service
Adrian Roos [Thu, 20 Jul 2017 14:29:17 +0000 (14:29 +0000)]
Merge changes from topic 'am-
993c43530b0f4dacbb88b40a1b1760de' into oc-mr1-dev-plus-aosp
am:
836b9d1c7a
Change-Id: Ifad5e11ca05f2c6d53be99871d8b40ad1b791638
Adrian Roos [Thu, 20 Jul 2017 14:27:02 +0000 (14:27 +0000)]
Keyguard: only show after screen fully turned off am:
4757c8ccf8 am:
7f0c9be1cc
am:
67be3b034a
Change-Id: I2849184727c193b42c6e42a13cbb64973f8bc2f0
Adrian Roos [Thu, 20 Jul 2017 14:25:56 +0000 (14:25 +0000)]
StatusBar: Switch status bar to using the new lifecycles am:
731d4dfe60 am:
a91fb78a05
am:
7e9fae4d7a
Change-Id: Ia65746b6e8c3943e5ca96b2e87cecd33534651fa
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
Clara Bayarri [Thu, 20 Jul 2017 14:15:30 +0000 (14:15 +0000)]
Merge "Make up/down movement of multilength lines remember position"
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
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
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
Adrian Roos [Thu, 20 Jul 2017 11:52:36 +0000 (11:52 +0000)]
Merge "Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am:
d3878b5e12 am:
41234fdc6c" into oc-mr1-dev-plus-aosp
am:
5d39df803d
Change-Id: Ie11d9ffac98f97b5a36934eb6d075e3e5c84c723
Adrian Roos [Thu, 20 Jul 2017 11:43:12 +0000 (11:43 +0000)]
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am:
d3878b5e12 am:
520caf4a75
am:
90e78fd304
Change-Id: Ibd11cf8c7c84ebec034760f8e0fc44324617b9ee
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:44:42 +0000 (10:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
57c60d3b8c -s ours am:
3c7e41a6e9 -s ours
am:
fc337a7e29 -s ours
Change-Id: I32ad0f00121cbc01f976ebbb9b596757f044e951
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:38:10 +0000 (10:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
57c60d3b8c -s ours am:
ac2abee039 -s ours
am:
6a33a2a6d8 -s ours
Change-Id: I82a3af4d5a0b2f80f22b00bd281c38a695abfe8b
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
Bill Yi [Thu, 20 Jul 2017 10:23:00 +0000 (10:23 +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
am:
8a630470e8 -s ours
Change-Id: I69ea946a07754daf13f182250c5cc445796c7547
Bill Yi [Thu, 20 Jul 2017 10:21:32 +0000 (10:21 +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
am:
1866df21f9 -s ours
Change-Id: Iafd3408ca1a7fd716ac22f7d7b2a33e053bc6b5c
TreeHugger Robot [Thu, 20 Jul 2017 10:20:21 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 10:20:11 +0000 (10:20 +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
am:
f9a0de0fa3 -s ours
Change-Id: Ic5cd6d5dde1610e7b17750b914826944a48c5f6f
Bill Yi [Thu, 20 Jul 2017 10:18:43 +0000 (10:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
6564d7d123 -s ours am:
9b94308cec -s ours
am:
b2883febe9 -s ours
Change-Id: I95a980c05129c91f825adabb3415bd1bab455120
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
TreeHugger Robot [Thu, 20 Jul 2017 09:46:18 +0000 (09:46 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 20 Jul 2017 09:45:09 +0000 (09:45 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 20 Jul 2017 09:36:29 +0000 (09:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Wale Ogunwale [Thu, 20 Jul 2017 08:54:19 +0000 (08:54 +0000)]
Merge "Don't move stack to bottom when creating task at bottom am:
8cee0336bb am:
72a19b6d0b" into oc-mr1-dev-plus-aosp
am:
c860808910
Change-Id: I4bc6d9e319efc46d1ff83b3724b790ab8b48c0af
Wale Ogunwale [Thu, 20 Jul 2017 08:52:45 +0000 (08:52 +0000)]
Merge "Don't move stack to bottom when creating task at bottom am:
8cee0336bb am:
89dba67748" into oc-mr1-dev-plus-aosp
am:
e22cc97ca8
Change-Id: Ia11b73b0c93bb94bafa3129af416596f4fdb42ed
Di Lu [Thu, 20 Jul 2017 08:50:39 +0000 (08:50 +0000)]
Merge "Add unit test for IpSecService" am:
9e3f886dca am:
3182454f28 am:
345db82674 am:
636033782b
am:
b29659421e
Change-Id: Icc0e4440b695095acdcd6fb11664c230dafd2a22
Di Lu [Thu, 20 Jul 2017 08:49:14 +0000 (08:49 +0000)]
Merge "Add unit test for IpSecManager" am:
dd494fa91c am:
73b7292a05 am:
eb7bc05b32 am:
aadf75714a
am:
3eedbf543c
Change-Id: I9a4c6d74f2fb6e2fb98308546b3bd26f7858057c
Andreas Gampe [Thu, 20 Jul 2017 08:47:49 +0000 (08:47 +0000)]
Merge "Zygote: Poll with timeout for pid" am:
89d119abe6 am:
6078facf1f am:
57ba0ddc91 am:
d3e7126645 -s ours
am:
282f98bfac
Change-Id: I8aba0fb492531e56f647b76ba6d992bc7a127a29
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:27:25 +0000 (06:27 +0000)]
Merge "Add unit test for IpSecManager" am:
dd494fa91c am:
73b7292a05 am:
eb7bc05b32
am:
aadf75714a
Change-Id: Ic2bfa2f8440f9dce1f218fccde1674ac76e81fe3
Andreas Gampe [Thu, 20 Jul 2017 06:25:16 +0000 (06:25 +0000)]
Merge "Zygote: Poll with timeout for pid" am:
89d119abe6 am:
6078facf1f am:
57ba0ddc91
am:
d3e7126645 -s ours
Change-Id: I21e48ca8b0fdc9f9ded5d67c51b2026e7c8415c2
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
Bill Yi [Thu, 20 Jul 2017 04:39:35 +0000 (21:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3a8a8d4641bd93f1dab442d2c0604f3878075580
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
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
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
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
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
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
TreeHugger Robot [Thu, 20 Jul 2017 03:49:56 +0000 (03:49 +0000)]
Merge "WifiInfo - document packet counters and rates" into oc-dr1-dev
Ahmed ElArabawy [Thu, 20 Jul 2017 03:46:08 +0000 (03:46 +0000)]
Merge "Add Configuration to APF Policy"
am:
d27a6d62c6
Change-Id: I491bad86e4e9ae7a813ac214b06273719a583079
TreeHugger Robot [Thu, 20 Jul 2017 03:42:13 +0000 (03:42 +0000)]
Merge "Rename vendorExtension fields to vendorInfo."
Treehugger Robot [Thu, 20 Jul 2017 03:34:57 +0000 (03:34 +0000)]
Merge "Add Configuration to APF Policy"
Jeff Sharkey [Thu, 20 Jul 2017 03:20:22 +0000 (03:20 +0000)]
Merge "Let's get a constant for O_MR1."
OSDN Git Service
