git.osdn.net Git - android-x86/frameworks-base.git/log

Anders Fridlund [Thu, 30 May 2019 21:37:12 +0000 (14:37 -0700)]

Merge "Look for bootanimation in apex-module" into qt-dev am: 36e3da7920 am: 0dd52a5985
am: 0b33c85dca

Change-Id: I5bbd5e763b5d4f5608c3a3adaebf25a4a3cb63b2

commit | commitdiff | tree

Makoto Onuki [Thu, 30 May 2019 21:30:00 +0000 (14:30 -0700)]

Merge "Add one more config resource for contacts provider" into qt-dev am: 70554da78d am: 6550afbe33
am: 47398bb26e

Change-Id: Id0cd10270280d4220295d97ef1723a0a8402b348

commit | commitdiff | tree

Nazanin Bakhshi [Thu, 30 May 2019 21:27:31 +0000 (21:27 +0000)]

Merge "Store subscriber ID / IMSI into telephony database"

commit | commitdiff | tree

Anders Fridlund [Thu, 30 May 2019 21:11:20 +0000 (14:11 -0700)]

Merge "Look for bootanimation in apex-module" into qt-dev am: 36e3da7920
am: 0dd52a5985

Change-Id: I4193bb1920e1f42a4b3737b10266c8bc88c91a37

commit | commitdiff | tree

Varun Anand [Thu, 30 May 2019 21:08:06 +0000 (14:08 -0700)]

[automerger skipped] Merge changes from topic "vpn_data_accn_tests" am: b50e778fa7 am: 9561790069 -s ours am: 84a4f3e962 -s ours
am: 71d6f66d12 -s ours
am skip reason: change_id Iffd3f95fc2e11d311691a797b010edb38d2ef3c6 with SHA1 1419b0b20e is in history

Change-Id: I5843bda44deaca837e2517465df3f8d9f3f2d5d2

commit | commitdiff | tree

Makoto Onuki [Thu, 30 May 2019 21:08:00 +0000 (14:08 -0700)]

Merge "Add one more config resource for contacts provider" into qt-dev am: 70554da78d
am: 6550afbe33

Change-Id: I7f8d84bba6b516d91303344c1b62f132c923ade6

commit | commitdiff | tree

Anders Fridlund [Thu, 30 May 2019 20:59:26 +0000 (13:59 -0700)]

Merge "Look for bootanimation in apex-module" into qt-dev
am: 36e3da7920

Change-Id: Ib37abe37122d14a2e3d3a4ecaae5c24a23ba9992

commit | commitdiff | tree

Makoto Onuki [Thu, 30 May 2019 20:53:53 +0000 (13:53 -0700)]

Merge "Add one more config resource for contacts provider" into qt-dev
am: 70554da78d

Change-Id: I8a9197a4b3b7b0ae85cf624ca1815c418bd94588

commit | commitdiff | tree

Matt Casey [Thu, 30 May 2019 20:49:04 +0000 (13:49 -0700)]

Merge "Hide assist handles during generic assist gesture invocation." into qt-dev am: c71c7fe881 am: bf5a232744
am: e4b1df26c3

Change-Id: I118319c260893decd01e695a60e725c8e2d9d0ef

commit | commitdiff | tree

Varun Anand [Thu, 30 May 2019 20:47:41 +0000 (13:47 -0700)]

[automerger skipped] Merge changes from topic "vpn_data_accn_tests" am: b50e778fa7 am: 9561790069 -s ours
am: 84a4f3e962 -s ours
am skip reason: change_id Iffd3f95fc2e11d311691a797b010edb38d2ef3c6 with SHA1 1419b0b20e is in history

Change-Id: I982ce55558624e26531695abf09e3108b2463780

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 20:47:18 +0000 (13:47 -0700)]

[automerger skipped] Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am: 5a0b7e59c4 am: 5dba9060ad
am: e296c626c6 -s ours
am skip reason: subject contains skip directive

Change-Id: I851a511692a5bc25104667fced14fba6dcacd304

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 20:44:17 +0000 (13:44 -0700)]

[automerger skipped] DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am: a6c1e6ab65 am: 77d976491c
am: 465084f080 -s ours
am skip reason: subject contains skip directive

Change-Id: Icba21cf39968e26eeb7f46b5647340374ec309ec

