From 20f89c9907d9afd2be1338aaf486607ee7327fa4 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Thu, 27 Jun 2019 14:55:29 -0700
Subject: [PATCH] Clarify license terms for Romain Guy's artwork.

As discussed with Romain Guy in the email thread, the Apache 2.0
license applies to the affected .jpg files now and retroactively from
the time of import.

Usage terms updated with exiftool:

$ exiftool -UsageTerms='Apache License Version 2.0' \
    frameworks/base/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    frameworks/base/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    frameworks/base/tests/UiBench/res/drawable-nodpi/frantic.jpg
Warning: [minor] Fixed incorrect list type for XMP-xmpRights:UsageTerms - frameworks/base/tests/UiBench/res/drawable-nodpi/frantic.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    frameworks/base/tests/UiBench/res/drawable-nodpi/frantic.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy

Test: doesn't really apply to images

Change-Id: I3b9503efab871600512840531b477d3226432d58
---
 .../res/drawable-nodpi/very_large_photo.jpg   | Bin 1781694 -> 1781132 bytes
 tests/UiBench/res/drawable-nodpi/frantic.jpg  | Bin 192345 -> 191940 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg b/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg
index 7f047b1098e76528a1f3de43fed1016723e69a08..6e1a866dfb0050e367923675d59874ee1b721ef9 100644
GIT binary patch
delta 974
zcma))J8#oa6vve|JZcI}94C%rS8*u9Lqi^j2Gux`$|F)sSyEIMgycFmiHj2(+mS35
zq%zQfiL=1Qf`mXq-PqXp3M?Q2UjRM=9A8I?D={$qWF4P#{`b5-eYc)}wT>RA<`&+<
zvM9mJ6xUYtuDwUpk*5xcuU8d0P=lf4KWr+SL%mN_^;Tf^?%K8`*K3vahSFj*x7$-Y
zH`{VBv@i{=rUJiGt4Z`RP)bXJqA>EryXpAG6%@Q-y9C2(!s<MR0TJqpN{4v%*fmJ_
z<B!mS55nz)22Tn+JSbd)*M$r4lg%WkWGW`9j{{V?mo8DIgR}xRy9QtItFdJ`N*5u?
z*5N%eO<#(ocMZ(0WaJ_~E6ZBfPz{&pzU_vlOq<&wkFcb}%*w7-4V$Gl`l`o+!(7+w
z4}5Qyx?%a$h=eRN9D{1<qkdBfE_F#yA6vcxWiH={q$lxIdZraBd*i)*Vnk}Rs_S|m
zt9rwg;TtEs$Vz$o*D_me)AETM>7mKMR<?A^>5`c9Rkj45vqkuwy$Et{rn2L>=BOVF
z+|MnGkx5^k^gk^Nez07$oLp?W&cOC<Z(ut(<oo&abVY~x?b#~go5Z`oFuX(>R_52?
z9p3<pzbb0zQaiej6}8s1YRqE({Vqmy=qjk-3KiTEC7sUbzn0S4aCBop<ZaU+Bag_t
z#Pv*jBww!7W<v=tgr3B7Z*WKC!|tAH(lbp;Aalq(l0;4*Cy`UgX=DLmkTb|4auzv<
cEFmc*jj%`t;gBqnLwF>Q2uR_hCW!}`zkJ9ar2qf`

delta 1502
zcma)6zi-n(6ju71l(tFiI6qp!^(sJ6nv_-*VA6;-6;e?_D6J4;bCPRg>cqu%P|8vX
z1{fHSjtK@NkUAnZwhC5OCMW{_1z1>lwlB6X7>P)q^zP;Jd*6Hh&QA`tgYVkg`>~$k
zFEk>E^l5Bj87notLgc0?H;AR=F>1^0#*VeUh;LoHfl9hT&_eE9ZVnft2%&;e+my>I
zS5Uj5!6R^5#PnBeddU47AvzhK$YN}By`RffT5aG)gvn@!3+xlZscFV506|_OO>=dn
zI5$6A$Oq1ya&%8P-S6<}Php-#`$CRISB3K|!s2|N&7<!VB1?g=OsKG06?8olk?iY&
zL2FgHY7oWJ4QFsBl5Jp}+~u<LlQ^~KQ}XtfcupZ7TF`D|s9SZ*<m$P5UeYW+3mu#n
zpsDu$Wld>rE#me}jch6{t;fRjo0wL*Wbj2C8GkjjRhX^H9a8OT=yY3Fwm2E|dGc)M
zrP<Axq~eOQTW}`VRGxpBM1xEf{T+w}Y0}HjN<L>TkXNNCkMmeM<Hc_R{Erga@TT_l
zY^V(qDhRn*elBM-{1SNcgu5E<isNegG7SZty^y}hjQ7fmwDbj*`<y-&;!hOn&z-t%
z>1JK;G}=v#j&N3`2PuiZPK7ysgsVs|$CD9EZ^oy)3cO4lr~C1-BrX$EZy8k*tWQ70
z1v-|vG~n(SjzvEd=<P&_4fP^%^1p|Iy_Fr```Z&;U*?0o3-m`O<=-s!a(Pd?vi^NB
zEL<$vH(9+$;Ct3+=uHzXS(c$zT9&FeXRhl_J57wLs%SIob;Te{nz~KUTn@fMaFwUz
zE=My11!d5$nQ?FUUXb)Kntc?_MgTp4UO*q9A20wI1PlR=0HT0lz)`>mU=%P0hymh&
Z1V8|YfFwWyqyT9^29SLh&5l11{s0rqU1<OS

diff --git a/tests/UiBench/res/drawable-nodpi/frantic.jpg b/tests/UiBench/res/drawable-nodpi/frantic.jpg
index 4c623336e15b4bab4cd18246d423880244605fc5..856b41950d81fc9f6be92976b585400e9100a969 100644
GIT binary patch
delta 634
zcmZuvO-tiY6s2`^(JoBed^k1g1Ca+KHjOZXp%z*kVL%YSW}hanHJT<hNg=CoF);ps
z`v(+vuH1?HSq%PxsfhCjT=)lEc=IB*4zqgPch5bXbMC$SoBws6zj~g`jz2&~RG}=0
z8`QM@7Bjri=(5PvD2a`@+l!9Y=+~~<VTSP~cG`Qs?-IRQSzV#^TrIHM#?JZ%iMuY2
zVYNn~CoF!zUJh;~RiHFSUb|*L#%@Lw1%^DDUa4yMr6Ck9WeO9@XBgnSFMooc@*JqL
z4(C!S!+9o0cx(%41_GJGNkVG2Wmo|-BR@z=!X@ppV`RN8%&*k6L?W-Tr@aR!vw_n&
zh{AtI^@5bA@siEjX5Wn{Y!{~fLp7XDn8JSRkXg}?s%dsm#a3|vPKqDlqF9FCMHQa#
z6-(1#lxCn+Do>{hIrdfI8xfpIV(Nc1N8Aa|Q5{R7`!3B6W0FT=Lf8)X#=-L(ToKiD
zXAKv10=jIDxU4sNrggx`reiTLWaJwQLdW;Wa;2Jzbe+^3&y-Unia{5ZM8Z@G!gIjG
X(D>~ncT~^)@RU<e$y|F%_VLdPa)G?D

delta 1171
zcmbtSJ#W)M7^dMPQZo?Owy3HqT#XPyX<`FK2$NK#sbDHXDM+km`;s2DeeL;-%*4Qe
z*pP1LH?T1wgv5V90f|4r$iTvY?`)j7H3Q(quV25<^SmF=$1jcP*T$QlXKQuJ54Bak
z($uyL=n)6mVPpr0LDK+<odgGLzi&L+xetbfBCyfj=vv0+A^@OAy|F#oz5|lLPa)}7
z-{7p-?q|P$S8SumrTBnh5(0sM4vAUcFa$;MWE7s8GMG!?X2Fma^gP$5c(TVLsaim!
z{4P2yW%+Gge`X{d4~=2$Gh=f^0*FI!H-6ePg}RSR^&rcZX?kXrr0Bz?2r@#CPzc^R
zhSRb|9xh#QX3a|Rxgs%`kU7pMbfVaKj9gZsvjr!mEWfT^Y!@>5QPLrYkX8=NiQ1~?
z_57s@)+?|NaDb}8@741K__MlJ#6Q%QRS;#+a-(wA@>JZ?v_S@vr~C__q^2B6N2GQU
z-fimj#hGRJioV*Kb#vr8^2afo48>vb6O@`f2uK)#0b>+9v2bnY9tlMnQ5QqMv%3c=
z8u)l0fva7sa!-G7RnfNnFoF}_)*Ced#2Rk>^BS@R%n$!cYn>8w|G^96MDl9qP=d$i
zm9Ax`DRXYa@04q2vYt6p)^o$ZR@U<9d-GBr?I@S?Xj!>&GH*-1Kj_N~C!SCB7gK%V
K?NqOQ`}7M|Q7ZQU