Commit Graph

368644 Commits

Author SHA1 Message Date
Julia Reynolds
703b235bd0 Merge "Add method to get blocked channel counts" into pi-dev am: 7065aedba0
am: 8252bb0c0f

Change-Id: I9abef2af8d6a9bd0528012a13b55a2d5a2eed760
2018-04-03 17:37:10 -07:00
Tony Mak
b9c9d2575c Merge "Remove work_profile_deleted_description in symbols.xml" into pi-dev am: f01e2024d2
am: f12f8af9e6

Change-Id: I2a0686316ae47157e43d50e5989adacb7a344c90
2018-04-03 17:21:43 -07:00
Salvador Martinez
3afcdf1e93 Merge "Update notification to allow multiline text" into pi-dev am: a2117ce057
am: 3dd49d5365

Change-Id: I9ba8ec0e8a8e8ecf676ec33146bd18994f617f96
2018-04-03 17:17:26 -07:00
Julia Reynolds
0ca727ec68 Merge "Only tag foreground notifications" into pi-dev am: 59831cbec7
am: e6fb44f933

Change-Id: Iadeacdd72b8eef62467c1ee6c879e70de61094c9
2018-04-03 17:13:07 -07:00
Lucas Dupin
b38dd69226 Merge "Longer wake lock timeout" into pi-dev am: 315c230cbb
am: cf46c7d609

Change-Id: I8d1c9a452ad162b9676245a3b1b3c367c8a125ac
2018-04-03 17:08:50 -07:00
Kenny Guy
71ddc4f7f0 Merge "Avoid null pointer when in getAmbientBrightnessStats" into pi-dev am: a43cedbf25
am: ee67c91323

Change-Id: I0a3ae2215ca92d8d985192e014bc8cfb5a01743b
2018-04-03 17:04:12 -07:00
Brad Stenning
9d387c69f2 Merge "Update displayId when a window is moved to a new display" into pi-dev am: 32e7a0c23b
am: c4b36e5c8a

Change-Id: I376dba57aa998af6cefec5179d30af2ca8e05842
2018-04-03 16:59:51 -07:00
Jean-Michel Trivi
f28e2f2d7d Merge "AudioService: prevent muting of alarm / accessibility" into pi-dev am: 04dc4a02f0
am: 7d5849119b

Change-Id: Idb57ae9a1296a2f364a902227d3dad6defde1088
2018-04-03 16:55:30 -07:00
Todd Kennedy
6cd33dcded Merge "Correct provider filtering" into pi-dev am: b8d46c2c14
am: 23d51d0943

Change-Id: Ic5edf811b0bb51cf2683548e475e20bf1f3ddf6e
2018-04-03 16:51:18 -07:00
Maggie Wang
8a5425e103 Merge "Fix test location provider bug" into pi-dev am: 4f79a18cc5
am: 542c52372c

Change-Id: Ic45d9f719ae064085a598024be85d13a4f3a00c3
2018-04-03 16:47:04 -07:00
Steve Pfetsch
a5c2dc36b8 Merge "Relax angle-related false touch classification." into pi-dev am: 7f3e5bb053
am: e6e60c99d4

Change-Id: Ibd34e03bd870dde127a8e5fd67891dc86fdae6c8
2018-04-03 16:42:20 -07:00
Julia Reynolds
8252bb0c0f Merge "Add method to get blocked channel counts" into pi-dev
am: 7065aedba0

Change-Id: Id680cde8e07ac9dc18df40ddeb21b890362510b6
2018-04-03 16:39:52 -07:00
Yi Jin
6ada414f66 Merge "Based on the discussion of ag/3818243, this is the initial list. The reason to repropose this is because of some changes like ag/3619568. We don't want to allow this happens again." into pi-dev am: 7d1357723d
am: 5731a280e0

Change-Id: I849164acb220fe4e2fce1dd2378d9d1919c1eeb9
2018-04-03 16:37:38 -07:00
Tony Mak
f12f8af9e6 Merge "Remove work_profile_deleted_description in symbols.xml" into pi-dev
am: f01e2024d2

Change-Id: If8d0b96d3e0e20c3a890457e9b91a117c5cfaaac
2018-04-03 16:36:40 -07:00
Salvador Martinez
3dd49d5365 Merge "Update notification to allow multiline text" into pi-dev
am: a2117ce057

Change-Id: Ib20d0731f001702a2918cfa880511e13ed5e3892
2018-04-03 16:33:39 -07:00
Amin Shaikh
947f5d8be4 Merge "Dejank QS edit screen." into pi-dev am: 61b93505ba
am: 6d49b45a0d