commit | commitdiff | tree

Julia Reynolds [Thu, 30 May 2019 20:42:11 +0000 (13:42 -0700)]

Merge "Fix a11y readout of notification guts buttons" into qt-dev am: 58cfefe9cc am: 8c3767aba8
am: a7bdb6af9c

Change-Id: Ie93839071c924f93abce5b17b172b5deba5ce034

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 30 May 2019 20:39:50 +0000 (13:39 -0700)]

Merge "AudioService: remove dead BT code" into qt-dev am: 3de2438d5c am: e0cc30bcb8
am: 121bf66448

Change-Id: I0b60f42d8dd2c14964f5d84a70bdc1d4994412bf

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 May 2019 20:37:19 +0000 (20:37 +0000)]

Merge "Look for bootanimation in apex-module" into qt-dev

commit | commitdiff | tree

Robert Carr [Thu, 30 May 2019 20:37:14 +0000 (13:37 -0700)]

[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am: fbc22c2b6d -s ours am: cd43a5f7ad am: d6d018e3dc
am: f74c066cd8 -s ours
am skip reason: subject contains skip directive

Change-Id: If4a491546bca8da7a8efc161b15e77f123bd1a41

commit | commitdiff | tree

Makoto Onuki [Thu, 30 May 2019 20:33:06 +0000 (20:33 +0000)]

Merge "Add one more config resource for contacts provider" into qt-dev

commit | commitdiff | tree

Matt Casey [Thu, 30 May 2019 20:31:48 +0000 (13:31 -0700)]

Merge "Hide assist handles during generic assist gesture invocation." into qt-dev am: c71c7fe881 am: f3534200b5
am: 840d2a971a

Change-Id: I6b092f32e0f8148394a65ea4591786f39bb169f5

commit | commitdiff | tree

Varun Anand [Thu, 30 May 2019 20:26:09 +0000 (13:26 -0700)]

[automerger skipped] Merge changes from topic "vpn_data_accn_tests" am: b50e778fa7
am: 9561790069 -s ours
am skip reason: change_id Iffd3f95fc2e11d311691a797b010edb38d2ef3c6 with SHA1 1419b0b20e is in history

Change-Id: I86c99de74590e3ad54055a16b5c349b6ba3659ab

commit | commitdiff | tree

Matt Casey [Thu, 30 May 2019 20:22:19 +0000 (13:22 -0700)]

Merge "Hide assist handles during generic assist gesture invocation." into qt-dev am: c71c7fe881
am: bf5a232744

Change-Id: I3f50dae4c226630fbf45554cf623a7f8515a4688

commit | commitdiff | tree

Leon Scroggins [Thu, 30 May 2019 20:21:31 +0000 (13:21 -0700)]

Merge "Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am: 9be1d08acb am: 8104d693d6" into qt-r1-dev-plus-aosp
am: 946dce179c

Change-Id: I56c8f6fe004385d2439f522feca4e440dd147a78

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 20:20:35 +0000 (13:20 -0700)]

Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am: 5a0b7e59c4
am: 5dba9060ad

Change-Id: I7bac30948a62ef27b9c4c5252ff1748fe4b5022e

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 20:20:18 +0000 (13:20 -0700)]

[automerger skipped] Merge "Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am: 5a0b7e59c4 am: 77667ce117" into qt-r1-dev-plus-aosp
am: f8c23c77e0 -s ours
am skip reason: subject contains skip directive

Change-Id: I9cd0936cd0beb38580e6fe38fecabec3d7adc45e

commit | commitdiff | tree

Josh Tsuji [Thu, 30 May 2019 20:19:38 +0000 (13:19 -0700)]

Merge "Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev am: 06cbf65704 am: 65cba0fa32" into qt-r1-dev-plus-aosp
am: 9d813b8690

Change-Id: I5be08d581beec95e668b5852d3e2d95d8e357aad

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 20:19:11 +0000 (13:19 -0700)]

DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am: a6c1e6ab65
am: 77d976491c

Change-Id: I6e952c6192401fe860c835f84118b8c8999474c4

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 20:19:03 +0000 (13:19 -0700)]

[automerger skipped] Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am: a6c1e6ab65 am: 793cf2ee37" into qt-r1-dev-plus-aosp
am: 34ca6dd80b -s ours
am skip reason: subject contains skip directive

