OSDN Git Service
Pankaj Kanwar [Wed, 16 Aug 2017 01:31:31 +0000 (01:31 +0000)]
Merge "Show notification when VoWiFi is active, and user is out of service for voice." into oc-mr1-dev
am:
539c15ec84
Change-Id: I63ff9c84bfb5582575f8e2098b02ff7f77a51287
Pankaj Kanwar [Wed, 16 Aug 2017 01:11:35 +0000 (01:11 +0000)]
Merge "Show notification when VoWiFi is active, and user is out of service for voice." into oc-mr1-dev
Christopher Tate [Tue, 15 Aug 2017 23:50:11 +0000 (23:50 +0000)]
Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev
am:
4b7b5a6c59
Change-Id: I6d8bb5b15b7c9b13edbb6d8b4e3a69af1d9ca17f
TreeHugger Robot [Tue, 15 Aug 2017 23:38:40 +0000 (23:38 +0000)]
Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev
Christopher Tate [Mon, 14 Aug 2017 23:45:03 +0000 (16:45 -0700)]
Add privileged permission for reading the current wallpaper image
OEMs can therefore arrange factory-default access to have access prior
to setup or user interaction.
Bug:
30770233
Bug:
64029450
Test: manual
Change-Id: I2cb30721f2a64ef50275b711ca10ca571248504a
Felipe Leme [Tue, 15 Aug 2017 22:49:15 +0000 (22:49 +0000)]
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev
am:
6ba128762f
Change-Id: I2fe5ef111527fa011b1828ef1e7befb66eb5d388
Android Build Merger (Role) [Tue, 15 Aug 2017 22:28:27 +0000 (22:28 +0000)]
Merge "Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880 am:
a3c2cee055 am:
ab380663bf" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 15 Aug 2017 22:26:54 +0000 (22:26 +0000)]
Merge "Merge "Fix broken test" into oc-mr1-dev am:
d8e7cb4b47" into oc-mr1-dev-plus-aosp
Felipe Leme [Tue, 15 Aug 2017 22:24:06 +0000 (22:24 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880 am:
a3c2cee055
am:
ab380663bf
Change-Id: Ifc6a55243f7654cf82b4cbe5146fac206d9a07ef
TreeHugger Robot [Tue, 15 Aug 2017 22:23:57 +0000 (22:23 +0000)]
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev
Android Build Merger (Role) [Tue, 15 Aug 2017 22:23:34 +0000 (22:23 +0000)]
Merge "Merge "[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf am:
0fa9328b80 am:
b0fa5855dc" into oc-dr1-dev-plus-aosp am:
11e5e819d6" into oc-mr1-dev-plus-aosp
Lucas Dupin [Tue, 15 Aug 2017 22:22:24 +0000 (22:22 +0000)]
Merge "Fix broken test" into oc-mr1-dev
am:
d8e7cb4b47
Change-Id: I92585de3b345b60bc0f043c512e034cc428c05d1
Android Build Merger (Role) [Tue, 15 Aug 2017 22:21:41 +0000 (22:21 +0000)]
Merge "Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880 am:
a3c2cee055 am:
2220049d58" into oc-mr1-dev-plus-aosp
Charles He [Tue, 15 Aug 2017 22:19:11 +0000 (22:19 +0000)]
Merge "[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf am:
0fa9328b80 am:
b0fa5855dc" into oc-dr1-dev-plus-aosp
am:
11e5e819d6
Change-Id: Ib20fa1b5c0cadb14efd69672374febaada55107f
Android Build Merger (Role) [Tue, 15 Aug 2017 22:18:06 +0000 (22:18 +0000)]
Merge "Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880 am:
7e9f379b50 am:
82e7dfcae8" into oc-mr1-dev-plus-aosp
Felipe Leme [Tue, 15 Aug 2017 22:16:45 +0000 (22:16 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880 am:
a3c2cee055
am:
2220049d58
Change-Id: I331adcc0e780e8c89dfba1187bb481b3a493b70a
Felipe Leme [Tue, 15 Aug 2017 22:13:39 +0000 (22:13 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880 am:
7e9f379b50
am:
82e7dfcae8
Change-Id: I47c263e196b9cfa3e664ec6a968eeb2cffcffc58
Charles He [Tue, 15 Aug 2017 22:10:53 +0000 (22:10 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf am:
0fa9328b80 am:
b0fa5855dc
am:
77f3300f48
Change-Id: I3b0a39e30bf69828ab4c6e8b3ee42b627eaf7efe
TreeHugger Robot [Tue, 15 Aug 2017 22:04:58 +0000 (22:04 +0000)]
Merge "Fix broken test" into oc-mr1-dev
Android Build Merger (Role) [Tue, 15 Aug 2017 22:03:45 +0000 (22:03 +0000)]
Merge "Merge "[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf am:
0fa9328b80 am:
51ca967453" into oc-dr1-dev-plus-aosp am:
5ee440bbcc" into oc-mr1-dev-plus-aosp
Charles He [Tue, 15 Aug 2017 21:55:17 +0000 (21:55 +0000)]
Merge "[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf am:
0fa9328b80 am:
51ca967453" into oc-dr1-dev-plus-aosp
am:
5ee440bbcc
Change-Id: I7eb6f2d24a30f4f4374b6c77b8bf717ee14cdee3
Android Build Merger (Role) [Tue, 15 Aug 2017 21:54:20 +0000 (21:54 +0000)]
Merge "[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc am:
0e1976292d -s ours am:
0958d0339f -s ours am:
50b01908c8 -s ours" into oc-mr1-dev-plus-aosp
Felipe Leme [Tue, 15 Aug 2017 21:52:20 +0000 (21:52 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880
am:
a3c2cee055
Change-Id: I6d96d3145db1ed5c313f0ef6a247867bf99ff1d6
Android Build Merger (Role) [Tue, 15 Aug 2017 21:49:31 +0000 (21:49 +0000)]
Merge "[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf am:
0fa9328b80 am:
b0fa5855dc" into oc-dr1-dev-plus-aosp
Felipe Leme [Tue, 15 Aug 2017 21:48:32 +0000 (21:48 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880
am:
a3c2cee055
Change-Id: Ie107dd462a47009a34ee3768183dfda2e36107c3
Tony Mak [Tue, 15 Aug 2017 21:48:05 +0000 (21:48 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc am:
0e1976292d -s ours am:
0958d0339f -s ours
am:
50b01908c8 -s ours
Change-Id: I9b6ed0e018a9e4f826f621b7918b161820666c06
Tony Mak [Tue, 15 Aug 2017 21:47:46 +0000 (21:47 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc am:
0e1976292d -s ours am:
0958d0339f -s ours
am:
c052d7e9c4 -s ours
Change-Id: I53bce8284d941de84417c4ea67d51550606d830d
Charles He [Tue, 15 Aug 2017 21:43:06 +0000 (21:43 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf am:
0fa9328b80
am:
b0fa5855dc
Change-Id: I9e8eeca99c2fb98281e6ec8b1d034359c4591c0e
Felipe Leme [Tue, 15 Aug 2017 21:42:40 +0000 (21:42 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880
am:
7e9f379b50
Change-Id: I1eceb903fed2c46db35c9270769bb0f8cc44150f
Android Build Merger (Role) [Tue, 15 Aug 2017 21:42:03 +0000 (21:42 +0000)]
Merge "Merge "Optionally append managed service approvals" into oc-mr1-dev am:
d87e79aae6" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 15 Aug 2017 21:38:03 +0000 (21:38 +0000)]
Merge "[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf am:
0fa9328b80 am:
51ca967453" into oc-dr1-dev-plus-aosp
Julia Reynolds [Tue, 15 Aug 2017 21:36:28 +0000 (21:36 +0000)]
Merge "Optionally append managed service approvals" into oc-mr1-dev
am:
d87e79aae6
Change-Id: I1f36654acb688769014fc1271fcc0e258f848466
Android Build Merger (Role) [Tue, 15 Aug 2017 21:35:20 +0000 (21:35 +0000)]
Merge "Merge "Remove ButtonInterface.setCarMode()" into oc-mr1-dev am:
3512953d27" into oc-mr1-dev-plus-aosp
Charles He [Tue, 15 Aug 2017 21:35:05 +0000 (21:35 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf am:
0fa9328b80
am:
b0fa5855dc
Change-Id: Iaadf2350cd86ffc598e666e0d9dc735e5a7889f0
Felipe Leme [Tue, 15 Aug 2017 21:33:01 +0000 (21:33 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev
am:
36cbdef880
Change-Id: Ie198dbbdc7ab4ea1089c7363f1b1d2df333c1d8f
Felipe Leme [Tue, 15 Aug 2017 21:32:44 +0000 (21:32 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev
am:
36cbdef880
Change-Id: I212780e8c7105aacaa15b292b36294166065219e
Charles He [Tue, 15 Aug 2017 21:32:01 +0000 (21:32 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf am:
0fa9328b80
am:
51ca967453
Change-Id: I8f4ae84ea5606706b0390b25c6aa5b5e94c2e9ce
Annie Chin [Tue, 15 Aug 2017 21:30:14 +0000 (21:30 +0000)]
Merge "Remove ButtonInterface.setCarMode()" into oc-mr1-dev
am:
3512953d27
Change-Id: Ie91b538a76c563744b6060425746decb415ae14c
Tony Mak [Tue, 15 Aug 2017 21:29:48 +0000 (21:29 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc am:
0e1976292d -s ours
am:
0958d0339f -s ours
Change-Id: I78851573da087d5aac5ea2e64641972d7a319a9b
Tony Mak [Tue, 15 Aug 2017 21:29:46 +0000 (21:29 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc am:
0e1976292d -s ours am:
13d53e0c1b -s ours
am:
61fdd81943 -s ours
Change-Id: Icc4d595980b436525c5910cb23b7732e4418b6e9
Tony Mak [Tue, 15 Aug 2017 21:27:23 +0000 (21:27 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc am:
0e1976292d -s ours
am:
0958d0339f -s ours
Change-Id: Ie615eab7d77dfd17e485ef4ae4d1add575e1578e
TreeHugger Robot [Tue, 15 Aug 2017 21:22:21 +0000 (21:22 +0000)]
Merge "Optionally append managed service approvals" into oc-mr1-dev
Charles He [Tue, 15 Aug 2017 21:16:36 +0000 (21:16 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf
am:
0fa9328b80
Change-Id: I4fc74296d3da5fef830e9ffe0eedc74bb4fb047b
Tony Mak [Tue, 15 Aug 2017 21:16:11 +0000 (21:16 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc am:
0e1976292d -s ours
am:
13d53e0c1b -s ours
Change-Id: I98885e09b3fd422d662cc9fb9e62bd67d15d76e1
Charles He [Tue, 15 Aug 2017 21:15:55 +0000 (21:15 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf
am:
0fa9328b80
Change-Id: Ib96af1de1b8205fd5d62c188bf47bc789ff6930e
Jason Monk [Tue, 15 Aug 2017 21:14:46 +0000 (21:14 +0000)]
Merge "Persist docked state so it doesn't get lost in re-inflates" into oc-mr1-dev
am:
c611e97f29
Change-Id: I3bd17c3e7f34b1c9453d5cae265477429b812630
TreeHugger Robot [Tue, 15 Aug 2017 21:12:32 +0000 (21:12 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev
Tony Mak [Tue, 15 Aug 2017 21:10:41 +0000 (21:10 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc
am:
0e1976292d -s ours
Change-Id: Ia0fb6afc42cb6bf1fb730ca7cee2f08c157890bb
TreeHugger Robot [Tue, 15 Aug 2017 21:08:17 +0000 (21:08 +0000)]
Merge "Remove ButtonInterface.setCarMode()" into oc-mr1-dev
Tony Mak [Tue, 15 Aug 2017 20:59:38 +0000 (20:59 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc
am:
0e1976292d -s ours
Change-Id: I05e3a2b19a2a9974f93a6d24ee3634fa357b3937
pkanwar [Sun, 13 Aug 2017 19:18:19 +0000 (12:18 -0700)]
Show notification when VoWiFi is active, and user is out of service for
voice.
Bug:
62618428
Test: manual
Change-Id: Ic630991da3199584dd313a8bf3138b020ecebd5c
TreeHugger Robot [Tue, 15 Aug 2017 20:48:09 +0000 (20:48 +0000)]
Merge "Persist docked state so it doesn't get lost in re-inflates" into oc-mr1-dev
Android Build Merger (Role) [Tue, 15 Aug 2017 20:47:03 +0000 (20:47 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf
Change-Id: If5cad5c0f361acda25df4d90de06821d16e689c0
Charles He [Tue, 15 Aug 2017 20:42:11 +0000 (20:42 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4
am:
159cd14334
Change-Id: Iaed779900e094a5951e24771ed1f1f55b0c1b014
Seigo Nonaka [Tue, 15 Aug 2017 20:41:33 +0000 (20:41 +0000)]
Merge "Adjust font texture cache based on device density." into oc-mr1-dev
am:
0990042116
Change-Id: I47fd84dc9832bd5a35dcccdec8344ffb29dbf30c
Android Build Merger (Role) [Tue, 15 Aug 2017 20:35:00 +0000 (20:35 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc
Change-Id: I4531fab8eab2291fcfd790d04a2661307f40dc60
Lucas Dupin [Tue, 15 Aug 2017 20:34:43 +0000 (20:34 +0000)]
Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev
am:
3d141421f8
Change-Id: Ic1216b5ace91e0284015d5b6fc6cc5252dbab876
Tony Mak [Tue, 15 Aug 2017 20:29:29 +0000 (20:29 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12
am:
f3589fded1 -s ours
Change-Id: I3b60e5cb94895fc155ba11d27ed81640eb8a2a05
TreeHugger Robot [Tue, 15 Aug 2017 20:28:51 +0000 (20:28 +0000)]
Merge "Adjust font texture cache based on device density." into oc-mr1-dev
TreeHugger Robot [Tue, 15 Aug 2017 20:24:27 +0000 (20:24 +0000)]
Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev
Winson Chung [Tue, 15 Aug 2017 20:03:20 +0000 (20:03 +0000)]
Merge "Workaround the IME dismissing when dragging PiP." into oc-mr1-dev
am:
f2f9951e92
Change-Id: I7bb267af135004889d3579bb25cc2111150dcb76
Winson Chung [Tue, 15 Aug 2017 19:49:10 +0000 (19:49 +0000)]
Merge "Workaround the IME dismissing when dragging PiP." into oc-mr1-dev
Kevin Chyn [Tue, 15 Aug 2017 19:29:52 +0000 (19:29 +0000)]
Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev
am:
990d25bda0
Change-Id: Iffeee7386623128a4228cb8efc1d6fe5af19e865
TreeHugger Robot [Tue, 15 Aug 2017 19:15:43 +0000 (19:15 +0000)]
Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev
Julia Reynolds [Mon, 14 Aug 2017 17:22:23 +0000 (13:22 -0400)]
Optionally append managed service approvals
If the backup comes from a pre O device, don't wipe
preexisting managed service grants (which were introduced
in O).
Test: runtest systemui-notification
Change-Id: Ie569972dc0d076718a3a9c59e1ebd942c5bfa987
Fixes:
64232609
Brad Ebinger [Tue, 15 Aug 2017 18:32:44 +0000 (18:32 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason" am:
53e82a9cd0 am:
b943ccef3c am:
4e13962979 -s ours
am:
d54da0bfa9 -s ours
Change-Id: I2de6e0cd4503df4562f8a7623ae2c06227701ce3
Annie Chin [Tue, 15 Aug 2017 17:07:27 +0000 (10:07 -0700)]
Remove ButtonInterface.setCarMode()
Bug:
63444779
Test: Android Auto still functions
Change-Id: If27641aedcd05ebc834c9dc0b38d18cd20ddae03
Lucas Dupin [Tue, 15 Aug 2017 18:05:04 +0000 (11:05 -0700)]
Fix broken test
Change-Id: Iee80b8ec552f960dac08bfa062c128337eb22eff
Fixes:
64715967
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
Brad Ebinger [Tue, 15 Aug 2017 18:22:55 +0000 (18:22 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason" am:
53e82a9cd0 am:
b943ccef3c
am:
4e13962979 -s ours
Change-Id: I3d3eacbbac9e2c0d73bba6268a4b1d67612195c4
Jason Monk [Tue, 15 Aug 2017 18:14:42 +0000 (18:14 +0000)]
Merge "Manuall set accessibility order of zen radio grouping" into oc-mr1-dev
am:
bcf01e7a2a
Change-Id: I82f92d68ab5f864693452262b43547f55d0d2ca4
Brad Ebinger [Tue, 15 Aug 2017 18:12:12 +0000 (18:12 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason" am:
53e82a9cd0
am:
b943ccef3c
Change-Id: Ief4564d711014cd5c139eea3dd89e18af03bf2bd
Justin Klaassen [Tue, 15 Aug 2017 18:09:13 +0000 (18:09 +0000)]
Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev am:
8d7cd4bcaa
am:
6a46200937
Change-Id: I4530101db853d033babf03318cabbfe5bfc8d2e7
Brad Ebinger [Tue, 15 Aug 2017 18:04:18 +0000 (18:04 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason"
am:
53e82a9cd0
Change-Id: I3bafca03e20ef114588145982985411882d2c8f5
Justin Klaassen [Tue, 15 Aug 2017 17:59:08 +0000 (17:59 +0000)]
Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev am:
8d7cd4bcaa
am:
aaedb0e191
Change-Id: Ie8c5318db7dfb4dfa4009e9cb34ccc618bcc8077
Charles He [Tue, 15 Aug 2017 17:54:35 +0000 (17:54 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4
Change-Id: I6bb7e6146e9a5a1a7c4721c496b1088fb3209f00
Charles He [Tue, 15 Aug 2017 17:54:05 +0000 (17:54 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4
Change-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478
Charles He [Tue, 15 Aug 2017 17:53:35 +0000 (17:53 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
Seigo Nonaka [Mon, 14 Aug 2017 21:22:56 +0000 (14:22 -0700)]
Adjust font texture cache based on device density.
The main purpose of this CL is reducing font cache size of
low-density device.
The memory usage for the small RGBA texture will be
Nexus 6P: 7,928,856 bytes (1408x1408)
Nexus 5X: 4,734,976 bytes (1088x1088)
These used to be 4,194,304 bytes
Test: manually checked
Bug:
64400885
Change-Id: Ied064a6d59909ad7fbeff74332973206436fbd34
Charles He [Tue, 15 Aug 2017 17:52:57 +0000 (17:52 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
Charles He [Tue, 15 Aug 2017 17:52:27 +0000 (17:52 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f
Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
Charles He [Tue, 15 Aug 2017 17:51:58 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0
Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
Charles He [Tue, 15 Aug 2017 17:51:28 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
TreeHugger Robot [Tue, 15 Aug 2017 17:50:49 +0000 (17:50 +0000)]
Merge "Manuall set accessibility order of zen radio grouping" into oc-mr1-dev
Brad Ebinger [Tue, 15 Aug 2017 17:41:27 +0000 (17:41 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason"
Felipe Leme [Tue, 15 Aug 2017 17:39:02 +0000 (17:39 +0000)]
Merge "Dismiss Autofill Save UI when a new Activity is launched." into oc-mr1-dev
am:
3568046048
Change-Id: If20a29f7235290d1b873d350a6e12e4bb3728769
Justin Klaassen [Tue, 15 Aug 2017 17:31:54 +0000 (17:31 +0000)]
Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
am:
8d7cd4bcaa
Change-Id: Id89bc7a8e7b64675ce269201d7afd2e0fca9040d
Justin Klaassen [Tue, 15 Aug 2017 17:31:17 +0000 (17:31 +0000)]
Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
am:
8d7cd4bcaa
Change-Id: Idfc54941a233d2b37cc4585d0064b8d86a74d465
Andrii Kulian [Tue, 15 Aug 2017 17:29:15 +0000 (17:29 +0000)]
Merge "Merge "Place black background only behind nav bar when letterboxed" into oc-dr1-dev am:
3289a5a1e0" into oc-mr1-dev
am:
144d8cb626
Change-Id: If9982b159f4e347a2b62dadc6662fa9d0e089ffd
TreeHugger Robot [Tue, 15 Aug 2017 17:22:18 +0000 (17:22 +0000)]
Merge "Dismiss Autofill Save UI when a new Activity is launched." into oc-mr1-dev
TreeHugger Robot [Tue, 15 Aug 2017 17:19:48 +0000 (17:19 +0000)]
Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
Lucas Dupin [Mon, 14 Aug 2017 17:58:40 +0000 (10:58 -0700)]
Improved WallpaperService.Engine tests
Using final variables when possible, also testing if
overlaping invalidation requests will be posted to
the handler.
Bug:
63585249
Test: runtest -x services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java
Change-Id: I01cdbdfd5313e55d7a58c77f705aea0f6f817518
Jason Monk [Tue, 15 Aug 2017 17:04:27 +0000 (17:04 +0000)]
Merge "Fix race condition crash" into oc-mr1-dev
am:
8170ea1b3c
Change-Id: I8eb6e8ce288bb3ea2930459717486fc24702060d
Andrii Kulian [Tue, 15 Aug 2017 16:51:40 +0000 (16:51 +0000)]
Merge "Place black background only behind nav bar when letterboxed" into oc-dr1-dev am:
3289a5a1e0
am:
688155cac3
Change-Id: Ie6ebda165367e5fbabff3241e40a8d6fd378b31d
Android Build Merger (Role) [Tue, 15 Aug 2017 16:48:26 +0000 (16:48 +0000)]
Merge "Merge "Place black background only behind nav bar when letterboxed" into oc-dr1-dev am:
3289a5a1e0" into oc-mr1-dev
Andrii Kulian [Tue, 15 Aug 2017 16:44:25 +0000 (16:44 +0000)]
Merge "Place black background only behind nav bar when letterboxed" into oc-dr1-dev
am:
3289a5a1e0
Change-Id: Id4069e1c1126d9658a18a448a4bd7566af938cbb
TreeHugger Robot [Tue, 15 Aug 2017 16:43:24 +0000 (16:43 +0000)]
Merge "Fix race condition crash" into oc-mr1-dev
Andrii Kulian [Tue, 15 Aug 2017 16:33:13 +0000 (16:33 +0000)]
Merge "Place black background only behind nav bar when letterboxed" into oc-dr1-dev
am:
3289a5a1e0
Change-Id: Ic1a1c1a1d023e0da39a11b4213a2276bbb42cbd6
Winson Chung [Tue, 15 Aug 2017 16:29:43 +0000 (16:29 +0000)]
Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev am:
684b056531
am:
73e3d9f58c
Change-Id: I58e6cf60e0e7448c96752b99aa25cb5ad88a09b6
Andrii Kulian [Tue, 15 Aug 2017 16:26:04 +0000 (16:26 +0000)]
Merge "Place black background only behind nav bar when letterboxed" into oc-dr1-dev
Winson Chung [Tue, 15 Aug 2017 16:22:47 +0000 (16:22 +0000)]
Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev am:
684b056531
am:
8a661ee248
Change-Id: I5b8f59e5d55914960545dbc55b9087a4410f8987
OSDN Git Service