Change-Id: I46f85aa6e3e32184c9d6a16d308c033657bff093
2018-04-03 16:33:18 -07:00
Julia Reynolds
e6fb44f933 Merge "Only tag foreground notifications" into pi-dev
am: 59831cbec7

Change-Id: Ia986859e678cdb7bd58664dbb4eaeb1b9260b423
2018-04-03 16:30:35 -07:00
Tej Singh
179a148995 Merge "Atoms: remove bluetooth a2dp" into pi-dev am: 287fec6358
am: 836554fb4b

Change-Id: I5feb36c1cf04f58818f96587aa758b473902c5cb
2018-04-03 16:29:00 -07:00
Lucas Dupin
cf46c7d609 Merge "Longer wake lock timeout" into pi-dev
am: 315c230cbb

Change-Id: Iff75a7f4c2d0c0051242e640116db21855c1471a
2018-04-03 16:27:23 -07:00
Kenny Guy
ee67c91323 Merge "Avoid null pointer when in getAmbientBrightnessStats" into pi-dev
am: a43cedbf25

Change-Id: Ia06d7cb7a5585a3f0865cb3500e48a4f02b082ea
2018-04-03 16:24:26 -07:00
Evan Laird
f66385367a Merge "Add DISABLE_CLOCK flags to status bar, fix transitions" into pi-dev am: 02327e4080
am: 88d828a68f

Change-Id: I2858092206fdf1c875db46509ee098505064ce90
2018-04-03 16:21:46 -07:00
Brad Stenning
c4b36e5c8a Merge "Update displayId when a window is moved to a new display" into pi-dev
am: 32e7a0c23b

Change-Id: I659d556f9eaa4e614951c17b81f6a98b04374d44
2018-04-03 16:21:33 -07:00
Jean-Michel Trivi
7d5849119b Merge "AudioService: prevent muting of alarm / accessibility" into pi-dev
am: 04dc4a02f0

Change-Id: I3d40358182ab499bcd149dc4859b9b37c00a04ed
2018-04-03 16:18:29 -07:00
Todd Kennedy
23d51d0943 Merge "Correct provider filtering" into pi-dev
am: b8d46c2c14

Change-Id: I61530f694443e56e6115e5ca7c18063cb1bd9024
2018-04-03 16:15:30 -07:00
Lujiang Xue
34f4ca89d5 Merge "null check on qspanel before called method on it." into pi-dev am: cbea0a76c6
am: 3592336528

Change-Id: Ie7cbe75236c8b5b9e9df7b384cb5f6496cb5fb58
2018-04-03 16:12:47 -07:00
Maggie Wang
542c52372c Merge "Fix test location provider bug" into pi-dev
am: 4f79a18cc5

Change-Id: I1f9bc8a7e1c750c6f24ec4a6fee93e976b014ce2
2018-04-03 16:12:20 -07:00
Steve Pfetsch
e6e60c99d4 Merge "Relax angle-related false touch classification." into pi-dev
am: 7f3e5bb053

Change-Id: I50cfd5c0caef979479f6880b163317261c57c997
2018-04-03 16:09:21 -07:00
Yi Jin
5731a280e0 Merge "Based on the discussion of ag/3818243, this is the initial list. The reason to repropose this is because of some changes like ag/3619568. We don't want to allow this happens again." into pi-dev
am: 7d1357723d

Change-Id: I686fd6899993395e722713bc06f0bdd4ff2db8c1
2018-04-03 16:06:16 -07:00
Ricky Wai
2157670f49 Merge "Handle getNetworkWatchlistConfigHash() without config case" into pi-dev am: 16ae4cd2ef
am: ec8431f3bf

Change-Id: Id760ae48ae69155a367c6ead3e22bb6b663cd48a
2018-04-03 16:04:36 -07:00
Amin Shaikh
6d49b45a0d Merge "Dejank QS edit screen." into pi-dev
am: 61b93505ba

Change-Id: Idd9b8e95f38f9e92211b2e8796add48d3383e4b5
2018-04-03 16:03:13 -07:00
Tej Singh
836554fb4b Merge "Atoms: remove bluetooth a2dp" into pi-dev
am: 287fec6358

Change-Id: Iab0fda3de65619705a072d0e0524f7e6882f7d4a
2018-04-03 16:00:08 -07:00
Evan Laird
88d828a68f Merge "Add DISABLE_CLOCK flags to status bar, fix transitions" into pi-dev
am: 02327e4080

Change-Id: I6d0f715069cac9d85b661134113d98b9b7a55d19
2018-04-03 15:57:15 -07:00
Ruchi Kandoi
dc6bc6084d Merge changes from topic "omapi" into pi-dev am: a1fc0255b8
am: 85696c6615