Change-Id: I565bea01b097b6237f1ef0f9513e4e60887ba8ba

commit | commitdiff | tree

Hongyi Zhang [Thu, 30 May 2019 20:18:25 +0000 (13:18 -0700)]

Merge "Merge "Add Usage info for LocationManager's APIs" into qt-dev am: 11ddc8ea0b am: 4e5d2a48c1" into qt-r1-dev-plus-aosp
am: 17ed19b08c

Change-Id: I1ddef4773fb46146873df315ae8e22225045bd5c

commit | commitdiff | tree

Winson Chung [Thu, 30 May 2019 20:17:33 +0000 (13:17 -0700)]

Merge "Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev am: 6f24b88c71 am: 07917b9ee5" into qt-r1-dev-plus-aosp
am: 6f7402b95a

Change-Id: I397dba95b97ba2c6b26a230b93c0bc3c840d13ed

commit | commitdiff | tree

Julia Reynolds [Thu, 30 May 2019 20:16:55 +0000 (13:16 -0700)]

Merge "Fix a11y readout of notification guts buttons" into qt-dev am: 58cfefe9cc
am: 8c3767aba8

Change-Id: I8c672ddbfcbf1aeaaf5f5694c7d951bead8c5ac3

commit | commitdiff | tree

Julia Reynolds [Thu, 30 May 2019 20:16:40 +0000 (13:16 -0700)]

Merge "Fix a11y readout of notification guts buttons" into qt-dev am: 58cfefe9cc am: 9cdc4fa314
am: a24860afb8

Change-Id: Ibaa61a880a13a7381e70bfc455d706532c5f638b

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 30 May 2019 20:15:56 +0000 (13:15 -0700)]

Merge "AudioService: remove dead BT code" into qt-dev am: 3de2438d5c am: 3222703156
am: 96d2c7898e

Change-Id: I9faf497e730c27eb756d3a374ad4825d8adbecd8

commit | commitdiff | tree

Robert Carr [Thu, 30 May 2019 20:15:06 +0000 (13:15 -0700)]

[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am: fbc22c2b6d -s ours am: cd43a5f7ad am: 6e373387c8
am: 7ed862dece -s ours
am skip reason: subject contains skip directive

Change-Id: I8d90564ed140e2ef705bf552dc6cf3e358fa5ff7

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 30 May 2019 20:14:40 +0000 (13:14 -0700)]

Merge "AudioService: remove dead BT code" into qt-dev am: 3de2438d5c
am: e0cc30bcb8

Change-Id: I3ef3864e052201a3249acddf20f9804710b0619c

commit | commitdiff | tree

Robert Carr [Thu, 30 May 2019 20:11:47 +0000 (13:11 -0700)]

[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am: fbc22c2b6d -s ours am: cd43a5f7ad
am: d6d018e3dc

Change-Id: Ic5614e7c1fbe6abbccb98b0d75de1adddce9ed39

commit | commitdiff | tree

Varun Anand [Thu, 30 May 2019 20:11:03 +0000 (13:11 -0700)]

Merge changes from topic "vpn_data_accn_tests"
am: b50e778fa7

Change-Id: I52f55fe3ddcd06de6219078dd300f0995972100c

commit | commitdiff | tree

Leon Scroggins [Thu, 30 May 2019 20:10:47 +0000 (13:10 -0700)]

Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am: 9be1d08acb am: 0a9b7b4fca
am: ba238a82fe

Change-Id: I66db31bb58400202a63826e805321c14e120d839

commit | commitdiff | tree

Josh Tsuji [Thu, 30 May 2019 20:09:47 +0000 (13:09 -0700)]

Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev am: 06cbf65704 am: 4aed7e0cb1
am: 3c728a0d82

Change-Id: Id291b6a5882a50c9909e4b6105f2f24ebc06203f

commit | commitdiff | tree

Hongyi Zhang [Thu, 30 May 2019 20:09:03 +0000 (13:09 -0700)]

Merge "Add Usage info for LocationManager's APIs" into qt-dev am: 11ddc8ea0b am: 98eed7dcca
am: cc536a375b

Change-Id: I13b21b057085010338b29d6b0732908b479195e5

commit | commitdiff | tree

Matt Casey [Thu, 30 May 2019 20:08:39 +0000 (13:08 -0700)]

Merge "Hide assist handles during generic assist gesture invocation." into qt-dev
am: c71c7fe881

Change-Id: Ie4c997b705ca56e10640f63d12d2ff8be0adaf09

commit | commitdiff | tree

Matt Casey [Thu, 30 May 2019 20:08:24 +0000 (13:08 -0700)]

Merge "Hide assist handles during generic assist gesture invocation." into qt-dev am: c71c7fe881
am: f3534200b5

Change-Id: I34c8b24cc1a97ccc3e61e7911ad2bf3708a132fe

commit | commitdiff | tree

Winson Chung [Thu, 30 May 2019 20:08:12 +0000 (13:08 -0700)]

Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev am: 6f24b88c71 am: 34d893c490
am: f40fe3717f

Change-Id: If4283e50563fc9319d7e256823a8ada9c21c8b1b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 19:59:55 +0000 (19:59 +0000)]

