OSDN Git Service
Phil Weaver [Tue, 18 Jul 2017 22:01:45 +0000 (22:01 +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 am:
d2c4007d8a am:
982cf0d212 -s ours
am:
4607ec8f6d
Change-Id: Iac0fdf4d9bab026112de4864d227e3894da192ef
Phil Weaver [Tue, 18 Jul 2017 21:50:05 +0000 (21:50 +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 am:
d2c4007d8a
am:
982cf0d212 -s ours
Change-Id: Ia2a716d38e67874beb146f12849dd2f3f1356903
Phil Weaver [Tue, 18 Jul 2017 21:46:25 +0000 (21:46 +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 am:
79c476704f am:
faded53018
am:
3700014be0
Change-Id: Ib0ab12f33da6a6a6f245fa4f2eab949becf42798
Phil Weaver [Tue, 18 Jul 2017 21:43:45 +0000 (21:43 +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
am:
d2c4007d8a
Change-Id: I9c749eb931db880073de06259232f5f03c91cd32
Phil Weaver [Tue, 18 Jul 2017 21:27:11 +0000 (21:27 +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 am:
79c476704f
am:
faded53018
Change-Id: I2ba2b1380a91ee398ae65baa8b112bf9c3c3768c
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
Phil Weaver [Tue, 18 Jul 2017 21:18:42 +0000 (21:18 +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
am:
79c476704f
Change-Id: I38051f6f359f780d421384a01ac578f51ca13e63
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Phil Weaver [Tue, 18 Jul 2017 18:26:58 +0000 (18:26 +0000)]
Back-port fixes for b/
62196835
am:
fd0ca151a6
Change-Id: I442d26b476e3e83602b5f2eb61a01386e4d6d247
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
Benjamin Miller [Mon, 17 Jul 2017 22:37:34 +0000 (22:37 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
am:
d726ff988c
Change-Id: I61e326563ee95a8ced5b8c5e4ff2ce3a03c70ea2
TreeHugger Robot [Mon, 17 Jul 2017 22:28:09 +0000 (22:28 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
TreeHugger Robot [Mon, 17 Jul 2017 22:23:57 +0000 (22:23 +0000)]
Merge "DO NOT MERGE ANYWHERE: Fix build" into oc-wear-dev
Calvin On [Mon, 17 Jul 2017 20:28:25 +0000 (13:28 -0700)]
DO NOT MERGE ANYWHERE: Fix build
Hide NET_TRANSITION_WAKELOCK_OVERRIDE_MS setting
Bug:
63760887
Bug:
30574433
Change-Id: I6069e275cfd64a2c994b14962df1ca31f39d3943
TreeHugger Robot [Mon, 17 Jul 2017 20:57:59 +0000 (20:57 +0000)]
Merge "CameraManager: Handle camera service being disabled explicitly" into oc-wear-dev
Benjamin Miller [Mon, 17 Jul 2017 11:01:35 +0000 (13:01 +0200)]
Docs-change: clarification of LauncherApps.getApplicationInfo()
Staged at: go/dac-stage/reference/android/content/pm/LauncherApps.html#getApplicationInfo(java.lang.String, int, android.os.UserHandle)
Test: make ds-docs and output staged
Bug:
38024981
Change-Id: I9f256d675433457b7c85fa111ed87d1147f1f2bc
Benjamin Miller [Mon, 17 Jul 2017 14:22:21 +0000 (14:22 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
am:
ca007e525b
Change-Id: Ibad60f4b739047b2b5b0bc806ceb3140bd4420db
TreeHugger Robot [Mon, 17 Jul 2017 14:11:55 +0000 (14:11 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
TreeHugger Robot [Sat, 15 Jul 2017 02:29:52 +0000 (02:29 +0000)]
Merge "DO NOT MERGE ANYWHERE: Allow NetTransitionWakelock to be overridden via Settings" into oc-wear-dev
Peng Xu [Fri, 14 Jul 2017 23:07:12 +0000 (23:07 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am:
17e641dae5
Change-Id: Id4faafa2bce75fdae2ea37231ac12cd57845e81c
TreeHugger Robot [Fri, 14 Jul 2017 22:55:15 +0000 (22:55 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
Eino-Ville Talvala [Thu, 13 Jul 2017 19:07:20 +0000 (12:07 -0700)]
CameraManager: Handle camera service being disabled explicitly
Previously, CameraManager handled a disabled camera service
implicitly, the same as it handles a temporarily-crashed camera
service.
However, the error reporting for the those cases isn't really the
same, so switch to being explicit - check for the disabled camera
service system property, and if it's set, short-circuit calls.
Test: Camera CTS continues to pass, Watch device with no camera
service also now passes camera CTS.
Bug:
62269118
Change-Id: I65a97f8c1b0f101999b2c04d4f1096b7f3aee858
(cherry picked from commit
19d96a197fbbca281c907f14af294dae2a8b4db1)
Benjamin Miller [Fri, 14 Jul 2017 15:17:12 +0000 (17:17 +0200)]
Docs: VPNs under Android O should promote to the foreground
Add note for VPN developers that VPN apps started in the background must transition to the foreground in Android O to avoid the system stopping them.
Staged at: go/dac-stage/reference/android/net/VpnService.html
Test: make ds-docs
Bug:
38023983
Change-Id: I33c7ca1717c332ffab495eb51c4c6b9c5c304cef
Calvin On [Fri, 16 Jun 2017 00:50:45 +0000 (17:50 -0700)]
DO NOT MERGE ANYWHERE: Allow NetTransitionWakelock to be overridden via Settings
Bug:
30574433
Change-Id: If0d2a0b99266d60557623105728feace9ea16943
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
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
Phil Weaver [Wed, 12 Jul 2017 23:21:55 +0000 (23:21 +0000)]
Phil Weaver [Wed, 12 Jul 2017 23:15:37 +0000 (23:15 +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 am:
c3fc745a1c
am:
26e98edf31
Change-Id: I75d7844c2a000fab74cc82881f8ca4cc43f7acf3
Phil Weaver [Wed, 12 Jul 2017 23:10:07 +0000 (23:10 +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
am:
c3fc745a1c
Change-Id: I534f11f2eb0f737a2640acf4482a4af27927f694
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
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
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
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
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
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
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
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
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
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
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
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
Phil Weaver [Wed, 12 Jul 2017 21:43:46 +0000 (21:43 +0000)]
Back-port fixes for b/
62196835
am:
5bdffc5d57
Change-Id: Ia5dafc7a8724d296e710f32d936bb493b51951de
Phil Weaver [Tue, 11 Jul 2017 00:27:20 +0000 (17:27 -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: Ibb4c2c6a30de6b4ce8d27c34caa02e2d8148f621
Bill Yi [Tue, 11 Jul 2017 03:59:12 +0000 (03:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
88e9aa19e2 -s ours
Change-Id: I699c2179dfb543f6090b4d515bfb0f8ab43e44c3
Bill Yi [Tue, 11 Jul 2017 03:52:55 +0000 (03:52 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours
am:
829d7186d5 -s ours
Change-Id: Iae8094a858a9376a15bb0a9f48c262f81c2e32fb
TreeHugger Robot [Tue, 11 Jul 2017 03:50:19 +0000 (03:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Tue, 11 Jul 2017 03:43:57 +0000 (03:43 +0000)]
Import translations. DO NOT MERGE
am:
48cf1d9768 -s ours
Change-Id: If7328a10566daf60ac6da033923b1acbb307865f
Bill Yi [Mon, 10 Jul 2017 21:56:13 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f7c93454c795da3db06572b1cddf9691ec4ff8e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Mon, 10 Jul 2017 21:17:29 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d78e510a92213c8cd7bf2ba96e756418b79aba8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Andrew Solovay [Fri, 7 Jul 2017 19:08:53 +0000 (19:08 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am:
1cdf4244f4
Change-Id: I06ce65fb31a65750d7cc95f265295ac79db2587c
Andrew Solovay [Fri, 7 Jul 2017 19:02:48 +0000 (19:02 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
Robert Carr [Fri, 7 Jul 2017 03:22:47 +0000 (03:22 +0000)]
Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev
am:
401b8907d0
Change-Id: Ib012babf144877df858973604c5838883ebe4af5
TreeHugger Robot [Fri, 7 Jul 2017 03:10:12 +0000 (03:10 +0000)]
Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev
Robert Carr [Thu, 6 Jul 2017 22:28:34 +0000 (15:28 -0700)]
SurfaceView: Avoid initializing Surface from an invalid
SurfaceControl.
In a recent CL we introduced a call to Surface#createFrom, in order to
recreate the Surface object from the underlying SurfaceControl, as a
workaround to emulate when it was parcelled over binder in the past.
However this is causing BufferQueue abandoned errors when stopping and
resuming some applications. To understand them, we need to revisit the
SurfaceView destruction process when handling onStop.
First mWindowStopped will be set to true (SurfaceView#windowStopped),
and we should then enter updateSurface. Our requested visibility will
now be false and so we emit the Surface destroyed callbacks. Notice in
the finally block in mUpdateSurface, we will release mSurface, but we
will NOT null mSurfaceControl. Inline documentation explains why.
In the case that the activity is not actually being destroyed, it's
possible that we may not get a dispatchDetachedFromWindow. This means
that we will not null mSurfaceControl. Now if the activity is
un-stopped and we re-enter updateSurface we encounter a problem
state. "creating" will be set to false since mSurfaceControl != null,
however mSurfaceControl will not point to a valid surface.
Prior to the introduction of the #createFrom call, this unwanted state
didn't cause any problems. Because mSurface was released back in the
finally block as we were stopping we now fall out of the
mSurface.isValid() block in updateSurface. As we reach the finally
block again, we would now set mSurfaceControl=null since the app was
no longer stopped. Later when we reach updateSurface again (which
tends to happen quite often) it will now be null and we will correctly
set creating=true, create a valid SurfaceControl, and move along
happily. However following, the introduction of this
Surface#createFrom call we will now reinitialize the Surface from an
invalid underlying SurfaceControl. This means we will enter the
mSurface.isValid block, but will proceed to emit an invalid Surface to
the client in the callbacks.
We avoid this state by making creating=true even if
SurfaceControl=non-null when the calculated visibility changes from
invisible to visible.
Bug:
63251745
Test: Manual of app from bug and apps from previous related bugs. go/wm-smoke. Additional manual testing of many SV apps.
Change-Id: Icc32a34cac239d65267da705cc23feb23e1ceb67
Android Build Merger (Role) [Thu, 6 Jul 2017 19:00:57 +0000 (19:00 +0000)]
Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am:
040b774928" into oc-wear-dev
Andrew Solovay [Thu, 6 Jul 2017 18:59:31 +0000 (18:59 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am:
040b774928
Change-Id: I0b87a2e3cd5806cd74022a9b7b748529c993e4af
Andrew Solovay [Thu, 6 Jul 2017 18:58:11 +0000 (18:58 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am:
040b774928
Change-Id: I62888852d4bec175188560748fb76bca70472af3
Andrew Solovay [Thu, 6 Jul 2017 18:42:13 +0000 (18:42 +0000)]
Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
Peng Xu [Wed, 5 Jul 2017 22:21:12 +0000 (15:21 -0700)]
Update Java doc of SensorManager.createDirectChannel
Java doc was left out when addressing API reviewer comments.
This CL fix the discrepancy between the actual logic and java doc.
Bug:
36550285
Test: compiles
Change-Id: I6406892ecdcc5d02f11966fa3fb0b81ed8d3b285
Bill Yi [Sat, 1 Jul 2017 16:59:39 +0000 (16:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
c393596c5c -s ours
Change-Id: I9093ea3fb13677739ad0a4b230d3826b98f0734b
TreeHugger Robot [Sat, 1 Jul 2017 16:49:35 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sat, 1 Jul 2017 05:21:21 +0000 (22:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68c61a6bc5bb8b5ea580383d10702bac0e7db254
Auto-generated-cl: translation import
Myles Watson [Sat, 1 Jul 2017 01:08:49 +0000 (01:08 +0000)]
Send disable messages when Bluetooth is disallowed
am:
6291fae585
Change-Id: Ia9bcd0474ee648213a4435d1570ea17888e1c328
Andrew Solovay [Sat, 1 Jul 2017 00:01:18 +0000 (17:01 -0700)]
docs: Removing com.android.internal.* packages from Javadoc build
Several com.android.internal packages were being included in the
Javadoc build, even though they have no public APIs. Added a
package.html with the @hide tag to each of those packages, to
exclude them from the doc build.
Updated doc is staged to: http://go/dac-stage/reference/ ; verified
that the packages are now *not* in
http://go/dac-stage/reference/packages.html , and that package
summary files are not being generated for those packages.
Test: make ds-docs
Bug:
63166900
Change-Id: I7f96abb3e57d005c290cce6eda58f9368159a34e
Myles Watson [Thu, 29 Jun 2017 10:12:02 +0000 (03:12 -0700)]
Send disable messages when Bluetooth is disallowed
Bug:
63021124
Test: cts-tradefed run commandAndExit cts \
-m CtsDevicePolicyManagerTestCases \
-t com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Change-Id: I0ef538a4d0f0632ce303b29595ac1cab3b7d29ce
Ricardo Loo [Fri, 30 Jun 2017 00:51:53 +0000 (00:51 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
am:
a89dfb5439
Change-Id: I1c7820a5ce4846222c016020d959b541b12e63aa
Ricardo Loo [Fri, 30 Jun 2017 00:44:50 +0000 (00:44 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
Chet Haase [Fri, 30 Jun 2017 00:32:25 +0000 (00:32 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
am:
8cdbd6e184
Change-Id: I134ccd19e7bb412b726079b2489dbac730e105cd
TreeHugger Robot [Fri, 30 Jun 2017 00:21:28 +0000 (00:21 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
Andrew Solovay [Thu, 29 Jun 2017 20:12:17 +0000 (13:12 -0700)]
docs: Described why ProgressDialog is now deprecated.
Per feedback from DevRel, devs should avoid ProgressDialog because
using a modal dialog to show progress is a bad user experience.
Updating the ProgressDialog javadocs to say this; there's a separate
CL (http://cr/
160568896) to make a similar note in the Dialogs API
guide.
Doc is staged to:
http://go/dac-stage/reference/android/app/ProgressDialog.html
Test: make ds-docs
Bug:
37565313
Change-Id: I189732fdda4532f248861e3f3d077f743f6387de
Sujith Ramakrishnan [Thu, 29 Jun 2017 18:59:05 +0000 (18:59 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am:
564d0bf1be
Change-Id: Ibb1e4d6ab641f6f500e60967e611cd08e55abf60
TreeHugger Robot [Thu, 29 Jun 2017 18:50:08 +0000 (18:50 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
Scott Main [Thu, 29 Jun 2017 16:19:23 +0000 (16:19 +0000)]
Merge "add links to Log class summary for methods and logcat doc" into oc-dev
am:
ea6fea4d5d
Change-Id: I07674d48f82a2072831b57527d3d7d3797f67ff0
Scott Main [Thu, 29 Jun 2017 16:12:47 +0000 (16:12 +0000)]
Merge "add links to Log class summary for methods and logcat doc" into oc-dev
Chet Haase [Thu, 29 Jun 2017 14:54:19 +0000 (07:54 -0700)]
Add docs for new padding/margin attributes.
The attributes for View, paddingHorizontal and paddingVertical,
were added in the O release and are documented in R.attr. But they
should also be referenced in View itself, alongside the other
padding parameters.
Similarly, the new layout_MarginHorizontal and
layout_marginVertical should be referenced in
ViewGroup.MarginLayoutParams.
Bug:
63128350 Add docs about new padding/margin params
Test: built docs, checked the result
Change-Id: I3021df5ea83c469811b4a6ec6ecd3ab2966ec384
Andrii Kulian [Thu, 29 Jun 2017 01:57:27 +0000 (01:57 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
am:
36dbd3d43f
Change-Id: I566151d1e31efcbb758d4ab6c309ebddeb3b24e4
Andrii Kulian [Thu, 29 Jun 2017 01:47:41 +0000 (01:47 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
Robert Carr [Thu, 29 Jun 2017 00:26:18 +0000 (00:26 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
am:
e33c33e38a
Change-Id: Ib9b7c9bf52fb6f4b77964c42c2b28f192c2ffb15
TreeHugger Robot [Thu, 29 Jun 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
Eugene Susla [Thu, 29 Jun 2017 00:03:14 +0000 (00:03 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
am:
c55f7d2180
Change-Id: I9e92d7d7d654af0eeee3d7a5771864280e25dd5d
TreeHugger Robot [Wed, 28 Jun 2017 23:54:49 +0000 (23:54 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
Andrii Kulian [Wed, 28 Jun 2017 23:21:07 +0000 (16:21 -0700)]
Further restrict activity launch on virtual displays
Only callers with INTERNAL_SYSTEM_WINDOW permission can launch
an activity to a virtual display.
Bug:
63094482
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I3f618fcbf3c07e5085e2b43b0f038f240df0c9d3
Scott Main [Wed, 28 Jun 2017 22:57:01 +0000 (15:57 -0700)]
add links to Log class summary for methods and logcat doc
bug:
29123084
Change-Id: Ida1351ca3647faa133905c5ff85df716bffd3203
John Reck [Wed, 28 Jun 2017 22:45:43 +0000 (22:45 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
am:
38c97237e3
Change-Id: I093e12eddeedd5f5a1e1d1702b461dc012a07799
John Reck [Wed, 28 Jun 2017 22:39:46 +0000 (22:39 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev