OSDN Git Service
Android Build Merger (Role) [Thu, 29 Dec 2016 11:25:55 +0000 (11:25 +0000)]
Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15 am:
03fa83e216 am:
c189f23dd4 am:
835c1bcedb am:
b5f3383589 am:
e167e6d284" into nyc-mr2-dev-plus-aosp
Charles He [Thu, 29 Dec 2016 11:25:11 +0000 (11:25 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15 am:
03fa83e216 am:
c189f23dd4 am:
835c1bcedb am:
b5f3383589
am:
e167e6d284
Change-Id: I036d794b37bad0418f0f667c33d09e605df9f69b
Android Build Merger (Role) [Thu, 29 Dec 2016 11:24:59 +0000 (11:24 +0000)]
Merge "Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446 am:
08ea823955 am:
22faa73586" into nyc-mr2-dev-plus-aosp
Charles He [Thu, 29 Dec 2016 11:24:10 +0000 (11:24 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446 am:
08ea823955
am:
22faa73586
Change-Id: I630b97aa9b3a5e9bbc88b49aeb61216ff9c37de6
Charles He [Thu, 29 Dec 2016 11:23:57 +0000 (11:23 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446 am:
08ea823955
am:
065e387455
Change-Id: Ic6182836cbc0bf547bcd6c6621a410c1e6d0ce8f
Charles He [Thu, 29 Dec 2016 11:18:04 +0000 (11:18 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15 am:
03fa83e216 am:
c189f23dd4 am:
835c1bcedb
am:
b5f3383589
Change-Id: I85ff02b53d1285d8e8a4e7c30ae9a988c52d6468
Charles He [Thu, 29 Dec 2016 11:17:05 +0000 (11:17 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446
am:
08ea823955
Change-Id: I1526deabd38ef8ecbb841a7029b9539bb5f3aefc
Charles He [Thu, 29 Dec 2016 11:16:55 +0000 (11:16 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446
am:
08ea823955
Change-Id: I079501cac553468878a6642a64110f4de3e56698
Ivan Podogov [Thu, 29 Dec 2016 11:16:50 +0000 (11:16 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." am:
895e2d7a40 -s ours am:
fd770e1cb8
am:
b90fa0a5c3
Change-Id: Id527fe8b5242ae6650446ce2993708463c08323b
Ivan Podogov [Thu, 29 Dec 2016 11:10:29 +0000 (11:10 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." am:
895e2d7a40 -s ours
am:
fd770e1cb8
Change-Id: Icef54e7756a1b9b63f909ea8011a2625df38df99
Charles He [Thu, 29 Dec 2016 11:04:37 +0000 (11:04 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15 am:
03fa83e216 am:
c189f23dd4
am:
835c1bcedb
Change-Id: Ia49ac04fb87b215fc52b0dd40d917f2aab045745
Charles He [Thu, 29 Dec 2016 11:03:26 +0000 (11:03 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad
am:
9bc2d6b446
Change-Id: I7e5794885bf78dfd1d755a7fdb0b1edf66b9fdee
Ivan Podogov [Thu, 29 Dec 2016 11:03:21 +0000 (11:03 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT."
am:
895e2d7a40 -s ours
Change-Id: Id2deabb5875b0ca13bb818a7c65893e01dc655e2
Charles He [Thu, 29 Dec 2016 10:56:32 +0000 (10:56 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15 am:
03fa83e216
am:
c189f23dd4
Change-Id: I8426e0788ce1dcb12daac23e82663284633cae5b
Charles He [Thu, 29 Dec 2016 10:55:23 +0000 (10:55 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f
am:
dd7837c5ad
Change-Id: I2124f52b38314199950d1448cddd2bbd328c85ce
Charles He [Thu, 29 Dec 2016 10:42:32 +0000 (10:42 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15
am:
03fa83e216
Change-Id: I8f10fcf6b604848f68ecc086dd3723841e07ef8c
Charles He [Thu, 29 Dec 2016 10:41:25 +0000 (10:41 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0
am:
8bcdab7e6f
Change-Id: I6e41bfad4ce66ca80bca636a5fb4ddc85b71e83a
Charles He [Thu, 29 Dec 2016 10:35:19 +0000 (10:35 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5
am:
6bb6f02a15
Change-Id: I849811a3be2c6989edea3ed6f938b4b36a4fabe7
Charles He [Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9
am:
9a47fa7fc0
Change-Id: Ifb9f5b177f7c031352e6e9cf308e6295f7c60074
Charles He [Thu, 29 Dec 2016 10:26:51 +0000 (10:26 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd
am:
e15e0de7e5
Change-Id: I12af619f1fce710f643387dca3e06c1c4b5258d3
Charles He [Thu, 29 Dec 2016 10:25:50 +0000 (10:25 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882
am:
e5156ec1e9
Change-Id: I62b79fe7ef5a2febce27729f4709a599832cb3da
Charles He [Thu, 29 Dec 2016 10:19:49 +0000 (10:19 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7
am:
b64af9bacd
Change-Id: I261c46544e8e1aef26772d57475037810198e4d9
Charles He [Thu, 29 Dec 2016 10:18:49 +0000 (10:18 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611
am:
00a581f882
Change-Id: I016955744e48d7a91380c2ff39f7c64536a39c7e
Ivan Podogov [Thu, 29 Dec 2016 10:18:10 +0000 (10:18 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT."
Charles He [Thu, 29 Dec 2016 10:12:24 +0000 (10:12 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92
am:
d7f2a4b0c7
Change-Id: I3019f9751b69809d3cb66061753f0b76085b235b
Charles He [Thu, 29 Dec 2016 10:11:20 +0000 (10:11 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d
am:
133ff4d611
Change-Id: I54b163f645f561243aac3df1a55c1023531997b3
Charles He [Thu, 29 Dec 2016 10:05:02 +0000 (10:05 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888
am:
a8484b4f92
Change-Id: Id5a9576ab6e37e3744a59d904909d11f668d0e06
Charles He [Thu, 29 Dec 2016 10:03:53 +0000 (10:03 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca
am:
2ce5c4320d
Change-Id: I29339a634fd22cd46bfc08619464da8fe159a2b7
Charles He [Thu, 29 Dec 2016 09:48:50 +0000 (09:48 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
am:
4bd97eb888
Change-Id: I607f7ca9e160c4eed69a5baeff6b31d6db7c6b03
Charles He [Thu, 29 Dec 2016 09:48:45 +0000 (09:48 +0000)]
Prevent writing to FRP partition during factory reset.
am:
a9437bd1ca
Change-Id: Ib0b8db2357317dc3e680910c08f15f098baf2af9
Charles He [Thu, 29 Dec 2016 09:42:25 +0000 (09:42 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
Martijn Coenen [Thu, 29 Dec 2016 09:19:55 +0000 (09:19 +0000)]
Merge "Add (un)linkToDeath support to HwBinder." am:
7705363166 am:
010d0be575
am:
1f8c96ca7f
Change-Id: Ic195a1f3ab2a9d318fe667ac3be0ce166119dc66
Martijn Coenen [Thu, 29 Dec 2016 09:12:22 +0000 (09:12 +0000)]
Merge "Add (un)linkToDeath support to HwBinder." am:
7705363166
am:
010d0be575
Change-Id: Ibabccaf8555bd0229add18a798bff685c6a1c433
Martijn Coenen [Thu, 29 Dec 2016 09:04:49 +0000 (09:04 +0000)]
Merge "Add (un)linkToDeath support to HwBinder."
am:
7705363166
Change-Id: I007b2fc2982d164176607cd8f2d0ccc9ebde982c
Martijn Coenen [Thu, 29 Dec 2016 08:07:44 +0000 (08:07 +0000)]
Merge "Add (un)linkToDeath support to HwBinder."
Martijn Coenen [Tue, 27 Dec 2016 13:33:09 +0000 (14:33 +0100)]
Add (un)linkToDeath support to HwBinder.
This is mostly copied over from binder's existing
death recipient support. The implementation keeps
a list of registered recipients, both for being
able to map a native recipient back to the corresponding
Java recipient, as well as being able to unregister
recipients correctly.
Test: mma, hidl_test_java
Bug:
31632518
Change-Id: Id313fd248be6925056c4ade8298fe5fb04e007cc
Android Build Merger (Role) [Thu, 29 Dec 2016 01:53:33 +0000 (01:53 +0000)]
Merge "Merge "Change the name of the contexthub service." am:
fba752e64c am:
8a3f7c0738 am:
cf33fd7910" into nyc-mr2-dev-plus-aosp
ashutoshj [Thu, 29 Dec 2016 01:52:34 +0000 (01:52 +0000)]
Merge "Change the name of the contexthub service." am:
fba752e64c am:
8a3f7c0738
am:
cf33fd7910
Change-Id: Ic9daa912077d6162092a0adcb5d8debf10be9c55
Jiaquan He [Thu, 29 Dec 2016 01:51:30 +0000 (01:51 +0000)]
Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev
am:
c87fcb0963
Change-Id: I5f2a91b5f52f2dd3ebc564c127a1f939a4bc20a4
Jiaquan He [Thu, 29 Dec 2016 01:51:24 +0000 (01:51 +0000)]
Move grid checking into the layout algorithm.
am:
26f637b555
Change-Id: Ie65d71bd7f6edb5e92f6dd331999424a592c8073
ashutoshj [Thu, 29 Dec 2016 01:45:34 +0000 (01:45 +0000)]
Merge "Change the name of the contexthub service." am:
fba752e64c
am:
8a3f7c0738
Change-Id: I02265e27f7245a13cdfc705dba4cd4de33ed0253
TreeHugger Robot [Thu, 29 Dec 2016 01:41:52 +0000 (01:41 +0000)]
Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev
ashutoshj [Thu, 29 Dec 2016 01:38:30 +0000 (01:38 +0000)]
Merge "Change the name of the contexthub service."
am:
fba752e64c
Change-Id: Ie354f06495f0c3fb73aa053956ecc371716bab3f
ashutoshj [Thu, 29 Dec 2016 01:29:41 +0000 (01:29 +0000)]
Merge "Change the name of the contexthub service."
Jiaquan He [Thu, 29 Dec 2016 00:21:55 +0000 (00:21 +0000)]
Merge "2D recents: show all close buttons right away" into nyc-mr2-dev
am:
3b430f7d0c
Change-Id: I816b8170fef81e02d2c9fc99ba0f236d7f2cf080
Manu Cornet [Thu, 29 Dec 2016 00:21:48 +0000 (00:21 +0000)]
2D recents: show all close buttons right away
am:
8ff7854c4b
Change-Id: I18e3729f5e09601a6548647fa16ba90bf2147cb0
Jiaquan He [Thu, 29 Dec 2016 00:19:53 +0000 (00:19 +0000)]
Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev
am:
55a684ff65
Change-Id: Ife9a1c5276668ceddc662fdc2e385b7f0570b660
Manu Cornet [Thu, 29 Dec 2016 00:19:48 +0000 (00:19 +0000)]
2D Recents: use a slightly darker scrim background
am:
48de4e6afe
Change-Id: I33a961dbd1741d72fa86a0cde0b2e60b76271955
Jiaquan He [Thu, 29 Dec 2016 00:13:14 +0000 (00:13 +0000)]
Merge "2D recents: show all close buttons right away" into nyc-mr2-dev
Jiaquan He [Thu, 29 Dec 2016 00:12:48 +0000 (00:12 +0000)]
Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev
Jiaquan He [Tue, 27 Dec 2016 22:44:14 +0000 (14:44 -0800)]
Move grid checking into the layout algorithm.
We move grid layout checking into the layout algorithm, so that we can
hide more computation from the views.
Bug:
32101881
Change-Id: I174fe33ef7ed3c04987771dbb42d831a4b9bdab2
Android Build Merger (Role) [Thu, 29 Dec 2016 00:00:21 +0000 (00:00 +0000)]
Merge "Merge "Resue TaskView information." into nyc-mr2-dev am:
6335e35d51" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 28 Dec 2016 23:59:54 +0000 (23:59 +0000)]
Merge "Resue TaskView information. am:
0a5e2d6b93" into nyc-mr2-dev-plus-aosp
Jiaquan He [Wed, 28 Dec 2016 23:58:54 +0000 (23:58 +0000)]
Merge "Resue TaskView information." into nyc-mr2-dev
am:
6335e35d51
Change-Id: I6498fbdb0c948913da95a5beccaa9feeb5f8f1ed
Jiaquan He [Wed, 28 Dec 2016 23:58:49 +0000 (23:58 +0000)]
Resue TaskView information.
am:
0a5e2d6b93
Change-Id: I0d998b0e31dedb48ef284386811fe67fbda6c981
Adrian Roos [Wed, 28 Dec 2016 23:58:43 +0000 (23:58 +0000)]
Merge "QS - Fix race condition in accessibility" am:
302efd6125 am:
3c0a8bba3c
am:
b12ed1e10f
Change-Id: I2f17f2bd2f293f2c68ba20fbfd6aa3e693f8b865
Adrian Roos [Wed, 28 Dec 2016 23:51:30 +0000 (23:51 +0000)]
Merge "QS - Fix race condition in accessibility" am:
302efd6125
am:
3c0a8bba3c
Change-Id: I3e05c8c127c021dc321b0ef130159ff7a021a9e8
TreeHugger Robot [Wed, 28 Dec 2016 23:50:52 +0000 (23:50 +0000)]
Merge "Resue TaskView information." into nyc-mr2-dev
Adrian Roos [Wed, 28 Dec 2016 23:43:46 +0000 (23:43 +0000)]
Merge "QS - Fix race condition in accessibility"
am:
302efd6125
Change-Id: I13c4959fde96684c52124ff8809d6921fc404a42
Adrian Roos [Wed, 28 Dec 2016 23:29:58 +0000 (23:29 +0000)]
Merge "QS - Fix race condition in accessibility"
Ashutosh Joshi [Tue, 27 Dec 2016 17:32:49 +0000 (09:32 -0800)]
Change the name of the contexthub service.
Change the name used by the contexthub service. Specifically, this
change switches from using the "ContexthubService.CONTEXTHUB_SERVICE"
constant to using the "Context.CONTEXTHUB_SERVICE" constant- which is in
line with the other Android services.
Merged-In: I18ae73ed0fda2f938e3233670dc52b5692d321ae
Test: GTS tests pass.
Change-Id: I18ae73ed0fda2f938e3233670dc52b5692d321ae
Andrew Solovay [Wed, 28 Dec 2016 20:45:39 +0000 (20:45 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc am:
897df2b5af
am:
602c3c7073
Change-Id: I496cfe09a488f9bfc278e10e72423da3e2406c6f
Andrew Solovay [Wed, 28 Dec 2016 20:44:32 +0000 (20:44 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33 am:
2891357f4d
am:
23473e8851
Change-Id: Id8590431f317068e0f851f0b77862b825734eae6
Andrew Solovay [Wed, 28 Dec 2016 20:38:40 +0000 (20:38 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc am:
897df2b5af
am:
563ca19747
Change-Id: I133647a253f62208c7ee6deb6cf15a955f09ec8e
Andrew Solovay [Wed, 28 Dec 2016 20:37:36 +0000 (20:37 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33 am:
2891357f4d
am:
ff501e5e5f
Change-Id: I8e7bf9b66c92ed5db45007084075fca36ccaa0c8
Andrew Solovay [Wed, 28 Dec 2016 20:32:13 +0000 (20:32 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc
am:
897df2b5af
Change-Id: I06cea8a7d84e02346047e0e0bf88cf30f9da4120
Andrew Solovay [Wed, 28 Dec 2016 20:32:03 +0000 (20:32 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc
am:
897df2b5af
Change-Id: I32b241e93caac5e38c54610b799c877365be75ff
Andrew Solovay [Wed, 28 Dec 2016 20:31:08 +0000 (20:31 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33
am:
2891357f4d
Change-Id: Id95f2f8c11a98b56f656b3688accd632fe6da43d
Andrew Solovay [Wed, 28 Dec 2016 20:31:02 +0000 (20:31 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33
am:
2891357f4d
Change-Id: I9b15c8787d6f6aa6c2d362de46ab06a583d3283c
Andrew Solovay [Wed, 28 Dec 2016 20:24:34 +0000 (20:24 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
am:
61dad4b2fc
Change-Id: I1918b70ad644f7aded33d27bcc55e05478d9f773
Andrew Solovay [Wed, 28 Dec 2016 20:24:30 +0000 (20:24 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported.
am:
40ba793b33
Change-Id: I5d15df8192fee8362dca8dcc53d84b75af29a13f
Jeremy Joslin [Wed, 28 Dec 2016 20:17:35 +0000 (20:17 +0000)]
Merge "Cleanup the evaluateBinding() method." am:
c26aa87a2b am:
b12af1b18a
am:
3ba918c9d3
Change-Id: I72485ebbaed2b60b48d1b4694b0db56b9f2178ca
Andrew Solovay [Wed, 28 Dec 2016 20:16:26 +0000 (20:16 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
Jeremy Joslin [Wed, 28 Dec 2016 20:10:35 +0000 (20:10 +0000)]
Merge "Cleanup the evaluateBinding() method." am:
c26aa87a2b
am:
b12af1b18a
Change-Id: I65d005aa303102b212c93b0b2702941bf554526d
Jeremy Joslin [Wed, 28 Dec 2016 20:03:05 +0000 (20:03 +0000)]
Merge "Cleanup the evaluateBinding() method."
am:
c26aa87a2b
Change-Id: Iaac51cf5114ed6af55246b3580b9f5403a1bb3bd
Treehugger Robot [Wed, 28 Dec 2016 19:52:41 +0000 (19:52 +0000)]
Merge "Cleanup the evaluateBinding() method."
Jiaquan He [Wed, 28 Dec 2016 19:20:06 +0000 (19:20 +0000)]
Merge "Check split screen properly." into nyc-mr2-dev
am:
632332c259
Change-Id: I2d69e69b9e00d076f2707a690137d5278fd2107c
Jiaquan He [Wed, 28 Dec 2016 19:20:00 +0000 (19:20 +0000)]
Check split screen properly.
am:
5fac212e8b
Change-Id: Ica99e37798a2447acdbddb7b29b6e67655870b1d
Jiaquan He [Wed, 28 Dec 2016 19:12:23 +0000 (19:12 +0000)]
Merge "Check split screen properly." into nyc-mr2-dev
Jeremy Joslin [Wed, 21 Dec 2016 21:35:02 +0000 (13:35 -0800)]
Cleanup the evaluateBinding() method.
Small refactor to remove 1 level of nesting.
Test: build, run.
Change-Id: Ic46a65036b207ff73fefced914e0928de2f2b500
Merged-In: I38836ca9d18c5fcd3c6edf5931b58de3b08614ee
Jorim Jaggi [Wed, 28 Dec 2016 17:12:38 +0000 (17:12 +0000)]
Merge "Change screen pinning back to old gesture" into nyc-mr2-dev
am:
8812fb0695
Change-Id: I4a5ccf55bf02ba25d4ce652ac86cdba20814d661
Jorim Jaggi [Wed, 28 Dec 2016 17:12:28 +0000 (17:12 +0000)]
Change screen pinning back to old gesture
am:
4e723e6087
Change-Id: I83dee36d5d3b16adbf740dd6495e7945bf0236ef
Jorim Jaggi [Wed, 28 Dec 2016 17:01:18 +0000 (17:01 +0000)]
Merge "Change screen pinning back to old gesture" into nyc-mr2-dev
Jorim Jaggi [Wed, 14 Dec 2016 19:02:39 +0000 (11:02 -0800)]
Change screen pinning back to old gesture
This makes the code a bit more complicated, but allows apps to
receive long-press back again and also makes the mode harder
to exit for toddlers.
Test: Without TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Test: With TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Merged-In: Icd7347aa9c60af00fdb0b3991baabb730552d097
Change-Id: Icd7347aa9c60af00fdb0b3991baabb730552d097
Fixes:
32440409
Ivan Podogov [Mon, 5 Dec 2016 16:46:52 +0000 (16:46 +0000)]
In permission review mode, always request user's consent to toggle BT.
Bug:
33155221
Test: Manual: flash the watch, check that the consent UI was
displayed in both apps (the one with CompileSDK=21 and
TargetSDK=21, and the one with CompileSDK=25 and
TargetSDK=25).
Change-Id: Ic1ed987bbaf282892a2aef354a8ca0add2c829ba
Joe LaPenna [Wed, 28 Dec 2016 03:03:33 +0000 (03:03 +0000)]
Merge "Send RECOMMEND_NETWORKS action when binding to provider." am:
1471ad3ea7 am:
ddff9e586c
am:
bef179f094
Change-Id: I4b8a42cb9499e9ba2beab0b39375485d1898b07c
Joe LaPenna [Wed, 28 Dec 2016 02:56:34 +0000 (02:56 +0000)]
Merge "Send RECOMMEND_NETWORKS action when binding to provider." am:
1471ad3ea7
am:
ddff9e586c
Change-Id: Ie86fbc9c427e3f238e0d83a03240fc7045a61e5e
Joe LaPenna [Wed, 28 Dec 2016 02:49:01 +0000 (02:49 +0000)]
Merge "Send RECOMMEND_NETWORKS action when binding to provider."
am:
1471ad3ea7
Change-Id: I9b052e48c067dc50111c6ce6bf1b200232676aa2
Treehugger Robot [Wed, 28 Dec 2016 02:36:22 +0000 (02:36 +0000)]
Merge "Send RECOMMEND_NETWORKS action when binding to provider."
Adrian Roos [Tue, 27 Dec 2016 23:49:53 +0000 (23:49 +0000)]
Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
am:
02f07cce35
Change-Id: I3890e276ab985977f7e02d77c91c403700c254d6
Adrian Roos [Tue, 27 Dec 2016 23:49:46 +0000 (23:49 +0000)]
Ambient Display: Fix race with coloring and redaction
am:
e5726a2082
Change-Id: I9c2c42692f01b7665fb11d6e0f47c707d3c630fc
Jiaquan He [Tue, 27 Dec 2016 19:05:44 +0000 (11:05 -0800)]
Resue TaskView information.
In this commit we calculate all the TaskView information we need
during initialization, so that we don't need to calculate again
unless any configuration is changed.
Bug:
32101881
Change-Id: I433688d0a05c69064d0da5268b61340cecdbfe74
Adrian Roos [Tue, 27 Dec 2016 23:36:56 +0000 (23:36 +0000)]
Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
Adrian Roos [Tue, 27 Dec 2016 23:29:54 +0000 (23:29 +0000)]
Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev
am:
52133e6916
Change-Id: I9fe96a428c918f1fc250b021ddd4d1c6fbdd061b
Adrian Roos [Tue, 27 Dec 2016 23:29:47 +0000 (23:29 +0000)]
Keyguard: Don't lock on SIM removed during shutdown
am:
1f8025adf2
Change-Id: I22b34aa27c6540bf661081950a51eb275894c032
Adrian Roos [Tue, 27 Dec 2016 23:20:43 +0000 (23:20 +0000)]
Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev
Joe LaPenna [Tue, 27 Dec 2016 22:50:14 +0000 (14:50 -0800)]
Send RECOMMEND_NETWORKS action when binding to provider.
Some services use action to disambiguate which binder to return in
onBind.
Test: built && installed && bound.
BUG:
33905890
Change-Id: I83ae41b472c597661b93f5467b64b258e9056f5f
Merged-In: I83ae41b472c597661b93f5467b64b258e9056f5f
Jiaquan He [Fri, 23 Dec 2016 00:47:59 +0000 (16:47 -0800)]
Check split screen properly.
This commit detacts split screen by checking whether there's
a docked task instead of multi window mode.
Bug:
33847223
Bug:
32101881
Change-Id: I23ee11e57ded7c5e81d51cfbfea05500a879945c
Selim Cinek [Tue, 27 Dec 2016 19:22:10 +0000 (19:22 +0000)]
Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev
am:
cbb057d3da
Change-Id: I2c4f83b83dfa685c8b838b9206e26231a0b9aac0
Selim Cinek [Tue, 27 Dec 2016 19:22:04 +0000 (19:22 +0000)]
DO NOT MERGE Revert "Add Brightness setting for VR Mode."
am:
966045d070
Change-Id: Ib1be78a47f5947f4fcc6eabc2f6af76523690ed9