Change-Id: I5a669e504cd6eb3f3903d6c848667bdf908cecd1
2018-04-03 15:55:27 -07:00
Matthew Ng
a9c406bacb Merge "Avoids vibration over deadzone in navigationbar" into pi-dev am: 47721fa59d
am: 063aa3ef20

Change-Id: I54cd7155f1fdf5e0dc2c55bc7017e42869b908d0
2018-04-03 15:41:15 -07:00
Lujiang Xue
3592336528 Merge "null check on qspanel before called method on it." into pi-dev
am: cbea0a76c6

Change-Id: Ie4a86247d2134271bb4211e87876a4a597b52288
2018-04-03 15:37:46 -07:00
Fan Zhang
72d9f8e6df Merge "Add logging constant to track settings slice changes" into pi-dev am: 7793bcd867
am: 9e2d483939

Change-Id: I03bb6418c6d6334340b2918dd4b16658650c3fc2
2018-04-03 15:31:55 -07:00
Ricky Wai
ec8431f3bf Merge "Handle getNetworkWatchlistConfigHash() without config case" into pi-dev
am: 16ae4cd2ef

Change-Id: I246ff36bb9d04a2b013ce17bff236c9ab3df3218
2018-04-03 15:29:39 -07:00
TreeHugger Robot
7065aedba0 Merge "Add method to get blocked channel counts" into pi-dev 2018-04-03 22:22:24 +00:00
Ruchi Kandoi
85696c6615 Merge changes from topic "omapi" into pi-dev
am: a1fc0255b8

Change-Id: I3a01cf7aeef6eccfff761ef6c4d27c52c2aab913
2018-04-03 15:21:33 -07:00
Matthew Ng
2b33b4f8b0 Merge "Nav icons and quick step states are determined by service enabled" into pi-dev am: 6ae58e0d16
am: 0a1500ca45

Change-Id: I4bb2b27f87beba7ba7d8453b3f6c339903f87f49
2018-04-03 15:17:48 -07:00
Matthew Ng
063aa3ef20 Merge "Avoids vibration over deadzone in navigationbar" into pi-dev
am: 47721fa59d

Change-Id: I03234c8596e7214911bf69a7d37066dd29eacb8d
2018-04-03 15:13:57 -07:00
TreeHugger Robot
f01e2024d2 Merge "Remove work_profile_deleted_description in symbols.xml" into pi-dev 2018-04-03 22:12:18 +00:00
Derek Sollenberger
4bd7e2b733 Merge "Free up all scratch resources when the app's UI is hidden" into pi-dev am: 26f99b4cb7
am: 7af6ec70b6

Change-Id: I6fab7c61d5ff3d2cf4931a0ac32dacadb5f1507f
2018-04-03 15:11:04 -07:00
Fan Zhang
9e2d483939 Merge "Add logging constant to track settings slice changes" into pi-dev
am: 7793bcd867

Change-Id: Idcd96ffa39088f51f87923bc52ba2133ed2017bd
2018-04-03 15:04:47 -07:00
Matthew Ng
0a1500ca45 Merge "Nav icons and quick step states are determined by service enabled" into pi-dev
am: 6ae58e0d16

Change-Id: Ia392cc6ff8d1e39daf65f9594e575292ba57ed91
2018-04-03 14:58:29 -07:00
TreeHugger Robot
a2117ce057 Merge "Update notification to allow multiline text" into pi-dev 2018-04-03 21:54:31 +00:00
Nathan Harold
e805c4aac8 Merge "Add AppOps Checks for MANAGE_IPSEC_TUNNELS" into pi-dev am: 80a2bba9a6
am: c1c08d10d1

Change-Id: Id720461505599eaa5f6a5e5f880ec365deb74c77
2018-04-03 14:54:07 -07:00
TreeHugger Robot
59831cbec7 Merge "Only tag foreground notifications" into pi-dev 2018-04-03 21:52:17 +00:00
Derek Sollenberger
7af6ec70b6 Merge "Free up all scratch resources when the app's UI is hidden" into pi-dev
am: 26f99b4cb7

Change-Id: I70ba8e5cda90bd468e47ceb7be8d51edab839cf5
2018-04-03 14:50:29 -07:00
Nathan Harold
c1c08d10d1 Merge "Add AppOps Checks for MANAGE_IPSEC_TUNNELS" into pi-dev
am: 80a2bba9a6

Change-Id: Icd1b2cfc699ab44e4ca536b98298d5b23db7372e
2018-04-03 14:41:56 -07:00