Fix initialized value for P & Q

This commit is contained in:
LoveSy 2022-10-29 05:43:02 +08:00
parent c6cc93ae7e
commit 96f217d0bf
No known key found for this signature in database
2 changed files with 34 additions and 28 deletions

View File

@ -22,19 +22,21 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: Set up JDK 11 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
distribution: 'zulu' distribution: 'temurin'
java-version: '11' java-version: '17'
cache: 'gradle' cache: 'gradle'
- name: Gradle cache - name: Cache Gradle Build
uses: actions/cache@v3 uses: actions/cache@v2
with: with:
path: | path: |
~/.gradle/caches ~/.gradle/caches/build-cache-*
~/.gradle/wrapper ~/.gradle/buildOutputCleanup/cache.properties
key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }} key: gradle-builds-core-${{ github.sha }}
restore-keys: |
gradle-builds-${{ runner.os }}
- name: ccache - name: ccache
uses: hendrikmuhs/ccache-action@v1.2 uses: hendrikmuhs/ccache-action@v1.2
with: with:
@ -66,20 +68,21 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: Set up JDK 11 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
distribution: 'zulu' distribution: 'temurin'
java-version: '11' java-version: '17'
cache: 'gradle' cache: 'gradle'
- name: Gradle cache - name: Cache Gradle Build
uses: actions/cache@v3 uses: actions/cache@v2
with: with:
path: | path: |
~/.gradle/caches ~/.gradle/caches/build-cache-*
~/.gradle/wrapper ~/.gradle/buildOutputCleanup/cache.properties
key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }} key: gradle-builds-core-${{ github.sha }}
restore-keys: gradle-${{ runner.os }}- restore-keys: |
gradle-builds-${{ runner.os }}
- name: ccache - name: ccache
uses: hendrikmuhs/ccache-action@v1.2 uses: hendrikmuhs/ccache-action@v1.2
with: with:
@ -157,20 +160,21 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: Set up JDK 11 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
distribution: 'zulu' distribution: 'temurin'
java-version: '11' java-version: '17'
cache: 'gradle' cache: 'gradle'
- name: Gradle cache - name: Cache Gradle Build
uses: actions/cache@v3 uses: actions/cache@v2
with: with:
path: | path: |
~/.gradle/caches ~/.gradle/caches/build-cache-*
~/.gradle/wrapper ~/.gradle/buildOutputCleanup/cache.properties
key: gradle-${{ runner.os }}-${{ matrix.api-level }}-${{ matrix.arch }}-${{ matrix.target }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }} key: gradle-builds-core-${{ github.sha }}
restore-keys: gradle-${{ runner.os }}- restore-keys: |
gradle-builds-${{ runner.os }}
- name: ccache - name: ccache
uses: hendrikmuhs/ccache-action@v1.2 uses: hendrikmuhs/ccache-action@v1.2
with: with:

View File

@ -112,8 +112,10 @@ public:
} }
int sdk_int = GetAndroidApiLevel(); int sdk_int = GetAndroidApiLevel();
if (sdk_int >= __ANDROID_API_P__) { if (sdk_int >= __ANDROID_API_R__) {
initialized_status = 15; initialized_status = 15;
} else if (sdk_int >= __ANDROID_API_P__) {
initialized_status = 14;
} else if (sdk_int == __ANDROID_API_O_MR1__) { } else if (sdk_int == __ANDROID_API_O_MR1__) {
initialized_status = 11; initialized_status = 11;
} else { } else {
@ -158,7 +160,7 @@ public:
it++; it++;
} }
} }
} else if (!class_def && self) { } else if (self) {
std::unique_lock lk(backup_methods_lock_); std::unique_lock lk(backup_methods_lock_);
if (auto found = backup_methods_.find(self); found != backup_methods_.end()) { if (auto found = backup_methods_.find(self); found != backup_methods_.end()) {
for (auto it = found->second.begin(); it != found->second.end();) { for (auto it = found->second.begin(); it != found->second.end();) {