Merge "Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am: 9be1d08acb am: 8104d693d6" into qt-r1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 19:59:06 +0000 (19:59 +0000)]

Merge "Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am: 5a0b7e59c4 am: 77667ce117" into qt-r1-dev-plus-aosp

commit | commitdiff | tree

Leon Scroggins [Thu, 30 May 2019 19:58:32 +0000 (12:58 -0700)]

Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am: 9be1d08acb
am: 8104d693d6

Change-Id: I889783e5b690b5aad6865bbfc0ccdbc185dd7a05

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 19:58:15 +0000 (12:58 -0700)]

Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am: 5a0b7e59c4
am: 77667ce117

Change-Id: I694dadc2851cbb5edc4c5806ad01404690b7d46e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 19:58:04 +0000 (19:58 +0000)]

Merge "Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev am: 06cbf65704 am: 65cba0fa32" into qt-r1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 19:57:25 +0000 (19:57 +0000)]

Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am: a6c1e6ab65 am: 793cf2ee37" into qt-r1-dev-plus-aosp

commit | commitdiff | tree

Josh Tsuji [Thu, 30 May 2019 19:57:22 +0000 (12:57 -0700)]

Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev am: 06cbf65704
am: 65cba0fa32

Change-Id: I86cbac526fdb1e71cb70d4545a5c60d11d3e14b5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 19:57:16 +0000 (19:57 +0000)]

Merge "Merge "Add Usage info for LocationManager's APIs" into qt-dev am: 11ddc8ea0b am: 4e5d2a48c1" into qt-r1-dev-plus-aosp

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 19:56:35 +0000 (12:56 -0700)]

DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am: a6c1e6ab65
am: 793cf2ee37

Change-Id: I1b899b0172b2b92425a9d5058cbc2ad04965d265

commit | commitdiff | tree

Matt Casey [Thu, 30 May 2019 19:56:28 +0000 (12:56 -0700)]

Merge "Hide assist handles during generic assist gesture invocation." into qt-dev
am: c71c7fe881

Change-Id: I81d7b76ba91b00dd547378b640fa9545dadf6458

commit | commitdiff | tree

Hongyi Zhang [Thu, 30 May 2019 19:56:25 +0000 (12:56 -0700)]

Merge "Add Usage info for LocationManager's APIs" into qt-dev am: 11ddc8ea0b
am: 4e5d2a48c1

Change-Id: I97b4ab6c3d2362e17a02b0325604d473aee9f5dc

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 19:56:18 +0000 (19:56 +0000)]

Merge "Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev am: 6f24b88c71 am: 07917b9ee5" into qt-r1-dev-plus-aosp

commit | commitdiff | tree

Winson Chung [Thu, 30 May 2019 19:55:27 +0000 (12:55 -0700)]

Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev am: 6f24b88c71
am: 07917b9ee5

Change-Id: I08ff3643602a10b992505a4c4171a260e6f8d111

commit | commitdiff | tree

Julia Reynolds [Thu, 30 May 2019 19:54:54 +0000 (12:54 -0700)]

Merge "Fix a11y readout of notification guts buttons" into qt-dev am: 58cfefe9cc
am: 9cdc4fa314

Change-Id: I659b88e2cab36ba0d4eedcf87428d31464257b43

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 30 May 2019 19:53:09 +0000 (12:53 -0700)]

