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

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 22:39:30 +0000 (22:39 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 21:50:54 +0000 (21:50 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 21:36:36 +0000 (21:36 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:42:20 +0000 (10:42 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9273d1c9e96d398653e3846dcdfdf2df5a070a57
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:40:40 +0000 (10:40 -0700)]

Import translations. DO NOT MERGE

Change-Id: If6893b7757cc431a56096d7c708f600d3f2f8575
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:37:56 +0000 (10:37 -0700)]

Import translations. DO NOT MERGE

Change-Id: I8a3ec819ac8f50463c32225f68031c92d9fc8eec
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:36:27 +0000 (10:36 -0700)]

Import translations. DO NOT MERGE

Change-Id: I788dbd4e193bfb2bae69e37fd18becd482a42917
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:53:13 +0000 (00:53 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-mr1-dev
am: 4a1dc3458d

Change-Id: Ibc50787c078b4d68de37f12d57d4b14990b5c768

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:46:42 +0000 (00:46 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-mr1-dev

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:24:23 +0000 (00:24 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548 am: afdcad0df3
am: edbe4bd86a

Change-Id: I860d4a27acab50bfebf81e83b3db64f7c396fade

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:15:34 +0000 (00:15 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548
am: afdcad0df3

Change-Id: Ie777e6351ed8518a4fc785a20772a8e2cb0ef0fe

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:04:51 +0000 (00:04 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours
am: 9e39e1e548

Change-Id: I04ba3782f29c89032d498c5e2ef292605a66ac9f

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:58:28 +0000 (23:58 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4
am: 996bc6bc12 -s ours

Change-Id: Iccbeb4cec6e40c00e7f875b5e3faa94772f1b819

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:41:26 +0000 (23:41 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714
am: 9625d164e4

Change-Id: I0aa09448467dae806c9c5670ba8ed77e95a59da1

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:35:25 +0000 (23:35 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56
am: 0ddd7e4714

Change-Id: If39e3e66871aed33dfa0a9949cfd70a7ec45231f

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:28:55 +0000 (23:28 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev
am: 093c7a8e56

Change-Id: I7f734c7878cf065d15335602f9b0a6e02a786d53

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:21:16 +0000 (23:21 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]

Back-port fixes for b/62196835

Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.

Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:03:40 +0000 (22:03 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours
am: 2a93c3d390

Change-Id: I11d0935ed851e3c6076fb972a721d42e4903c6de

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:55:27 +0000 (21:55 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8
am: 4fa8b51c0c -s ours

Change-Id: I72897fd488d26ed7c3e1462c1755e10d2b7dfbe8

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:44:32 +0000 (21:44 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev
am: 0b0834fbe8

Change-Id: Ie3ade206625af7f69d497935397cd3094a1555fb

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:40:14 +0000 (21:40 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c
am: b2e3fb162f

Change-Id: Ia38cf0592fed9cbf5e83a0163083bcd31d065e7e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:27:06 +0000 (21:27 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f
am: 27ad1fbc2c

Change-Id: I5830c0f6d5377717e175c1c90360e0487ef37b42

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:24:29 +0000 (21:24 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69
am: 783253f6db

Change-Id: Iad10dcb9d92660a20c5db0450da6edd3cc2df329

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:23:16 +0000 (21:23 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:18:16 +0000 (21:18 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours
am: bbb567757f

Change-Id: I7b4397bda68b12219b7494948b8d021fa95f072b

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:14:49 +0000 (21:14 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae
am: aa8976fa69

Change-Id: Iff6ad10a9704d09d00c693c074abbb3cd4e49c9e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:13:40 +0000 (21:13 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e
am: a1dca32957

Change-Id: I5fdeb9f94184dcba41d7e00c129c986d8d1febb9

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:09:40 +0000 (21:09 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours
am: f44b48acae

Change-Id: I855599f5d38735e7356c01e753e67c1dc31f1dad

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:07:43 +0000 (21:07 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94
am: 7e82d6204f -s ours

Change-Id: Ieb56ecb0867261e487f92fd5cdf845c99d577d78

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:07:11 +0000 (21:07 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c
am: b968d99e3e

Change-Id: I0ea936af7cd1c217d509fa56367a4260e5dab81a

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:00:36 +0000 (21:00 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d
am: cf7ce06abd -s ours

Change-Id: Ibef3aded20e00e9beef1ec189f1a471d978354e2

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:59:54 +0000 (20:59 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4
am: 5264237c94

Change-Id: I6ca7d132a0df35af8763c3cb7baee375bfb6b178

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:59:49 +0000 (20:59 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89
am: 83261a8b5c

Change-Id: I5fd8c6c844aa52d301fbbbc5dbcf4d5996e0fcf8

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:55:18 +0000 (20:55 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed
am: 62eca82f89

Change-Id: I9a274bfc59f545076adeb2a82cde269457eecc67

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:55:02 +0000 (20:55 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb
am: f05a6fc52d

Change-Id: I3070db9b698328aa5778fa14825eba526a6a1b33

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:53:07 +0000 (20:53 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c
am: 68f7106cf4

Change-Id: I19110cf28c6fda3fe3f8857bd8590a6a24ade91e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:51:15 +0000 (20:51 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e
am: e11e076fed

Change-Id: Ide9b723cf1a31f8fd8b8f5ae848c3cd73c6a12b5

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:46:29 +0000 (20:46 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240
am: 219d9b5dfb

Change-Id: I1973a5936ceda80873ee03886b64905d46dc6623

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:44:05 +0000 (20:44 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours
am: 5d46833d9c

Change-Id: I6b332afcc0e73fb8eddc27585c08da900c4f9ba4

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:44:03 +0000 (20:44 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5
am: e06843fe7e

Change-Id: I0faad26b07ab16c7b853b2bbe3eb1304ba70d6f2

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:38:43 +0000 (20:38 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours
am: 76007bb240

Change-Id: I143ebc6b57fe5c458e373dad1ac566f5d419aef2

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:35:51 +0000 (20:35 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours
am: 68efc2e5b5

Change-Id: I4bb03e87b259faa45a8a2511d05c340f20fe2a6e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:30:39 +0000 (20:30 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e
am: 37cf6265db -s ours

Change-Id: I28f848331e5379736dd777995fe844aa5c5df689

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:28:22 +0000 (20:28 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1
am: ccbac7e9e0 -s ours

Change-Id: I28a499e21a6a6d6a4df26317712c09f658383d37

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:25:44 +0000 (20:25 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6
am: 3c4d24923c -s ours

Change-Id: Ie8d7f1d4840bcea7538f99b2eb1bfb2bc472549f

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 18:41:22 +0000 (18:41 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours
am: 954deb1c6e

Change-Id: I929c9dfa84b25fdbeadfedf0e0e9ecd914a74483

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 18:36:23 +0000 (18:36 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev
am: a620b21828 -s ours

Change-Id: Iaa4e8eb83ebf2036999a31e3487c6157bcefecbf

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 18:36:21 +0000 (18:36 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours
am: ff115bffb1

Change-Id: Ieca157f60b7c57f60900b55b10fcf8e585852e70

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 18:26:58 +0000 (18:26 +0000)]

Back-port fixes for b/62196835
am: fd0ca151a6

Change-Id: I442d26b476e3e83602b5f2eb61a01386e4d6d247

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 18:26:57 +0000 (18:26 +0000)]

DO NOT MERGE Back-port fixes for b/62196835
am: 24fdc53cfe -s ours

Change-Id: I01a6f574df5cc1b133b7f761062a6259aac07476

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 18:19:45 +0000 (18:19 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]

DO NOT MERGE Back-port fixes for b/62196835

Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.

Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 23:03:33 +0000 (23:03 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461 am: 998ef870c5 am: bb89a1e3fe
am: f645a57a5e

Change-Id: Ibff94cad13a97c9b4a696f5e6df0522e8ac89d50

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 22:57:43 +0000 (22:57 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461 am: 998ef870c5
am: bb89a1e3fe

Change-Id: I9e53b0461cb3f28ddc023ba551c1cb4eb1007340

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 22:51:18 +0000 (22:51 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461
am: 998ef870c5

Change-Id: Icaf066033ce67780052b30be3de891907129404e

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 22:41:32 +0000 (22:41 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d
am: cba64fb461

Change-Id: I9c4fc2279ffa79ee85dc8a46be21095918fa52ad

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 22:35:35 +0000 (22:35 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35
am: a6e0a6e31d

Change-Id: Ia5af67f07974b520d8c3e7424c07402793a486f2

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 22:30:08 +0000 (22:30 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987
am: 4d608d2f35

Change-Id: Id1626217e80920f162b735336ac708c4dd9467f9

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 22:24:06 +0000 (22:24 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323
am: 111a2c7987

Change-Id: Idb7d3c789c6241aa8d77eb6077930b47c7ba69e4

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 22:18:59 +0000 (22:18 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e
am: ba46064323

Change-Id: I7119e3f003562f6d826d40ad3577b9db0e44c2c6

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 22:14:01 +0000 (22:14 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522
am: 1add6be25e

Change-Id: I83a6c654862443a69bfeeaf675a8c038b3f7fb53

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 22:06:27 +0000 (22:06 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84
am: ba928bd522

Change-Id: I74a7b0488371606dd9bdccab854d23c0e09b1ac9

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 22:00:31 +0000 (22:00 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours
am: f433884a84

Change-Id: I737838098a36efafe1509c4814ac1120a3bb8297

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 21:55:31 +0000 (21:55 +0000)]

Back-port fixes for b/62196835 am: 5bdffc5d57
am: 5a7eb970e2 -s ours

Change-Id: Ifd4b5ff2487c8b8035ffaf6ed7e55539f26a463e

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 21:43:46 +0000 (21:43 +0000)]

Back-port fixes for b/62196835
am: 5bdffc5d57

Change-Id: Ia5dafc7a8724d296e710f32d936bb493b51951de

commit | commitdiff | tree

Phil Weaver [Tue, 11 Jul 2017 00:27:20 +0000 (17:27 -0700)]

commit | commitdiff | tree

Julius D'souza [Tue, 27 Jun 2017 13:48:51 +0000 (06:48 -0700)]

DO NOT MERGE: Add dynamic doze check for the active doze light sensor.

Bug: 62038345
Change-Id: I4b86a1b9ab56f560e863663b9f89195ae1187ab4

commit | commitdiff | tree

Julius D'souza [Tue, 27 Jun 2017 11:06:40 +0000 (11:06 +0000)]

Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev

commit | commitdiff | tree

Julius D'souza [Thu, 22 Jun 2017 23:15:06 +0000 (23:15 +0000)]

DO NOT MERGE: Remove continuous sampling logic. This was added for
dogfooding purposes in order to determine power usage. However,
this feature has since been moved to the G release.

Bug: 62210406

Change-Id: I3c6049688912a4b31be009343bf50c86e03c62be

commit | commitdiff | tree

Tyler Freeman [Fri, 5 May 2017 00:23:35 +0000 (17:23 -0700)]

DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility.

This is mainly for Wear devices that don't have speakers.

Bug: 37543478
Bug: 37257715

Merged-In: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4
Change-Id: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4

commit | commitdiff | tree

Marco Nelissen [Fri, 16 Jun 2017 17:12:09 +0000 (17:12 +0000)]

libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb -s ours am: 49fc959be3 -s ours am: 23118a9b77 -s ours am: 45cd809caa -s ours am: ce4c7df6a0 -s ours am: 035e2a5c37 -s ours am: 4e5ed845c7 -s ours am: 3cd244e872 -s ours
am: a9bf75f50c -s ours

Change-Id: Ib75388665c3586c09e963917bc54b020aae22dce

commit | commitdiff | tree

Marco Nelissen [Fri, 16 Jun 2017 16:59:57 +0000 (16:59 +0000)]

libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb -s ours am: 49fc959be3 -s ours am: 23118a9b77 -s ours am: 45cd809caa -s ours am: ce4c7df6a0 -s ours am: 035e2a5c37 -s ours am: 4e5ed845c7 -s ours
am: 3cd244e872 -s ours

Change-Id: I256e1413df73fd577708d5dcb84074e3a8ed61ab

commit | commitdiff | tree

Marco Nelissen [Fri, 16 Jun 2017 16:51:14 +0000 (16:51 +0000)]

libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb -s ours am: 49fc959be3 -s ours am: 23118a9b77 -s ours am: 45cd809caa -s ours am: ce4c7df6a0 -s ours am: 035e2a5c37 -s ours
am: 4e5ed845c7 -s ours

Change-Id: Iae9f79e4b91c4ef5e844259709e3055607a781b8

commit | commitdiff | tree

Marco Nelissen [Fri, 16 Jun 2017 16:41:20 +0000 (16:41 +0000)]

libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb -s ours am: 49fc959be3 -s ours am: 23118a9b77 -s ours am: 45cd809caa -s ours am: ce4c7df6a0 -s ours
am: 035e2a5c37 -s ours

Change-Id: Ib6f84a832e27329e0eabf000b89e93145c43a31a

commit | commitdiff | tree

Marco Nelissen [Fri, 16 Jun 2017 16:26:30 +0000 (16:26 +0000)]

libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb -s ours am: 49fc959be3 -s ours am: 23118a9b77 -s ours am: 45cd809caa -s ours
am: ce4c7df6a0 -s ours

Change-Id: I1fb798481ca56b8c81386792b5642a544aae1c7e

commit | commitdiff | tree

Marco Nelissen [Fri, 16 Jun 2017 16:19:02 +0000 (16:19 +0000)]

libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb -s ours am: 49fc959be3 -s ours am: 23118a9b77 -s ours
am: 45cd809caa -s ours

Change-Id: Idd7b2d2536d1c25072794ba228f33fc2459f2aaa

commit | commitdiff | tree

Marco Nelissen [Fri, 16 Jun 2017 16:11:01 +0000 (16:11 +0000)]

libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb -s ours am: 49fc959be3 -s ours
am: 23118a9b77 -s ours

Change-Id: Id314511cf3e6af08e0f00e84e8945ea404b85c6a

commit | commitdiff | tree

Marco Nelissen [Fri, 16 Jun 2017 16:02:19 +0000 (16:02 +0000)]

libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb -s ours
am: 49fc959be3 -s ours

Change-Id: I0eb248911ce1a582a4939e2bd5419659c586128f

commit | commitdiff | tree

Marco Nelissen [Fri, 16 Jun 2017 15:51:48 +0000 (15:51 +0000)]

libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours
am: 398d50feeb -s ours

Change-Id: Ide31821909dde91443cdf650216a6ada7277ce9a

commit | commitdiff | tree

Marco Nelissen [Fri, 16 Jun 2017 15:43:46 +0000 (15:43 +0000)]

libmedia_jni.so doesn't need libjhead.so
am: 9a4a34afd8 -s ours

Change-Id: I557d7e96401b742d916e2eef5aa03949018382c7

commit | commitdiff | tree

Marco Nelissen [Fri, 9 Jun 2017 22:07:38 +0000 (15:07 -0700)]

libmedia_jni.so doesn't need libjhead.so

Bug: 37776688
Merged-In: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
Change-Id: I18f0b6b88a9c0b117839497f081549404d5edc40

commit | commitdiff | tree

Todd Lee [Wed, 3 May 2017 23:22:42 +0000 (16:22 -0700)]

Add missing values for screen percent width dimens

Protects against bootlooping in the event that developer
inadvertently changes DPI to unsupported value for device.

Use 0dp as it will not be mistaken for anything other
than a broken experience (cts test to validate device DPIs
so as to avoid shipping with this).

bug: b/37755288
Change-Id: Ie9f4aa0d6d226383824e06d28151e06038d0110b

commit | commitdiff | tree

Marco Nelissen [Wed, 7 Jun 2017 00:04:12 +0000 (00:04 +0000)]

Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3
am: d7fe3ea6a8

Change-Id: Ic5a7104241d36e82418ce5a2a43595d2fa4bff47

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Jun 2017 23:54:55 +0000 (23:54 +0000)]

Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887
am: 4d9e6150f3

Change-Id: I5ede1388f265920fa5dd835c4a6335380daa9103

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Jun 2017 23:45:51 +0000 (23:45 +0000)]

Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3
am: ce5c72e887

Change-Id: I081f15c5d6bb16b3f490e53dbc2910a45e6a920b

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Jun 2017 23:39:57 +0000 (23:39 +0000)]

Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113
am: 69b6a382a3

Change-Id: I2c599bac680bda5d4dcfa4f3b9fb5f1413839da0

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Jun 2017 23:33:50 +0000 (23:33 +0000)]

Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1
am: e18e8c4113

Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Jun 2017 23:28:27 +0000 (23:28 +0000)]

Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2
am: 3272cf26c1

Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Jun 2017 23:22:14 +0000 (23:22 +0000)]

Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546
am: 6d5bc9a3c2

Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Jun 2017 23:16:24 +0000 (23:16 +0000)]

Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64
am: 4b78a79546

Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Jun 2017 23:10:16 +0000 (23:10 +0000)]

Merge "Close connection before retrying" into lmp-dev am: a8648ecebb
am: 5181a7ab64

Change-Id: I34a176a0da235836eaa9e44b843ec5d5654b8db9

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Jun 2017 23:02:35 +0000 (23:02 +0000)]

Merge "Close connection before retrying" into lmp-dev
am: a8648ecebb

Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74

commit | commitdiff | tree

TreeHugger Robot [Tue, 6 Jun 2017 22:53:55 +0000 (22:53 +0000)]

Merge "Close connection before retrying" into lmp-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Jun 2017 21:24:44 +0000 (21:24 +0000)]

Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev

commit | commitdiff | tree

Erik Wolsheimer [Mon, 5 Jun 2017 16:49:28 +0000 (16:49 +0000)]

Revert "Fix race condition triggered by quick stop/start of Dream"

Causes another race condition

This reverts commit 69515b2261335be4bd8510ed5a40a6bed3d7b48f.

Bug: 62147987
Change-Id: Ibe6f9bc14ed6cc35d3a23d52300657eaed9bb6d8

commit | commitdiff | tree

Marco Nelissen [Fri, 2 Jun 2017 19:16:44 +0000 (12:16 -0700)]

Close connection before retrying

Otherwise the (CTS) server might run out of connections.
Bug: 38391487
Bug: 22771132
Test: build, run CTS, stream music

Change-Id: I92c782a6799ab36eec8df3f7c3217bea667b838a