Commit Graph

927 Commits

Author SHA1 Message Date
Henri Chataing
5db4bef9d5 Revert^2 "Remove samples for deprecated Android Beam API"
8de7b4b166

Change-Id: I415762b2fcbc9706a33d7a41858c1c142bb7ffab
Merged-In: I415762b2fcbc9706a33d7a41858c1c142bb7ffab
(cherry picked from commit 614c1aec90)
2023-03-14 23:27:34 +00:00
Hongwei Wang
5f56b6a2d7 Support aspect ratio change in PiP demo am: 0373c0b168
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/20655734

Change-Id: Id9fed6a36eb9fa389f92f21e71af77feccca7694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 19:20:40 +00:00
Hongwei Wang
0373c0b168 Support aspect ratio change in PiP demo
For testing and demo purpose, currently support selecting from well
defined list of aspect ratio, include 21:9, 16:9, 1:1, 9:16 and 9:21

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/gqFQI7mpeQ6EZZ5JibsV6R
Bug: 198643358
Test: Change aspect ratio within the app, see video
Change-Id: I0580dc45bf32e795fefd7d80f5183f268f810790
2022-12-06 15:11:17 -08:00
Treehugger Robot
123b01e28f Merge "Fix errorprone warnings that should be errors" am: eb8582344b
Original change: https://android-review.googlesource.com/c/platform/development/+/2254753

Change-Id: I3ab35338f5e066a20adf163ebbff21d4b6cf0172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 16:38:28 +00:00
Cole Faust
a54b856e8d Fix errorprone warnings that should be errors
This commit is part of a large scale change to fix errorprone
errors that have been downgraded to warnings in the android
source tree, so that they can be promoted to errors again.
The full list of changes include the following, but not all
will be present in any one individual commit:

BadAnnotationImplementation
BadShiftAmount
BanJNDI
BoxedPrimitiveEquality
ComparableType
ComplexBooleanConstant
CollectionToArraySafeParameter
ConditionalExpressionNumericPromotion
DangerousLiteralNull
DoubleBraceInitialization
DurationFrom
DurationTemporalUnit
EmptyTopLevelDeclaration
EqualsNull
EqualsReference
FormatString
FromTemporalAccessor
GetClassOnAnnotation
GetClassOnClass
HashtableContains
IdentityBinaryExpression
IdentityHashMapBoxing
InstantTemporalUnit
InvalidTimeZoneID
InvalidZoneId
IsInstanceIncompatibleType
JUnitParameterMethodNotFound
LockOnBoxedPrimitive
MathRoundIntLong
MislabeledAndroidString
MisusedDayOfYear
MissingSuperCall
MisusedWeekYear
ModifyingCollectionWithItself
NoCanIgnoreReturnValueOnClasses
NonRuntimeAnnotation
NullableOnContainingClass
NullTernary
OverridesJavaxInjectableMethod
ParcelableCreator
PeriodFrom
PreconditionsInvalidPlaceholder
ProtoBuilderReturnValueIgnored
ProtoFieldNullComparison
RandomModInteger
RectIntersectReturnValueIgnored
ReturnValueIgnored
SelfAssignment
SelfComparison
SelfEquals
SizeGreaterThanOrEqualsZero
StringBuilderInitWithChar
TreeToString
TryFailThrowable
UnnecessaryCheckNotNull
UnusedCollectionModifiedInPlace
XorPower

See https://errorprone.info/bugpatterns for more
information on the checks.

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Ic7e78cc74523ee09c1b4aa9969756f0cfd609e08
2022-10-15 21:33:28 -07:00
Cole Faust
676d6510d2 Merge "Fix array-related errorprone warnings" am: 159371eef5 am: 201f62aa05 am: db8f0c7c2d am: a81487ec4c
Original change: https://android-review.googlesource.com/c/platform/development/+/2184500