Merge "AudioService: remove dead BT code" into qt-dev am: 3de2438d5c
am: 3222703156

Change-Id: I9b32646623d6ba433151578bfdfac216f478a36e

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 19:51:41 +0000 (12:51 -0700)]

Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev
am: 5a0b7e59c4

Change-Id: I80385fdfad729c1fe657fe892a6e56e96c3f37a9

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 19:51:39 +0000 (12:51 -0700)]

DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"
am: a6c1e6ab65

Change-Id: I005f798dd086e212c56c8060c204f4a59357176b

commit | commitdiff | tree

Robert Carr [Thu, 30 May 2019 19:51:25 +0000 (12:51 -0700)]

[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am: fbc22c2b6d -s ours am: cd43a5f7ad
am: 6e373387c8

Change-Id: Ic68bc60962afcd4c438e05e5a7ec5b19bbda0759

commit | commitdiff | tree

Julia Reynolds [Thu, 30 May 2019 19:50:03 +0000 (12:50 -0700)]

Merge "Fix a11y readout of notification guts buttons" into qt-dev
am: 58cfefe9cc

Change-Id: If7e069985f430a1776acdd20b2152d2202fbfdf5

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 30 May 2019 19:48:25 +0000 (12:48 -0700)]

Merge "AudioService: remove dead BT code" into qt-dev
am: 3de2438d5c

Change-Id: Id3c951bff43330450e53439d68634d96a3a64802

commit | commitdiff | tree

Leon Scroggins [Thu, 30 May 2019 19:47:11 +0000 (12:47 -0700)]

Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am: 9be1d08acb
am: 0a9b7b4fca

Change-Id: Iecdfdb60de7fe259c28bdbd845234421440b3cc0

commit | commitdiff | tree

Robert Carr [Thu, 30 May 2019 19:46:56 +0000 (12:46 -0700)]

[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am: fbc22c2b6d -s ours
am: cd43a5f7ad

Change-Id: Id6a0704fb372b9ad34dfc4302f7b9a3621ab1e33

commit | commitdiff | tree

Josh Tsuji [Thu, 30 May 2019 19:45:58 +0000 (12:45 -0700)]

Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev am: 06cbf65704
am: 4aed7e0cb1

Change-Id: I6c570f2d2957593cba55acbafff1ff5dd0ff01d1

commit | commitdiff | tree

Hongyi Zhang [Thu, 30 May 2019 19:45:18 +0000 (12:45 -0700)]

Merge "Add Usage info for LocationManager's APIs" into qt-dev am: 11ddc8ea0b
am: 98eed7dcca

Change-Id: I3052da34a504150860f9b799266ff9af595cac7b

commit | commitdiff | tree

Winson Chung [Thu, 30 May 2019 19:44:23 +0000 (12:44 -0700)]

Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev am: 6f24b88c71
am: 34d893c490

Change-Id: Id769d64f61f26e55d911e144d43591cb89604a11

commit | commitdiff | tree

Leon Scroggins [Thu, 30 May 2019 19:41:09 +0000 (12:41 -0700)]

Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev
am: 9be1d08acb

Change-Id: I4e15a3432307fe2c17bcd345d53942d7f14a33a4

commit | commitdiff | tree

Josh Tsuji [Thu, 30 May 2019 19:39:53 +0000 (12:39 -0700)]

Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev
am: 06cbf65704

Change-Id: I666d3b5b62514410a651d914271b664370c67f84

commit | commitdiff | tree

Hongyi Zhang [Thu, 30 May 2019 19:39:03 +0000 (12:39 -0700)]

Merge "Add Usage info for LocationManager's APIs" into qt-dev
am: 11ddc8ea0b

Change-Id: I048d9b1fec5120a268a56693cdface47c1cc08c9

commit | commitdiff | tree

Matt Casey [Thu, 30 May 2019 19:38:38 +0000 (19:38 +0000)]

Merge "Hide assist handles during generic assist gesture invocation." into qt-dev

commit | commitdiff | tree

Winson Chung [Thu, 30 May 2019 19:38:18 +0000 (12:38 -0700)]

Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev
am: 6f24b88c71

Change-Id: I89e0c654d7d4ecf3f6d7a19c4fc811d408c44894

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 19:37:04 +0000 (12:37 -0700)]

Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev
am: 5a0b7e59c4

