Skip to content

Commit

Permalink
Merge branch 'android-p'
Browse files Browse the repository at this point in the history
  • Loading branch information
sorccu committed Aug 8, 2018
2 parents 1195158 + 9fabd2a commit 870b4ee
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Enhancements

- Android 9.0 is now supported.
- The OAuth2 unit now supports state tokens. Thanks @quangola!
- [STFService.apk](https://github.com/openstf/STFService.apk) can now display the identity activity (red screen) automatically if a device gets disconnected from USB (or ADB), which can make maintenance easier. This feature is in beta, please enable it by running `adb shell pm grant jp.co.cyberagent.stf android.permission.DUMP` on the devices you want to try it on. Thanks @Malinskiy!

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Please [contact us][contact-link] for sponsor arrangements. Both recurring and o

* OS support
- Android
* Supports versions 2.3.3 (SDK level 10) to 8.1 (SDK level 27)
* Supports versions 2.3.3 (SDK level 10) to 9.0 (SDK level 28)
* Supports Wear 5.1 (but not 5.0 due to missing permissions)
* Supports Fire OS, CyanogenMod, and other heavily Android based distributions
* `root` is **not** required for any current functionality
Expand Down
5 changes: 0 additions & 5 deletions lib/units/device/resources/minicap.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ module.exports = syrup.serial()
pathutil.module(util.format(
'minicap-prebuilt/prebuilt/%s/lib/android-%s/minicap.so'
, supportedAbi
, sdk.release
))
, pathutil.module(util.format(
'minicap-prebuilt/prebuilt/%s/lib/android-%s/minicap.so'
, supportedAbi
, sdk.previewLevel
))
, pathutil.module(util.format(
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"lodash": "^4.14.2",
"markdown-serve": "^0.3.2",
"mime": "^1.3.4",
"minicap-prebuilt": "^2.2.0",
"minicap-prebuilt": "^2.3.0",
"minimatch": "^3.0.3",
"minitouch-prebuilt": "^1.2.0",
"my-local-ip": "^1.0.0",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4284,9 +4284,9 @@ mimic-fn@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"

minicap-prebuilt@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/minicap-prebuilt/-/minicap-prebuilt-2.2.0.tgz#a7c3a68e1f0e49aab2f21299866e5813562fd6c7"
minicap-prebuilt@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/minicap-prebuilt/-/minicap-prebuilt-2.3.0.tgz#a616cf84558a71b98aa70d05bce8be09409dd366"

minimalistic-assert@^1.0.0:
version "1.0.0"
Expand Down

0 comments on commit 870b4ee

Please sign in to comment.