OSDN Git Service
Greg Kaiser [Wed, 24 Apr 2019 13:15:54 +0000 (06:15 -0700)]
incidentd: Move logging statement so it's used
We move our ALOGE() to prior to the 'return', so it gets invoked
if we get to this logic.
Test: TreeHugger
Change-Id: Ifcd73d3abe98705cb94616bedd224b4425f4e964
Lorenzo Colitti [Wed, 24 Apr 2019 12:40:31 +0000 (05:40 -0700)]
Merge changes I84461d40,Ib3ab9105 into qt-dev am:
3fe30fa71b
am:
b63abe5f0e
Change-Id: I55f63560154e23d5dd02ca9a80f744d18fa70794
Lorenzo Colitti [Wed, 24 Apr 2019 12:34:29 +0000 (05:34 -0700)]
[automerger skipped] Add a timeout for the DNS probe. am:
28c966eaa9 -s ours
am:
37673bcd68 -s ours
am skip reason: change_id Ib3ab9105d7ae39f551b51e8d5a04b9ec5e549655 with SHA1
6413419435 is in history
Change-Id: I45f5f108935d238e5a374004ba37cc1f0206bf03
Lorenzo Colitti [Wed, 24 Apr 2019 12:24:15 +0000 (05:24 -0700)]
Merge changes I84461d40,Ib3ab9105 into qt-dev
am:
3fe30fa71b
Change-Id: Ief0b029527ec71a6744ba2b6a72751e8a5b2bf98
Lorenzo Colitti [Wed, 24 Apr 2019 12:16:47 +0000 (05:16 -0700)]
[automerger skipped] Add a timeout for the DNS probe.
am:
28c966eaa9 -s ours
am skip reason: change_id Ib3ab9105d7ae39f551b51e8d5a04b9ec5e549655 with SHA1
6413419435 is in history
Change-Id: Id730bd5b05ad4bd9f891d35a47485c8f7d2a1218
Lorenzo Colitti [Wed, 24 Apr 2019 10:23:54 +0000 (03:23 -0700)]
Merge "Delete unused timeout constant." am:
1439bbb6d5 am:
15b57501ab
am:
21c692d717
Change-Id: I016dad3a42268836e361d8c312a7fec6478106e9
Rubin Xu [Wed, 24 Apr 2019 10:15:38 +0000 (03:15 -0700)]
Merge "Reinstate new VPN uid filtering unit tests" am:
554a15d5ea am:
89213aa483
am:
4469b1d8a5
Change-Id: I327acdf20cb9bad61c9e4c193298edd0f2e69f2f
Lorenzo Colitti [Wed, 24 Apr 2019 10:10:52 +0000 (03:10 -0700)]
Merge "Delete unused timeout constant." am:
1439bbb6d5
am:
15b57501ab
Change-Id: I36baeaef7ecac045150ca92e72293c49829c128f
Rubin Xu [Wed, 24 Apr 2019 10:05:12 +0000 (03:05 -0700)]
Merge "Reinstate new VPN uid filtering unit tests" am:
554a15d5ea
am:
89213aa483
Change-Id: Ic2faef44831575b2d03bc00ef2553d5c549adc95
Lorenzo Colitti [Wed, 24 Apr 2019 09:57:48 +0000 (02:57 -0700)]
Merge "Delete unused timeout constant."
am:
1439bbb6d5
Change-Id: I341540745196f1d23fb95263a8948561cdfa4c8e
Rubin Xu [Wed, 24 Apr 2019 09:53:44 +0000 (02:53 -0700)]
Merge "Reinstate new VPN uid filtering unit tests"
am:
554a15d5ea
Change-Id: Ib76c2cf319377141a374b3bdcf5e6606aaf9c06b
Treehugger Robot [Wed, 24 Apr 2019 09:44:14 +0000 (09:44 +0000)]
Merge "Delete unused timeout constant."
Treehugger Robot [Wed, 24 Apr 2019 09:37:49 +0000 (09:37 +0000)]
Merge "Reinstate new VPN uid filtering unit tests"
John Reck [Wed, 24 Apr 2019 08:11:37 +0000 (01:11 -0700)]
Merge "Disable flaky tests" into qt-dev am:
30a25acb83
am:
64bb45ad2a
Change-Id: I4523099930a8f5a105882fb2049266b75650770f
Lorenzo Colitti [Wed, 24 Apr 2019 08:11:26 +0000 (08:11 +0000)]
Merge changes I84461d40,Ib3ab9105 into qt-dev
* changes:
Allow overlaying the DNS probe timeout.
Add a timeout for the DNS probe.
Lorenzo Colitti [Wed, 24 Apr 2019 08:09:08 +0000 (17:09 +0900)]
Delete unused timeout constant.
Test: m
Bug:
129312219
Change-Id: I5b4c8b42dea515f674ff10d64d0e1d06d849cca1
Hai Zhang [Wed, 24 Apr 2019 07:51:07 +0000 (00:51 -0700)]
Merge "Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev am:
eb90b66cb5" into qt-dev-plus-aosp
am:
5605531bac
Change-Id: I02f85d52f683d6a13ae0f906e9356da01f1ba16f
Leland Miller [Wed, 24 Apr 2019 07:38:10 +0000 (00:38 -0700)]
Merge "Create new RcsMessageQueryResultParcelable" am:
6af6e3a4f6 am:
728f0e4927
am:
a2a20dca04
Change-Id: Ic9c080f0f4e3c90c67330ffda391f8f4485f3b51
Jackal Guo [Wed, 24 Apr 2019 07:30:55 +0000 (00:30 -0700)]
Merge "Race condition while injecting ACTION_OUTSIDE" into qt-dev am:
efc894eeec
am:
520ffb3f45
Change-Id: I5b598049d914dd7f59fdaa3255a7810d464a4493
John Reck [Wed, 24 Apr 2019 07:22:45 +0000 (00:22 -0700)]
Merge "Disable flaky tests" into qt-dev
am:
30a25acb83
Change-Id: I9d5c0e7cdc03d1298fa23d70d8210faddaf54ab6
Xiao Ma [Wed, 24 Apr 2019 07:17:50 +0000 (00:17 -0700)]
Merge "Add overlay tag for default dns servers." into qt-dev am:
fdc8356a6f
am:
123f7f700e
Change-Id: I850a6d018feaa231b6f8b1f13b61c68f1aab323b
TreeHugger Robot [Wed, 24 Apr 2019 06:58:00 +0000 (06:58 +0000)]
Merge "Disable flaky tests" into qt-dev
Android Build Merger (Role) [Wed, 24 Apr 2019 06:45:44 +0000 (06:45 +0000)]
Merge "Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev am:
eb90b66cb5" into qt-dev-plus-aosp
Hai Zhang [Wed, 24 Apr 2019 06:45:05 +0000 (23:45 -0700)]
Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev
am:
eb90b66cb5
Change-Id: I729f70641a3143a31967bf8e5c425299a5608df2
Kevin Chyn [Wed, 24 Apr 2019 06:42:42 +0000 (23:42 -0700)]
Merge "Post a notification when ACQUIRED_RECALIBRATE is received" into qt-dev am:
895664662b
am:
6620fce3db
Change-Id: Ib88e94d7e7b95aae4928add3d2383b439c21dfe5
Leland Miller [Wed, 24 Apr 2019 06:42:12 +0000 (23:42 -0700)]
Merge "Create new RcsMessageQueryResultParcelable" am:
6af6e3a4f6
am:
728f0e4927
Change-Id: I0ef4197635fac2c6d78b423e120cd8b9580c52ff
Shuzhen Wang [Wed, 24 Apr 2019 06:34:42 +0000 (23:34 -0700)]
Merge "DngCreator: Assume square pixel centered at (x+0.5, y+0.5)" into qt-dev am:
5f01dcc5f3
am:
6e9a902720
Change-Id: If3f4154ff3632cbaba45eb71b6c24a16c1bc2ccf
Leland Miller [Wed, 24 Apr 2019 06:30:26 +0000 (23:30 -0700)]
Merge "Create new RcsMessageQueryResultParcelable"
am:
6af6e3a4f6
Change-Id: Id86442efa84f9c2ed49dc362f4a17466851dacfe
Jackal Guo [Wed, 24 Apr 2019 06:25:13 +0000 (23:25 -0700)]
Merge "Race condition while injecting ACTION_OUTSIDE" into qt-dev
am:
efc894eeec
Change-Id: I92160ccd59f7fa250a1d747eddb6a2e12f1c5be3
Svet Ganov [Wed, 24 Apr 2019 06:19:16 +0000 (23:19 -0700)]
Merge "Address API council feedback" into qt-dev am:
f8c904958b
am:
e572e48b16
Change-Id: Ib678a6c0da34346ce21f911986d1bc85dbe6ab8f
Treehugger Robot [Wed, 24 Apr 2019 06:12:47 +0000 (06:12 +0000)]
Merge "Create new RcsMessageQueryResultParcelable"
Brad Stenning [Wed, 24 Apr 2019 06:12:35 +0000 (23:12 -0700)]
Merge "Merge "Move HUN car notifications into SystemUI" into qt-dev am:
949266a388" into qt-dev-plus-aosp
am:
2522f53a48
Change-Id: Iad7797140712aac785bdbb99d392a41c0b98c96e
Xiao Ma [Wed, 24 Apr 2019 06:00:19 +0000 (23:00 -0700)]
Merge "Add overlay tag for default dns servers." into qt-dev
am:
fdc8356a6f
Change-Id: I09fe5c1990cb5b1bfb7bd49a9e8fb874aee6085f
TreeHugger Robot [Wed, 24 Apr 2019 05:57:24 +0000 (05:57 +0000)]
Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev
Lorenzo Colitti [Wed, 24 Apr 2019 05:43:50 +0000 (14:43 +0900)]
Allow overlaying the DNS probe timeout.
Test: m
Bug:
129312219
Change-Id: I84461d40e4d2e63ce8c111c047cbc085cb49443e
Aaron Huang [Wed, 24 Apr 2019 05:48:59 +0000 (22:48 -0700)]
Merge "Move NattKeepalivePacketData out of the framework" am:
833edcbb1b am:
cab3f447ae
am:
280a223c28
Change-Id: Ie1d02bb7bccb76415cf71824147466cabf6b88b6
Jackal Guo [Wed, 24 Apr 2019 05:47:11 +0000 (05:47 +0000)]
Merge "Race condition while injecting ACTION_OUTSIDE" into qt-dev
Seigo Nonaka [Wed, 24 Apr 2019 05:41:21 +0000 (22:41 -0700)]
Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev am:
5f873a09a0
am:
995bf1e3e6
Change-Id: I2245df4205a28af10fa08eee592176bc6a73ae8e
Lorenzo Colitti [Tue, 23 Apr 2019 16:57:47 +0000 (09:57 -0700)]
Add a timeout for the DNS probe.
Bug:
129312219
Test: atest NetworkStackTests
Test: atest --generate-new-metrics 50 NetworkStackTests:com.android.server.connectivity.NetworkMonitorTest
Change-Id: Ib3ab9105d7ae39f551b51e8d5a04b9ec5e549655
Merged-In: Ib3ab9105d7ae39f551b51e8d5a04b9ec5e549655
(cherry picked from commit
c7204f689dc58c3ac84818cb1f8fb9add307d90c)
Kevin Chyn [Wed, 24 Apr 2019 05:36:20 +0000 (22:36 -0700)]
Merge "Post a notification when ACQUIRED_RECALIBRATE is received" into qt-dev
am:
895664662b
Change-Id: I5028210278c1238591ec5b9e842fd7b2a0b73868
Emilian Peev [Wed, 24 Apr 2019 05:36:07 +0000 (22:36 -0700)]
Merge "Check and configure pixel format when locking canvas" into qt-dev am:
f8d04b2d2f
am:
6c0d305f35
Change-Id: Icd858aff2e6e8fadc9834d2aeeb9da18b83ce034
Matt Pietal [Wed, 24 Apr 2019 05:31:00 +0000 (22:31 -0700)]
Merge "Sharesheet - Scrolling UI adjustments" into qt-dev am:
c35533726d
am:
c7ad0f52cc
Change-Id: Ic5e3d6455ca25d68ec790751d48c90050961e3ae
Robert Snoeberger [Wed, 24 Apr 2019 05:25:42 +0000 (22:25 -0700)]
Merge "Transition to bold when shrinking clock" into qt-dev am:
993e5dacd7
am:
208fd6731c
Change-Id: Id3c1729daa0b0af5ef815b0626267c6cf92e70c4
Hyundo Moon [Wed, 24 Apr 2019 05:18:38 +0000 (22:18 -0700)]
Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev am:
007bb68bdb
am:
08e1c031f5
Change-Id: Ie337f75a530143cea81089180b677a319f873780
Shuzhen Wang [Wed, 24 Apr 2019 05:11:37 +0000 (22:11 -0700)]
Merge "DngCreator: Assume square pixel centered at (x+0.5, y+0.5)" into qt-dev
am:
5f01dcc5f3
Change-Id: I8ba569669290b4d964a38823652bb3cadb0518e4
TreeHugger Robot [Wed, 24 Apr 2019 05:07:30 +0000 (05:07 +0000)]
Merge "Add overlay tag for default dns servers." into qt-dev
Kevin Chyn [Wed, 24 Apr 2019 04:56:10 +0000 (04:56 +0000)]
Merge "Post a notification when ACQUIRED_RECALIBRATE is received" into qt-dev
Svet Ganov [Wed, 24 Apr 2019 04:51:03 +0000 (21:51 -0700)]
Merge "Address API council feedback" into qt-dev
am:
f8c904958b
Change-Id: I64b2ee4e8e688743ca5c515328408998405aa0ba
TreeHugger Robot [Wed, 24 Apr 2019 04:50:43 +0000 (04:50 +0000)]
Merge "DngCreator: Assume square pixel centered at (x+0.5, y+0.5)" into qt-dev
Shuzhen Wang [Wed, 24 Apr 2019 04:48:02 +0000 (21:48 -0700)]
Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev am:
b9177522ff
am:
578e1637bd
Change-Id: Ie1f96c91c50e56294e13475e976cb085cb129884
Yao Chen [Wed, 24 Apr 2019 04:41:41 +0000 (21:41 -0700)]
Merge "Add encryption in incidentd." into qt-dev am:
a35c2f1224
am:
3583bd2e8f
Change-Id: I1ce9b81dcd1890649418548b51a37f594e7c2025
Steve Elliott [Wed, 24 Apr 2019 04:36:29 +0000 (21:36 -0700)]
Merge "Initialize Global Actions Panel when one is available" into qt-dev am:
5acc240320
am:
36e25edae0
Change-Id: I42a3a5a7ebb92e22841df0c0e7d5531210521291
Lucas Dupin [Wed, 24 Apr 2019 04:31:32 +0000 (21:31 -0700)]
Merge "Fix click and long click lock behavior" into qt-dev am:
15ee32b208
am:
db88ab8d29
Change-Id: Ic1469b7599ca075eedcee3cf43d8f166adfd7861
TreeHugger Robot [Wed, 24 Apr 2019 04:29:32 +0000 (04:29 +0000)]
Merge "Address API council feedback" into qt-dev
Android Build Merger (Role) [Wed, 24 Apr 2019 04:28:29 +0000 (04:28 +0000)]
Merge "Merge "Move HUN car notifications into SystemUI" into qt-dev am:
949266a388" into qt-dev-plus-aosp
Brad Stenning [Wed, 24 Apr 2019 04:27:48 +0000 (21:27 -0700)]
Merge "Move HUN car notifications into SystemUI" into qt-dev
am:
949266a388
Change-Id: Id0ff2d9a137f791642675a3a02e7b87d0069e820
Anil Admal [Wed, 24 Apr 2019 04:26:26 +0000 (21:26 -0700)]
Merge "Fix incorrect error log message in GnssVisibilityControl class" into qt-dev am:
5bcdc825ed
am:
6a6d68eb04
Change-Id: Iaaf1e9e14444d16875d017745d553f6a035337bc
Aaron Huang [Wed, 24 Apr 2019 04:26:03 +0000 (21:26 -0700)]
Merge "Move NattKeepalivePacketData out of the framework" am:
833edcbb1b
am:
cab3f447ae
Change-Id: Idf7c25b6b553d8c0cc4ef2ea8193438480420fb4
Aaron Huang [Wed, 24 Apr 2019 04:17:26 +0000 (21:17 -0700)]
Merge "Move NattKeepalivePacketData out of the framework"
am:
833edcbb1b
Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08
Seigo Nonaka [Wed, 24 Apr 2019 04:16:08 +0000 (21:16 -0700)]
Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev
am:
5f873a09a0
Change-Id: I1995dee390d20f18d223addaa6232765dfded8a5
Aaron Huang [Wed, 24 Apr 2019 04:00:56 +0000 (04:00 +0000)]
Merge "Move NattKeepalivePacketData out of the framework"
TreeHugger Robot [Wed, 24 Apr 2019 03:49:16 +0000 (03:49 +0000)]
Merge "Move HUN car notifications into SystemUI" into qt-dev
Marissa Wall [Wed, 24 Apr 2019 03:41:46 +0000 (20:41 -0700)]
Merge "ASurfaceControl: fix surface damage" into qt-dev am:
9a205d9b12
am:
4824732ebc
Change-Id: Id7d39a922cf4fc96d32302985e8de6af03a4384c
Mike Digman [Wed, 24 Apr 2019 03:35:30 +0000 (20:35 -0700)]
Merge "Sharesheet - update direct share loading animation" into qt-dev am:
b8c3309a64
am:
bb2e0b9a03
Change-Id: I51fa71dae4d9e6401e61a57f067825ad105b9a04
TreeHugger Robot [Wed, 24 Apr 2019 03:35:15 +0000 (03:35 +0000)]
Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev
Xiao Ma [Wed, 24 Apr 2019 02:28:10 +0000 (11:28 +0900)]
Add overlay tag for default dns servers.
Bug:
130324939
Test: m && flashall && verified dns servers resource has been changed.
Change-Id: Ic897d066567e7c826a18959e1dcc1260f82b4013
Steven Wu [Wed, 24 Apr 2019 03:13:48 +0000 (20:13 -0700)]
Merge "Add logging for dozing on or off due to sensor wake up." into qt-dev am:
991aff4191
am:
763eeda8c0
Change-Id: I3cc6d6cd204c13496961a483396293ce47f36216
Dianne Hackborn [Wed, 24 Apr 2019 03:07:59 +0000 (20:07 -0700)]
Merge "Finish up Intent identifier implementation." into qt-dev am:
3f5447d8ae
am:
3578b71b0f
Change-Id: I8667a0528e6c4afbe20a750683b7ea789b01a432
Amin Shaikh [Wed, 24 Apr 2019 02:54:27 +0000 (19:54 -0700)]
Merge "Add overlayable_icons_test to framework/SystemUI" into qt-dev am:
7f127b9c56
am:
b4f32637ab
Change-Id: If0474ff73a4db7a188c25ba3160624750fefaa6a
Emilian Peev [Wed, 24 Apr 2019 02:50:00 +0000 (19:50 -0700)]
Merge "Check and configure pixel format when locking canvas" into qt-dev
am:
f8d04b2d2f
Change-Id: I5a99fd6443d6c5dbd85b65a14297cc83a8bce34e
TreeHugger Robot [Wed, 24 Apr 2019 02:28:39 +0000 (02:28 +0000)]
Merge "Check and configure pixel format when locking canvas" into qt-dev
Matt Pietal [Wed, 24 Apr 2019 02:23:43 +0000 (19:23 -0700)]
Merge "Sharesheet - Scrolling UI adjustments" into qt-dev
am:
c35533726d
Change-Id: I7fe474e9c3311e1d009ca419b3ac6883707a2c49
Robert Snoeberger [Wed, 24 Apr 2019 02:17:49 +0000 (19:17 -0700)]
Merge "Transition to bold when shrinking clock" into qt-dev
am:
993e5dacd7
Change-Id: Iedd2231047baa4ff38537f560a9ac554f247699b
Svet Ganov [Tue, 23 Apr 2019 21:06:11 +0000 (14:06 -0700)]
Address API council feedback
Test: manual
bug:
130643623
Change-Id: I489f32858abfa4fe8eeda96cbb103d75e2a87551
Hyundo Moon [Wed, 24 Apr 2019 02:10:59 +0000 (19:10 -0700)]
Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev
am:
007bb68bdb
Change-Id: Iee3057e1d9db477461e2d341c46bad1ef0377cb4
Shuzhen Wang [Wed, 24 Apr 2019 01:59:19 +0000 (18:59 -0700)]
Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev
am:
b9177522ff
Change-Id: Ib1da89bbfafa3f5c1231d14aa071f6e22c268da0
TreeHugger Robot [Wed, 24 Apr 2019 01:56:52 +0000 (01:56 +0000)]
Merge "Sharesheet - Scrolling UI adjustments" into qt-dev
Yao Chen [Wed, 24 Apr 2019 01:44:44 +0000 (18:44 -0700)]
Merge "Add encryption in incidentd." into qt-dev
am:
a35c2f1224
Change-Id: Ifb13a0ea562cdf1d5ada037c38b21094aaf7ad59
Steve Elliott [Wed, 24 Apr 2019 01:38:45 +0000 (18:38 -0700)]
Merge "Initialize Global Actions Panel when one is available" into qt-dev
am:
5acc240320
Change-Id: I8afee65f1cdf7e42c3eb2dba47d099b3ed3467f2
TreeHugger Robot [Wed, 24 Apr 2019 01:34:32 +0000 (01:34 +0000)]
Merge "Transition to bold when shrinking clock" into qt-dev
Hyundo Moon [Wed, 24 Apr 2019 01:31:39 +0000 (01:31 +0000)]
Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev
Lucas Dupin [Wed, 24 Apr 2019 01:29:29 +0000 (18:29 -0700)]
Merge "Fix click and long click lock behavior" into qt-dev
am:
15ee32b208
Change-Id: I58636ae462e780e9914633507739cbd6f2cf6515
Chenbo Feng [Wed, 24 Apr 2019 01:23:54 +0000 (18:23 -0700)]
[automerger skipped] Merge "Ask netd to swap stats map before reading" into qt-dev am:
32b47dece4 -s ours
am:
4d09aa86b6 -s ours
am skip reason: change_id I8fa37c26bec23ffca0b29b679e72ba1189f557f1 with SHA1
f729cb5fd6 is in history
Change-Id: I863180a63bcbaa7f7ed76fc759e2f8f2dae1d764
TreeHugger Robot [Wed, 24 Apr 2019 01:19:09 +0000 (01:19 +0000)]
Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev
Julia Reynolds [Wed, 24 Apr 2019 01:17:27 +0000 (18:17 -0700)]
Merge "Notification guts redesign" into qt-dev am:
388f6726ea
am:
915d5cbec1
Change-Id: I9afe280b79cc63e6eed9482b0cba6308cdba48bb
Tyler Gunn [Wed, 24 Apr 2019 01:12:13 +0000 (18:12 -0700)]
Merge "Update API docs for country ISO APIs." am:
990053e552 am:
d60707b4ea
am:
49b166a171
Change-Id: Ifc88a2b883bea810edba5c604078d40c658d49c2
Matthew Ng [Wed, 24 Apr 2019 01:05:53 +0000 (18:05 -0700)]
Merge "Removed the experimental code for gestural mode" into qt-dev am:
04f13b4288
am:
110c3f3831
Change-Id: Iedee2d2063fae46e33ff1cf2fa118cba4f68af8a
Anil Admal [Wed, 24 Apr 2019 01:02:02 +0000 (18:02 -0700)]
Merge "Fix incorrect error log message in GnssVisibilityControl class" into qt-dev
am:
5bcdc825ed
Change-Id: I12fd7c9fd636aaa6b9338b6eb82d1a44e5cf39fb
TreeHugger Robot [Wed, 24 Apr 2019 01:01:25 +0000 (01:01 +0000)]
Merge "Add encryption in incidentd." into qt-dev
Mady Mellor [Wed, 24 Apr 2019 01:00:40 +0000 (18:00 -0700)]
Merge "Let NoMan know when something is no longer a bubble" into qt-dev am:
aebf984d90
am:
7acc3301e6
Change-Id: I3e74c363060533ef9a5264aada3bbcfb72c31138
Hyunyoung Song [Wed, 24 Apr 2019 00:55:23 +0000 (17:55 -0700)]
Merge "3->1 binder calls to OverlayManager for Navbar settings" into qt-dev am:
c51ef32c2b
am:
b033545b2f
Change-Id: I35397b48198994436759e9b2af3dc18c3c0967a3
TreeHugger Robot [Wed, 24 Apr 2019 00:51:06 +0000 (00:51 +0000)]
Merge "Initialize Global Actions Panel when one is available" into qt-dev
Jordan Liu [Wed, 24 Apr 2019 00:43:04 +0000 (17:43 -0700)]
Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev am:
5a3afc8ce7
am:
cd47318cfb
Change-Id: Id886c853fb532dc0a894acb4e2d8d0a31df182bc
Lucas Dupin [Wed, 24 Apr 2019 00:41:45 +0000 (00:41 +0000)]
Merge "Fix click and long click lock behavior" into qt-dev
Matthew Ng [Wed, 24 Apr 2019 00:36:55 +0000 (17:36 -0700)]
Merge "Clean up left over prototype code in Navigation Bar" into qt-dev am:
6db82f8965
am:
bbe9c4b226
Change-Id: I2cfbe2806d08f79e240eef6243bb7d7ab35ec19a
Pengquan Meng [Wed, 24 Apr 2019 00:31:44 +0000 (17:31 -0700)]
[automerger skipped] Merge "Add carrier display name related CarrierConfig" am:
570f5dcae1 am:
9bc0b85dae -s ours
am:
bb57759766 -s ours
am skip reason: change_id I79836b2912be5223a2269e660bfaadf4aa72b930 with SHA1
057b94f43b is in history
Change-Id: I74c0a2b7315e1f7d14154e50663f0284c85db877
Marissa Wall [Wed, 24 Apr 2019 00:28:05 +0000 (17:28 -0700)]
Merge "ASurfaceControl: fix surface damage" into qt-dev
am:
9a205d9b12
Change-Id: Ied67a955418972f18e17885a2dbbb665b55fad3e
Mike Digman [Wed, 24 Apr 2019 00:21:26 +0000 (17:21 -0700)]
Merge "Sharesheet - update direct share loading animation" into qt-dev
am:
b8c3309a64
Change-Id: I08681e4844dd5c1e2ed652f9f5bbb8156e3c3f0e
Brad Stenning [Mon, 15 Apr 2019 17:17:01 +0000 (10:17 -0700)]
Move HUN car notifications into SystemUI
Bug:
130664005
Test: Manual via KitchenSink
Change-Id: I4da0ce924962f82c8f4ba1168ba956833c07056a
(cherry picked from commit
93d098db9a57c47b41088f75f0eef46348f0d928)
Steven Wu [Wed, 24 Apr 2019 00:13:13 +0000 (17:13 -0700)]
Merge "Add logging for dozing on or off due to sensor wake up." into qt-dev
am:
991aff4191
Change-Id: I23e99f892bee5fa797ba0cc7c4f0a5d2fc879411
OSDN Git Service