Change-Id: I0406800cb9b5848b5c85d223564952b5c13e38f0

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 19:37:02 +0000 (12:37 -0700)]

DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"
am: a6c1e6ab65

Change-Id: I92b9859990cdc6103eaa8d280b94befe07a6af38

commit | commitdiff | tree

Varun Anand [Thu, 30 May 2019 19:34:28 +0000 (19:34 +0000)]

Merge changes from topic "vpn_data_accn_tests"

* changes:
Add one more test for VPN usage stats.
Addressing comments for http://ag/7700679.

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 May 2019 19:20:20 +0000 (19:20 +0000)]

Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev

commit | commitdiff | tree

Priyank Singh [Thu, 30 May 2019 01:09:35 +0000 (01:09 +0000)]

DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"

This reverts commit 5bd5767768a9dc0a0d2972239fbfd2f68258cfd9.

Reason for revert: We want to delete all the code related to privacy chip/indicator from Q as of now. b/132292477

Bug: 133898491
Change-Id: Ieddae7509d918ab63a5b3111e0efc623fae644b3

commit | commitdiff | tree

Julia Reynolds [Thu, 30 May 2019 19:02:39 +0000 (12:02 -0700)]

Merge "Fix a11y readout of notification guts buttons" into qt-dev
am: 58cfefe9cc

Change-Id: I33edb17dfdd3c875edd34be56470dd079ee33c6f

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 30 May 2019 18:59:24 +0000 (11:59 -0700)]

Merge "AudioService: remove dead BT code" into qt-dev
am: 3de2438d5c

Change-Id: I99388c3ec13278731b2e403aa308c2eb8131da21

commit | commitdiff | tree

Robert Carr [Thu, 30 May 2019 18:57:51 +0000 (11:57 -0700)]

[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am: fbc22c2b6d -s ours
am: cd43a5f7ad

Change-Id: Ifb40223f91ab0eb58d97c2e52d60fb3e6d52fd4c

commit | commitdiff | tree

Leon Scroggins [Thu, 30 May 2019 18:55:02 +0000 (11:55 -0700)]

Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev
am: 9be1d08acb

Change-Id: I01582c19eee9b0aedde169b632384ed60c680f09

commit | commitdiff | tree

Josh Tsuji [Thu, 30 May 2019 18:53:30 +0000 (11:53 -0700)]

Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev
am: 06cbf65704

Change-Id: I5bbfb0ec91ab5ae8760a8208b9d3a967103df999

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 May 2019 18:53:13 +0000 (18:53 +0000)]

Merge "Fix a11y readout of notification guts buttons" into qt-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 May 2019 18:36:34 +0000 (18:36 +0000)]

Merge "AudioService: remove dead BT code" into qt-dev

commit | commitdiff | tree

Robert Carr [Thu, 30 May 2019 18:35:37 +0000 (11:35 -0700)]

