Update git submodules
* Update frameworks/support from branch 'androidx-master-dev'
to 54b0c07b311750b9909983f640a9ba64f5f37cd6
- Merge changes from topic "robolectric_4.4-alpha-2" into androidx-master-dev
* changes:
Remove unnecessary ternary operator from ExifInterface constructor
Add ObjectsCompat#toString(Object, String)
Remove unnecessary shadow declaration
Update enterprise-feedback for Robolectric @LooperMode(PAUSED)
Update camera Robolectric tests for @LooperMode(PAUSED)
Update Robolectric dependency to 4.4-alpha-2
- Remove unnecessary ternary operator from ExifInterface constructor
Removes unnecessary private constructor to remove usage of ternary
operator in constructor.
This works around an issue that Jacoco has with instrumenting
constructors with ternary operators inside a this() or super()
statement (b/26641175)
Bug: 162018163
Test: ./gradlew test -Pandroidx.coverageEnabled=true
Change-Id: I921a233ba43fdd260e4bb9728395c8a799c2c4a5
- Add ObjectsCompat#toString(Object, String)
ObjectsCompat#toString(Object, String) will return the second argument
if the first argument is null.
Uses this method to work around a bug in JaCoCo that occurs when
'super()' includes a ternary operator in a constructor (b/26641175)
Relnote: "Added ObjectsCompat#toString(Object, String). This offers the
behavior of Objects#toString(Object, String) but can be used pre-API
19."
Bug: 162018163
Test: ./gradlew test -Pandroidx.coverageEnabled=true
Change-Id: I26cdca93fcc21d7172908691e013afc19f23e9de
- Remove unnecessary shadow declaration
ShadowPendingIntent is already part of Robolectric, so it will be used
automatically. This seems to resolve an OOM error that occurs in
CustomTabsIntentTest due to loading resources for API 29.
Bug: 162018163, 157663450
Test: ./gradlew browser:browser:testDebugUnitTest
Change-Id: I3eb5f9d7ac479e0c84d93e75715c08353685cdf0
- Update enterprise-feedback for Robolectric @LooperMode(PAUSED)
Robolectric 4.4 now uses @LooperMode(PAUSED) by default. This requires
changing the way we drive robolectric tests.
For more information, see:
http://robolectric.org/blog/2019/06/04/paused-looper/
Bug: 162018163
Test: ./gradlew :enterprise-feedback:test
Change-Id: I6ea0d00d23cb815ab33574def6a4f856f9a1aaf7
- Update camera Robolectric tests for @LooperMode(PAUSED)
Robolectric 4.4 now uses @LooperMode(PAUSED) by default, this requires
a few changes to the way robolectric tests are driven.
For more information, see:
http://robolectric.org/blog/2019/06/04/paused-looper/
Bug: 162018163
Test: ./gradlew test
Change-Id: I67d336b5c50cfb2bf14dbac90e3923df01e21304
- Update Robolectric dependency to 4.4-alpha-2
Bug: 162018163
Test: ./gradlew test
Change-Id: I9cd17892a0437a5b8a8143f1bd3bcd1d70568307
* Update prebuilts/androidx/external from branch 'androidx-master-dev'
to 6c3b9d68ea162cac7f8686f6630d992b218e88bb
- Merge "Add prebuilts for Robolectric 4.4-alpha-2" into androidx-master-dev
- Add prebuilts for Robolectric 4.4-alpha-2
Pulled in with:
frameworks/support/development/importMaven/import_maven_artifacts.py -n
org.robolectric:robolectric:4.4-alpha-2
Bug: 162018163
Test: ./gradlew test
Change-Id: I74c2ec22db54d51beccf1267179396e8202062a3
* Update prebuilts/androidx/internal from branch 'androidx-master-dev'
to c7f726e6b6dfae4908cc23a77fd99492bd370d40
- Merge "Add androidx.test:monitor prebuilts for Robolectric 4.4-alpha-2" into androidx-master-dev
- Add androidx.test:monitor prebuilts for Robolectric 4.4-alpha-2
Adds androidx.test:monitor:1.3.0-beta02 prebuilts.
Pulled in with:
frameworks/support/development/importMaven/import_maven_artifacts.py -n
org.robolectric:robolectric:4.4-alpha-2
Bug: 162018163
Test: ./gradlew test
Change-Id: Iafc49b6e691fd1148f35974cfea5f4c6b8798629
3 files changed