OSDN Git Service
Jean-Michel Trivi [Wed, 16 Aug 2017 17:44:10 +0000 (17:44 +0000)]
AudioService: device connection intent: never send null action am:
87a264dfde am:
c164123cc3
am:
9d71ca593f
Change-Id: I081315c162f7d8c064baa42115c35ae550bbe013
Matthew Ng [Wed, 16 Aug 2017 17:38:19 +0000 (17:38 +0000)]
Merge "Fixes quick switch animations for low end devices" into oc-mr1-dev am:
0877b99aaf
am:
c9e95c66f4
Change-Id: I771ab6487432bce908a2d511249eacf2ea5b2002
Mathieu Chartier [Wed, 16 Aug 2017 17:31:20 +0000 (17:31 +0000)]
Merge "Add some preloaded classes related files and tools" into oc-mr1-dev am:
d74d35d43e
am:
f0ab2143c1
Change-Id: I7a302374ce8f0b5f274b0ef6f6b10d2c0819c547
Pankaj Kanwar [Wed, 16 Aug 2017 17:22:48 +0000 (17:22 +0000)]
Merge "Show notification when VoWiFi is active, and user is out of service for voice." into oc-mr1-dev am:
539c15ec84
am:
45d1aadd50
Change-Id: Ie61db69d0fc26d83f34399ac892e0129319bc318
Christopher Tate [Wed, 16 Aug 2017 17:15:08 +0000 (17:15 +0000)]
Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev am:
4b7b5a6c59
am:
2402e4b385
Change-Id: Ia9131e41b536a4cccd154d58d7662bc2aa92beb2
TreeHugger Robot [Wed, 16 Aug 2017 16:58:57 +0000 (16:58 +0000)]
Merge "Change test assumptions about formatting the GMT timezone"
Felipe Leme [Wed, 16 Aug 2017 16:38:18 +0000 (16:38 +0000)]
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev am:
6ba128762f
am:
486ecbe517
Change-Id: I31e4df984dee929ee7efef64aaa957a80be9d1a5
TreeHugger Robot [Wed, 16 Aug 2017 14:26:28 +0000 (14:26 +0000)]
Merge "thermalservice: future-proofing fixup to Temperature constructor"
TreeHugger Robot [Wed, 16 Aug 2017 12:47:57 +0000 (12:47 +0000)]
Merge "Use the faster path when calling drawImageRect."
TreeHugger Robot [Wed, 16 Aug 2017 10:01:05 +0000 (10:01 +0000)]
Merge "Load Smart Select stroke color from colorControlActivated"
Todd Poynor [Wed, 16 Aug 2017 06:25:36 +0000 (23:25 -0700)]
thermalservice: future-proofing fixup to Temperature constructor
Change the default constructor to leverage the constructor with params
specified, to avoid future code duplication if more logic is added to
constructors in the future.
Test: manual: marlin with temporary java thermal event listener
Bug:
30982366
Change-Id: I0be55fe2561f606ddf1bcebb98ae7e1120ff8d2d
Jean-Michel Trivi [Wed, 16 Aug 2017 02:53:01 +0000 (02:53 +0000)]
AudioService: device connection intent: never send null action am:
87a264dfde
am:
c164123cc3
Change-Id: I5a7cf9ff44f72ac464aca3355af0066234f14d80
Jean-Michel Trivi [Wed, 16 Aug 2017 02:42:56 +0000 (02:42 +0000)]
AudioService: device connection intent: never send null action
am:
87a264dfde
Change-Id: I1fd6f458bdc4a66a9d2a65d6f7d1bbdcf93b270a
Matthew Ng [Wed, 16 Aug 2017 02:33:30 +0000 (02:33 +0000)]
Merge "Fixes quick switch animations for low end devices" into oc-mr1-dev
am:
0877b99aaf
Change-Id: Icdfd18fb09263267daef0d0c6e8ea7d6fad5dec1
TreeHugger Robot [Wed, 16 Aug 2017 02:28:52 +0000 (02:28 +0000)]
Merge "Fixes quick switch animations for low end devices" into oc-mr1-dev
Mathieu Chartier [Wed, 16 Aug 2017 01:38:55 +0000 (01:38 +0000)]
Merge "Add some preloaded classes related files and tools" into oc-mr1-dev
am:
d74d35d43e
Change-Id: I62955b6a6bf4142387b00cfc83bdd1995b77f0e3
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
Mathieu Chartier [Wed, 16 Aug 2017 01:26:36 +0000 (01:26 +0000)]
Merge "Add some preloaded classes related files and tools" into oc-mr1-dev
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
Jean-Michel Trivi [Wed, 16 Aug 2017 00:52:22 +0000 (17:52 -0700)]
AudioService: device connection intent: never send null action
Change
145c95342c9c removed a test on the type of device for which
a ACTION_HEADSET_PLUG intent is broadcast. As a result, for some
devices (e.g. DEVICE_OUT_USB_DEVICE), there is a code path in
AudioService.sendDeviceConnectionIntent() where the intent's
action is not set, causing a WTF exception to be thrown for
the broadcast.
The fix consists in always checking that the intent will be sent
with a non-null action.
Test: connect a USB device recognized as DEVICE_OUT_USB_DEVICE
Bug:
64724117
Change-Id: Ib2a486d1fabbde58d6a8f8370d5803c694977ee1
TreeHugger Robot [Wed, 16 Aug 2017 00:42:50 +0000 (00:42 +0000)]
Merge "Add APF black list for ether-type"
TreeHugger Robot [Wed, 16 Aug 2017 00:12:02 +0000 (00:12 +0000)]
Merge "Remove references to deprecated NetworkBadging class."
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:47:23 +0000 (23:47 +0000)]
Merge "Restructure TSMS"
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
TreeHugger Robot [Tue, 15 Aug 2017 23:27:15 +0000 (23:27 +0000)]
Merge "Remove useless open modes"
Felipe Leme [Tue, 15 Aug 2017 23:03:48 +0000 (23:03 +0000)]
Merge "Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880 am:
a3c2cee055 am:
ab380663bf" into oc-mr1-dev-plus-aosp
am:
75b5da36b6
Change-Id: Ib43f02cf91ba142e458ec654a048ffa4fb3f22d4
Lucas Dupin [Tue, 15 Aug 2017 22:57:25 +0000 (22:57 +0000)]
Merge "Merge "Fix broken test" into oc-mr1-dev am:
d8e7cb4b47" into oc-mr1-dev-plus-aosp
am:
7d19cf933d
Change-Id: I2321cc45dfbfc512658fe9906a3a65e67fd9c165
Charles He [Tue, 15 Aug 2017 22:53:41 +0000 (22:53 +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
am:
4d49e35932
Change-Id: Iadd6e9b6085f31fb60b14ba2d845417feb94a450
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
Felipe Leme [Tue, 15 Aug 2017 22:47:43 +0000 (22:47 +0000)]
Merge "Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880 am:
a3c2cee055 am:
2220049d58" into oc-mr1-dev-plus-aosp
am:
de990509ab
Change-Id: I74121c3541c22f45cfb97b5fd4661cd59d574eb0
Felipe Leme [Tue, 15 Aug 2017 22:42:54 +0000 (22:42 +0000)]
Merge "Merge "Additional documentation about Autofill / WebView security." into oc-dev am:
36cbdef880 am:
7e9f379b50 am:
82e7dfcae8" into oc-mr1-dev-plus-aosp
am:
11435f8153
Change-Id: Id3b356d237d0758180c227c7d452236487eb18aa
Mathieu Chartier [Tue, 15 Aug 2017 20:37:07 +0000 (13:37 -0700)]
Add some preloaded classes related files and tools
Added copyright-header to be used by generation scripts to
automatically add a copyright header to preloaded classes.
Add a default blacklist file to avoid needing to manually
remove classes that can't be preloaded in the zygote.
Added a script go generate a preloaded classes list from a raw class
list. This script adds the copyright headers and comments and removes
blacklisted classes.
Bug:
37966211
Test: manually run the scripts
Change-Id: I166f990c41978c80134d2f1e12c1b1079a12752a
Charles He [Tue, 15 Aug 2017 22:28:49 +0000 (22:28 +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
am:
349f02977d
Change-Id: I6888a1024fd273c29d374dadc80d93964a49af08
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
Charles He [Tue, 15 Aug 2017 22:23:55 +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:
51ca967453" into oc-dr1-dev-plus-aosp am:
5ee440bbcc" into oc-mr1-dev-plus-aosp
am:
417557193c
Change-Id: Id68f2e8108f281a971d4adf8dfa17762f862df9d
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
Tony Mak [Tue, 15 Aug 2017 22:13:39 +0000 (22:13 +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
am:
fd38478951 -s ours
Change-Id: I6d50dc9a3b6f175aa75be301ed59d70fc9dd72ea
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
Tony Mak [Tue, 15 Aug 2017 22:07:49 +0000 (22:07 +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
am:
a8a89ebed7 -s ours
Change-Id: Idc3c17691964b9ca8f445d07d22c5e41983b1730
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
Julia Reynolds [Tue, 15 Aug 2017 21:59:50 +0000 (21:59 +0000)]
Merge "Merge "Optionally append managed service approvals" into oc-mr1-dev am:
d87e79aae6" into oc-mr1-dev-plus-aosp
am:
94bd234479
Change-Id: I5d8a7dafb0b3938324df494ee49c644a47ef6d96
Matthew Ng [Thu, 10 Aug 2017 22:37:19 +0000 (15:37 -0700)]
Fixes quick switch animations for low end devices
Currently using quick switch is fine but sometimes with animation
glitches but very reproducible if tapping recents button very fast. The
problem is that low end device Recents entrance animation also has the
previous tasks animating downward causing more chances of animation
instability.
The problem is that transition is not finished and it is already
starting to do the next toggled animation. When the transition from
app to recents (RecentsImpl.toggleRecents) starts without finishing
RecentsActivity.onStop, the previous frame will be visible for a couple
of frames before the entrance animation starts (having the previous task
animate down). Therefore restrict toggling to after
RecentsActivity.onStop would allow the previous frame to finish and the
transitions run normally.
Bug:
62251652
Fixes:
64401391
Test: manual - using gobo device, launch multiple apps, rapidly tap recents
button
Change-Id: I4e70434bca3c9bec287fa30559b23a1e71b5ef20
Ahmed ElArabawy [Wed, 2 Aug 2017 20:31:05 +0000 (13:31 -0700)]
Add APF black list for ether-type
Add a configurable black for protocols which packets are to be dropped
by APF. This enales an OEM to configure the APF to filter out un-needed
packets from reaching the host
Bug:
62415182
Test: runtest frameworks-net
Change-Id: I86335a0f854d5e83a2b2767978cd69b2cc25c2f8
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
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
Annie Chin [Tue, 15 Aug 2017 21:47:02 +0000 (21:47 +0000)]
Merge "Merge "Remove ButtonInterface.setCarMode()" into oc-mr1-dev am:
3512953d27" into oc-mr1-dev-plus-aosp
am:
e22c929e85
Change-Id: I38fa21c27e779ecdafb53124ce4c97e5d030ad7a
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
Tony Mak [Tue, 15 Aug 2017 21:42:12 +0000 (21:42 +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
am:
cbf317b731 -s ours
Change-Id: I8455028c0a6ccaf195077d00b9b20c1387b9badd
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
Jason Monk [Tue, 15 Aug 2017 21:31:59 +0000 (21:31 +0000)]
Merge "Persist docked state so it doesn't get lost in re-inflates" into oc-mr1-dev am:
c611e97f29
am:
b1db79db96
Change-Id: I2c900104e46a9a9c23a1faca89806f02924de7ec
Roozbeh Pournader [Tue, 15 Aug 2017 21:31:50 +0000 (14:31 -0700)]
Change test assumptions about formatting the GMT timezone
The test assumed a certain format, which was changed with a recent
update in ICU.
Change-Id: Ib324142b7aec4e0296f49d0b4d5d53de200a4da1
Fixes:
64677938
Test: bit FrameworksCoreTests:android.text.format.
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
Seigo Nonaka [Tue, 15 Aug 2017 21:01:48 +0000 (21:01 +0000)]
Merge "Adjust font texture cache based on device density." into oc-mr1-dev am:
0990042116
am:
31b3091576
Change-Id: I500779fb39fa1758cc688c49272cd14b4d3b4f52
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
Lucas Dupin [Tue, 15 Aug 2017 20:50:54 +0000 (20:50 +0000)]
Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev am:
3d141421f8
am:
6f8363aea2
Change-Id: I7b6e15910762f9f7ef2b3576778e3f00fc7dd5cd
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
Eric Schwarzenbach [Fri, 4 Aug 2017 23:38:07 +0000 (16:38 -0700)]
Remove references to deprecated NetworkBadging class.
Cleanup. Replaces references to the badging enums with
AccessPoint.Speed. Recreates getWifiIcon functionality in Utils class.
Bug:
62355275
Test: manual (no behavioral changes)
Change-Id: I33fa70e3680431fd234a92e989f89dbe04798ad2
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
OSDN Git Service
