Update git submodules
* Update platform/packages/modules/CaptivePortalLogin from branch 'master'
to 89e6ecce644c16c6475051c5eb849f4a6014ead6
- Merge "Mock the MimeTypeMap for DownloadServiceTest"
- Mock the MimeTypeMap for DownloadServiceTest
Some devices have an application that handles all intents for the
application/octet-stream mimetype, which breaks testTapDoneNotification
because an app chooser dialog is shown instead of opening the
OpenTextFileActivity directly.
To avoid such problems, mock MimeTypeMap to register a custom mimetype
that is highly unlikely to be used by any application. DownloadService
will then detect that mimetype from the test file extension, and only
OpenTextFileActivity will handle the intent.
Also remove the RequestDismissKeyguardActivity in DownloadServiceTest,
which was a duplicate (minus the dismiss behavior) of the one in its own
file in the same package.
Bug: 162296431
Test: atest CaptivePortalLoginTests:DownloadServiceTest
Change-Id: I439c639fe0dced53ad506af03facdf3f8ae07199
* Update platform/superproject from branch 'master'
to 45a4dc7ff7860394f49fef63b04df148b4e70f4b
- Update git submodules
* Update packages/modules/CaptivePortalLogin from branch 'master'
to 89e6ecce644c16c6475051c5eb849f4a6014ead6
- Merge "Mock the MimeTypeMap for DownloadServiceTest"
- Mock the MimeTypeMap for DownloadServiceTest
Some devices have an application that handles all intents for the
application/octet-stream mimetype, which breaks testTapDoneNotification
because an app chooser dialog is shown instead of opening the
OpenTextFileActivity directly.
To avoid such problems, mock MimeTypeMap to register a custom mimetype
that is highly unlikely to be used by any application. DownloadService
will then detect that mimetype from the test file extension, and only
OpenTextFileActivity will handle the intent.
Also remove the RequestDismissKeyguardActivity in DownloadServiceTest,
which was a duplicate (minus the dismiss behavior) of the one in its own
file in the same package.
Bug: 162296431
Test: atest CaptivePortalLoginTests:DownloadServiceTest
Change-Id: I439c639fe0dced53ad506af03facdf3f8ae07199
2 files changed