[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI
am: fbc22c2b6d -s ours
am skip reason: subject contains skip directive

Change-Id: Iedd5183586ec5b13c71ae943c3ff877e5c98311e

commit | commitdiff | tree

TreeHugger Robot [Thu, 30 May 2019 18:35:24 +0000 (18:35 +0000)]

Merge "Correctly handle AndroidFuture#cancel"

commit | commitdiff | tree

Leon Scroggins [Thu, 30 May 2019 18:31:40 +0000 (18:31 +0000)]

Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev

commit | commitdiff | tree

lumark [Thu, 30 May 2019 18:26:08 +0000 (11:26 -0700)]

Merge "Skip IME initialization when received the token that already registered" into qt-dev am: 9bb2607703 am: 9992e08829
am: 3f4524992f

Change-Id: I8bbe1a72eb831479b2c33d0a1a9814c231b778a5

commit | commitdiff | tree

Winson Chung [Thu, 30 May 2019 18:24:02 +0000 (11:24 -0700)]

Merge "Merge "Exclude the status bar and HUN from gestures" into qt-dev am: c1da971644 am: 4236f9867e" into qt-r1-dev-plus-aosp
am: ae162d80fb

Change-Id: Iedab23264731aaccfc2d09820a5294856496c6e7

commit | commitdiff | tree

Josh Tsuji [Thu, 30 May 2019 18:23:26 +0000 (18:23 +0000)]

Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev

* changes:
  Fix issues with animations when the stack is expanded.
  Prevent a crash when touching the stack while it's flinging out of the dismiss area.
  Remove the max rendered children code.
  Stability and logic fixes to PhysicsAnimationLayout to address bugs that leave Bubbles in a bad state.

commit | commitdiff | tree

lumark [Thu, 30 May 2019 18:22:08 +0000 (11:22 -0700)]

Merge "Skip IME initialization when received the token that already registered" into qt-dev am: 9bb2607703 am: 5846614ff1
am: e1af2ac64d

Change-Id: I1cd7c9d1a11029a8c25987badf7581fe3e02bfbc

commit | commitdiff | tree

Hongyi Zhang [Thu, 30 May 2019 18:21:05 +0000 (11:21 -0700)]

Merge "Add Usage info for LocationManager's APIs" into qt-dev
am: 11ddc8ea0b

Change-Id: Iab67a0f992436b3a4e9c04d05f19d7ca3d69553a

commit | commitdiff | tree

Winson Chung [Thu, 30 May 2019 18:19:10 +0000 (11:19 -0700)]

Merge "Merge "Exclude the status bar and HUN from gestures" into qt-dev am: c1da971644 am: 9ffb2d08f1" into qt-r1-dev-plus-aosp
am: 138d103a3b

Change-Id: Ic03bdd181a153188c4930dfcd17553d3d2197c20

commit | commitdiff | tree

Winson Chung [Thu, 30 May 2019 18:16:10 +0000 (11:16 -0700)]

Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev
am: 6f24b88c71

Change-Id: I435bfe2210375deb4cbe07ec39149f9c0e7f0076

commit | commitdiff | tree

Robert Snoeberger [Thu, 30 May 2019 18:12:01 +0000 (11:12 -0700)]

Merge "Catch IllegalArgumentException caused by recycled bitmap" into qt-r1-dev am: 1383ff3a22
am: 0dbf555afa

Change-Id: I78f4fd9eb925e49b24c7f59416ee3d9cdc7971b7

commit | commitdiff | tree

Patrick Baumann [Thu, 30 May 2019 17:58:57 +0000 (10:58 -0700)]

Merge "Handles pre-process failure without crashing system" into qt-dev am: b8735359aa am: f803a67b17
am: 17fb13c2fa

Change-Id: I84e43f7787779d4485d68de0a666517f3605ca9e

commit | commitdiff | tree

Patrick Baumann [Thu, 30 May 2019 17:57:19 +0000 (10:57 -0700)]

Merge "Handles pre-process failure without crashing system" into qt-dev am: b8735359aa am: 34ff7e76bb
am: 44fb6a7386

Change-Id: I86e20cebca946e227f922149e6f5bb7529de5e65

commit | commitdiff | tree

lumark [Thu, 30 May 2019 17:56:27 +0000 (10:56 -0700)]

Merge "Skip IME initialization when received the token that already registered" into qt-dev am: 9bb2607703
am: 9992e08829

Change-Id: I25ffe7f5bb75e7da5c9674add12366c8ddf30149

commit | commitdiff | tree

Neil Fuller [Thu, 30 May 2019 17:55:41 +0000 (10:55 -0700)]

[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" am: a326166eba am: 364ed0b152 -s ours am: 9c50fd8c05 -s ours
am: ba8076833c -s ours
am skip reason: change_id I2cb09da5ec5296799e03bab812b7fb29452a623e with SHA1 c3dfd08914 is in history

Change-Id: I068f0d55d04ddb7f506c209a7593d6a3b85f6f56

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 17:55:22 +0000 (17:55 +0000)]

Merge "Merge "Exclude the status bar and HUN from gestures" into qt-dev am: c1da971644 am: 4236f9867e" into qt-r1-dev-plus-aosp

commit | commitdiff | tree

Winson Chung [Thu, 30 May 2019 17:54:45 +0000 (10:54 -0700)]

Merge "Exclude the status bar and HUN from gestures" into qt-dev am: c1da971644
am: 4236f9867e

Change-Id: I2e06d5d9a9d5c3cebf6b70b2a48aea0d0b947fd3