Change-Id: I8e8ed3f15fab4b4826b15417fb4cd62aa56c6827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 00:26:34 +00:00
Cole Faust
159371eef5 Merge "Fix array-related errorprone warnings" 2022-08-22 22:51:09 +00:00
Cole Faust
1bb113c2fc Fix array-related errorprone warnings
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Iaecb05992482dfea041e51e3978d0d51d4ca2ce8
2022-08-15 18:24:25 -07:00
Hongwei Wang
8d408e82c1 Add ability to enter PiP on back pressed in ApiDemos
Bug: 235268241
Test: Press back when in com.example.android.apis/.app.PictureInPicture
Change-Id: I8ceaaf3b1215505bd4919ef5f5da291df62c1049
2022-06-27 11:27:03 -07:00
Hongwei Wang
b5b10c1e42 Integrate custom close action in ApiDemos for PiP
The demo Activity simply finishes itself when it receives the callback
from the close action PendingIntent.

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/fR0hxeorlYrxXyzfZ02btK
Bug: 223896879
Test: see video
Change-Id: I94797b666fbcd630c828463668d9bc4e07274cd8
2022-04-19 15:25:54 -07:00
Mateusz Cicheński
465b945910 Add API demo for keep clear areas.
Bug: 183746978
Test: manual, via extra logging added in DisplayController#onKeepClearAreasChanged
Change-Id: Id291320cdb0ea502c0ff359677f218504c1df597
2022-03-21 17:47:54 +00:00
Hongwei Wang
ec0d9449a1 Add demo for content PiP
Bug: 165793661
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/e9Mp5rvxYBrNOdGSUoSXHO
Test: manual, see Video
Change-Id: I026844cf5eabf30fe553641b36daed6e31e4f893
2022-02-09 16:19:12 -08:00
Hongwei Wang
17aab38616 Consolidate PiP demos in ApiDemos app
Put various configurations for PiP into one Activity, access by navigate
to `App > Activity > Picture in Picture`. Current supports

- Enter PiP with on-screen button
- Enter PiP by swiping up to home or tap on home button
- Toggle the auto enter PiP flag on and off
- Toggle the source rect hint on and off
- Toggle the seamless resize flag on and off
- Change the position of current and next source rect hint
- Tablet layout on foldables

The upcoming content PiP will also be hosted here.

Added also support passing the intent extra, full command

```
adb shell am start \
    --ez auto_pip [true|false] \
    --ez source_rect_hint [true|false] \
    --ez seamless_resize [true|false] \
    --es current_position [start|end] \
    com.example.android.apis/.app.PictureInPicture
```

Bug: 175727044
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/gdcklbUsT7SmbUhNcVSXfd
Test: manual, see Video
Change-Id: I60233f2d6e428d11d4ab1b566e36c38fd4c4f937
2021-12-21 13:48:31 -08:00
Hongwei Wang
ede9b8a1e5 Merge "Use FixedAspectRatioImageView to demo auto-enter-pip" into sc-dev am: 0e4d25a19e am: c87def1edb
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15055021

Change-Id: I8892827e3e9566c57edae397a4ce13c4ef408d57
2021-07-15 00:19:46 +00:00
Hongwei Wang
e60d337804 Merge "Use FixedAspectRatioImageView to demo auto-enter-pip" into sc-dev am: 0e4d25a19e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15055021

Change-Id: Idc4f1d75aae9c5e6aeb493c9585c9215cd282d2c
2021-07-15 00:07:30 +00:00
Hongwei Wang
31c5071a72 Use FixedAspectRatioImageView to demo auto-enter-pip
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/bpKcGg1eoOo5Jz5U6IwBYK
Bug: 191310680
Test: manually auto-enter-pip from landscape, see video
Change-Id: I30a728331f0ffa48c537be7b2611dba0b2df053a
2021-07-12 16:07:23 -07:00
Yuntao Xu
aba34f50cc Convert Android.mk to Android.bp
1. Convert ApiDemos/Android.mk to ApiDemos/Android.bp;
2. Convert ApiDemos/tests/Android.mk to ApiDemos/tests/Android.bp

Bug: 186778349
Test: compared the apk files built by Make and Soong
Test: TreeHugger
Change-Id: I7b72a998b56804e647d0908be5a118f9bf2cd896
2021-05-18 23:08:25 -07:00
Hongwei Wang
d1cc26450c Fix flicker in ApiDemos when auto enter PiP from landscape
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/cNwi8qI0qukRlaIwutzclD
Bug: 179720719
Test: auto enter PiP from landscape using ApiDemos app, see video
Change-Id: Ic421b3766fbc15bf699885863710a14c3178867f
2021-05-12 19:39:23 -07:00
Treehugger Robot
3291dd14f1 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: e748063d28 am: 347249060a am: dafb7fc537
Original change: https://android-review.googlesource.com/c/platform/development/+/1682225

Change-Id: I8f5e6007cd6803d4dcbfd498045366761be718a2
2021-04-21 20:01:08 +00:00
Bob Badour
40a7447daa [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/Development/Android.mk
  apps/DumpViewer/app/src/main/Android.mk
  apps/OBJViewer/Android.bp
  samples/ApiDemos/Android.mk
  samples/ApiDemos/tests/Android.mk
  samples/HeavyWeight/Android.bp
  samples/IntentPlayground/Android.mk
  samples/MultiClientInputMethod/Android.mk
  samples/MultiDisplay/Android.mk
  samples/MySampleRss/Android.bp
  samples/RenderScript/HelloCompute/Android.mk
  samples/RenderScript/Levels/Android.mk
  samples/ShortcutDemo/launcher/Android.mk
  samples/ShortcutDemo/publisher/Android.mk
  samples/ShortcutSample/Android.mk
  testrunner/tests/Android_java.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I535f73ffa885f723b9dca745f199ce3a3fd409ea
2021-04-20 14:03:26 -07:00
Christopher Tate
6075c16c08 Update to track FGS API development
FGS notification deferral control is now a tri-state.

Bug: 171499612
Bug: 179290175
Test: ApiDemos foreground service paths
Change-Id: Ie426fb64b998ba452ff92f0231811679946500ff
2021-03-23 17:52:14 +00:00
Hongwei Wang
511635184c Fixed the aspect ratio in PictureInPictureAutoEnter
Since the actual aspect ratio is defined in layout file, measuring the
value in layout change listener can only cause irrelevant
onTaskInfoChanged callbacks sent to SysUI due to 1px difference.

Bug: 180630127
Test: enter PiP w/ autoEnter from landscape in button navigation
Change-Id: I25dcf82bfbebde017c2c938d745c23d615a7015b
2021-03-04 16:39:21 -08:00
Hongwei Wang
5e8ce64de0 Use a single TextView to demonstrate seamlessResize
For easy side-by-side comparison turning on/off seamlessResizeEnabled
flag. Adjusted also the wording to emphasize the recommended usage.

Bug: 152554547
Test: use the ApiDemos app
Change-Id: I1fbeee2479d9e93614d040d10e01f9fe2fb4c8d4
2021-03-01 11:24:28 -08:00
Hongwei Wang
35faf69308 Add demo for autoEnterPip w/o sourceRectHint
Video: http://rcll/aaaaaabFQoRHlzixHdtY/cdY8k6V9uhJEXyMAKAUA34
Video: http://rcll/aaaaaabFQoRHlzixHdtY/bvodLNGyrIXH8DSvGHehrp
Bug: 179286893
Test: manual in ApiDemos app, see video
Change-Id: Ib1ae64e24c901d2a921b0b5d40bffb196f8121ba
2021-02-08 16:51:58 -08:00
Galia Peycheva
6160e125d4 Merge "Revert "Remove public usages of FLAG_BLUR_BEHIND"" into sc-dev 2021-02-03 05:49:40 +00:00
Galia Peycheva
e8627d6c0b Revert "Remove public usages of FLAG_BLUR_BEHIND"
Revert "Add pid and uid to SF::setClientStateLocked"

Revert "Add USE_BACKGROUND_BLUR to cts expected permissions"

Revert submission 13350963-blur_system_api

Reason for revert: This topic made blurs a system api. API council voted against that and we will instead aim to make it public for S. None of these changes are relevant in that case.

Reverted Changes:
I3683db296:Remove public usages of FLAG_BLUR_BEHIND
I23b21b603:Add USE_BACKGROUND_BLUR to cts expected permission...
Id21f03793:Add pid and uid to SF::setClientStateLocked
If5d8344a5:Add permission for blur SystemApi
I70d1e1715:Add permission check for blurs in SurfaceFlinger
Icf98c3607:Make window background blurs SystemApi
I0b881ec6e:Make BackgroundBlurDrawable a SystemApi

Bug: 177523043
Change-Id: Ic1f1657eee370a2fcc625c28f876c34e3e0427e9
2021-02-01 10:43:52 +00:00
jorgegil@google.com
371e9e86f1 Add Api Demo for PiP source rect hint
- Demonstrates the source rect hint API (on enter and exit)
- Invoke path: App -> Activity -> Picture In Picture Source Rect Hint

Video: http://rcll/e8RgaQ0dFlwFuh0c7GRpyy/cCQiDoYLvfJ4dKwQQbsaYC
Bug: 167447693
Test: m -j ApiDemos
Change-Id: I80b41b017b021bf6da16a21fe9d5bf8ec0c35ea5
2021-01-28 21:17:30 +00:00
jorgegil@google.com
66780efd43 Add ApiDemo for PiP seamless resize
- Demonstrates the seamless resize API (both enabled and disabled)
- Invoke path: App -> Activiy -> Picture In Picture Seamless Resize

Video: http://rcll/e8RgaQ0dFlwFuh0c7GRpyy/UVHnwihysd2to0Py2IqU2
Bug: 152554547
Test: m -j ApiDemos
Change-Id: I331a0d60e5a93c24c1ad48bb1cdcda9570c0337d
2021-01-25 13:43:55 -08:00
Hongwei Wang
e07065a463 Merge "Add ApiDemo for PiP auto enter API" 2021-01-21 21:54:07 +00:00
Hongwei Wang
b0715f27ef Add ApiDemo for PiP auto enter API
- Demonstrates the autoEnterPip API with multi-activity in original task
- Invoke path: App -> Activity -> Picture in Picture Auto Enter

Video: http://rcll/aaaaaabFQoRHlzixHdtY/gIO4G5dybW7tJWXihkhXfE
Bug: 177335910
Test: m -j ApiDemos
Test: see video
Change-Id: If69116dd52476ead8cc46dc3475447d4bfa64ff8
2021-01-18 16:03:55 -08:00
Galia Peycheva
a4af55c95a Remove public usages of FLAG_BLUR_BEHIND
WindowManager.LayoutParams.FLAG_BLUR_BEHIND has been deprecated since
2011 and has been a no-op ever since.
We are @remove-ing it in S and making it a SystemApi to be used for
cross-app blurs. To that end, we have to remove its public usages.

This CL removes its usage in ApiDemos.

Bug: 177524486
Test: m
Change-Id: I3683db296e8331a9d255d39f23fad7dedc28bb9b
2021-01-15 08:18:47 +01:00
Christopher Tate
e99b9c4ff5 Exercise new 'show immediately' FGS notification
Bug: 171499612
Test: ApiDemos foreground service suite
Change-Id: Iff2cef9a13ee0cd13e5b98d1a6ce59e77e6054a4
2020-11-16 13:48:23 -08:00
Michael Bachman
8c28d0a1c1 Android Inclusive Code Fixit: removing "sanity" from logging line where it is not needed.
Change-Id: Idc20e7e0efad4b1fc6f04e844105339fb4774210
Bug: 162536543
2020-07-31 20:24:08 +00:00
Jeff Sharkey
29bc7dcc26 Update language to comply with Android’s inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Change-Id: I56dd8778516103367dc17ae55bdff4457185de46
2020-07-30 20:05:08 -06:00
Linus Tufvesson
084c24eff0 Only show Presentations on suitable displays
Bug: 141745510
Test: Manually verifed, App > Activity > Presentation
Change-Id: I0ca4c18bab97f46971ae3eae29e34e74ed6a5810
2020-07-30 13:52:05 +00:00
Nick Cook
7a58326f08 docs: Fix outdated sample code in Context#getExternalFilesDir. Test: make ds-docs
am: f767eb4aa9

Change-Id: I0a5d7d6f6fa9b28f650891d4a70b7efbcc053f45
2019-08-19 18:04:42 -07:00
Nick Cook
f767eb4aa9 docs: Fix outdated sample code in Context#getExternalFilesDir.
Test: make ds-docs

Bug: 129290716
Change-Id: I0b1c1d9222c96c6bb2777f58d273546c81d77eb2
2019-08-20 00:45:50 +00:00
Bob Badour
801760580f Merge "Clarify license terms for Romain Guy's artwork." am: a37de64bd6
am: fb5f7546b0

Change-Id: I964e6ca1dcc1bf15925d79a80e9707d8e691c4d8
2019-06-27 20:31:48 -07:00
Bob Badour
e72c60e885 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 using exiftool:

$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/ApiDemos/res/drawable-nodpi/frantic.jpg
Warning: [minor] Fixed incorrect list type for XMP-xmpRights:UsageTerms - development/samples/ApiDemos/res/drawable-nodpi/frantic.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/ApiDemos/res/drawable-nodpi/frantic.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p3.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p3.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p2.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p2.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p3.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p3.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p2.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p2.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy

Test: doesn't realy apply to images

Change-Id: If060c6ba0f0279e3a7e6446061d50cd8e4cdec3c
2019-06-27 14:58:10 -07:00
Bob Badour
3bdea97ab6 Merge "Clarify license terms for Romain Guy's artwork." am: 0e3bcf70c5
am: bcd745dddc

Change-Id: I330e55df545251008c1940ec9b22732799de7fc5
2019-06-05 14:59:37 -07:00
Bob Badour
d41e5f7851 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.

Each of the images was altered using the exiftool:

exiftool -WebStatement=http://www.apache.org/licenses/LICENSE-2.0

Change-Id: I557d0129617164209a3eec7ec2d228f266643ca0
2019-06-05 20:08:08 +00:00
Ivan Chiang
2388037eac Add the sample of adding query content in intent
Add the query content in intent

Bug: 119866469
Test: manually using ApiDemos Content > Storage > Documents
Change-Id: I97ccd1ca6d3e1ecbddefe353b625c145d4c0ecd0
2018-12-27 21:35:15 +08:00
Amin Shaikh
8109cdef05 Test StorageVolume#createOpenDocumentTreeIntent
Also fix bug where persistent uri access was not taken for
OPEN_DOCUMENT_TREE intents.

Change-Id: Iccc3e2434e08e42fa84dc3ceb3fbfe1db1320180
Fixes: 119519300
Test: manually using ApiDemos Content > Storage > Documents
2018-12-18 15:06:58 -05:00
Louis Pullen-Freilich
1496f57583 Removes framework Preference demos
The framework Preference APIs are deprecated, so these samples are
misleading and should be removed.

Trying to submit again now that the relevant sample tags have been removed.

Bug: b/119602280
Test: n/a
Change-Id: I7efb509f5c938122575cf4177b50872bfc089d00
2018-11-19 18:05:33 +00:00
Louis Pullen-Freilich
4b364839bd Revert "Removes framework Preference demos"
This reverts commit 946280d6ce.

Reason for revert: Breaking builds due to doc generation using these samples

Change-Id: I7caf9792e84e0e1eedea4a7294a321c684be2d5c
2018-11-16 18:26:28 +00:00
Louis Pullen-Freilich
946280d6ce Removes framework Preference demos
The framework Preference APIs are being deprecated, so removing the
samples will help avoid confusion.

Bug: b/119602280
Test: n/a
Change-Id: Ib3a2c38b8fbb0f1afc9ef6a35963def46ee931f7
2018-11-15 12:51:50 +00:00
KOUSHIK PANUGANTI
7f203340ff Migrated various apps under development/samples/ApiDemos to androidx
Bug: 76692459
Test: make ApiDemos
Change-Id: Ie02783ba14b294a220383a3d53e96a6fdb3117b8
2018-04-24 17:13:55 -07:00
Vladislav Kaznacheev
0af910ed69 Merge "Use menu shortcuts in ApiDemos" into pi-dev am: 08207ad842
am: 413f32b4cf

Change-Id: I18463149d3755b1a558dd3c068afaf9fc6f536cf
2018-04-23 14:41:25 -07:00
Vladislav Kaznacheev
603a758caf Use menu shortcuts in ApiDemos
Add alphabetic shortcuts to the menu in ActionBarUsage. This mirrors
what is already present in a similar support lib demo.

Bug: 31045453
Test: run com.example.android.apis.app.ActionBarUsage on a device
  with keyboard shortcuts enabled (such as Chromebook). Action menu
  items should display keyboard shortcuts.

Change-Id: I9e6b04df8e2a6cbc728cb60b3706d054521da7cb
2018-04-17 23:02:47 +00:00
Christopher Tate
5c624704ac Merge "Add use of PendingIntent.getForegroundService()" into pi-dev am: 827c8e99ee
am: 28f6e065b8

Change-Id: I348ec6111c4edc79fa9bbab919b22a3eb0ca3e24
2018-03-21 21:27:33 +00:00