Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
e57556a8
Commit
e57556a8
authored
Jan 22, 2021
by
vvb2060
Committed by
topjohnwu
Jan 24, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ro.kernel.qemu to check emulator
parent
b54b78c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
27 deletions
+18
-27
Info.kt
app/src/main/java/com/topjohnwu/magisk/core/Info.kt
+8
-27
XAndroid.kt
app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
+10
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/core/Info.kt
View file @
e57556a8
package
com.topjohnwu.magisk.core
package
com.topjohnwu.magisk.core
import
android.os.Build
import
androidx.databinding.ObservableBoolean
import
androidx.databinding.ObservableBoolean
import
com.topjohnwu.magisk.DynAPK
import
com.topjohnwu.magisk.DynAPK
import
com.topjohnwu.magisk.core.model.UpdateInfo
import
com.topjohnwu.magisk.core.model.UpdateInfo
import
com.topjohnwu.magisk.core.utils.net.NetworkObserver
import
com.topjohnwu.magisk.core.utils.net.NetworkObserver
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ktx.getProperty
import
com.topjohnwu.magisk.utils.CachedValue
import
com.topjohnwu.magisk.utils.CachedValue
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.ShellUtils.fastCmd
import
com.topjohnwu.superuser.ShellUtils.fastCmd
...
@@ -30,33 +30,14 @@ object Info {
...
@@ -30,33 +30,14 @@ object Info {
// Device state
// Device state
var
crypto
=
""
var
crypto
=
""
@Jvm
Static
var
isSAR
=
false
@Jvm
Field
var
isSAR
=
false
@Jvm
Static
var
isAB
=
false
@Jvm
Field
var
isAB
=
false
@JvmStatic
val
isFDE
get
()
=
crypto
==
"block"
@JvmStatic
val
isFDE
get
()
=
crypto
==
"block"
@JvmStatic
var
ramdisk
=
false
@JvmField
var
ramdisk
=
false
@JvmStatic
var
hasGMS
=
true
@JvmField
var
hasGMS
=
true
@JvmStatic
var
isPixel
=
false
@JvmField
var
isPixel
=
false
@JvmStatic
val
cryptoText
get
()
=
crypto
.
capitalize
(
Locale
.
US
)
@JvmStatic
val
cryptoText
get
()=
crypto
.
capitalize
(
Locale
.
US
)
@JvmField
val
isEmulator
=
getProperty
(
"ro.kernel.qemu"
,
"0"
)
==
"1"
@JvmStatic
val
isEmulator
:
Boolean
get
()
{
return
(
Build
.
BRAND
.
startsWith
(
"generic"
)
&&
Build
.
DEVICE
.
startsWith
(
"generic"
)
||
Build
.
FINGERPRINT
.
startsWith
(
"generic"
)
||
Build
.
FINGERPRINT
.
startsWith
(
"unknown"
)
||
Build
.
HARDWARE
.
contains
(
"goldfish"
)
||
Build
.
HARDWARE
.
contains
(
"ranchu"
)
||
Build
.
MODEL
.
contains
(
"google_sdk"
)
||
Build
.
MODEL
.
contains
(
"Emulator"
)
||
Build
.
MODEL
.
contains
(
"Android SDK built for x86"
)
||
Build
.
MANUFACTURER
.
contains
(
"Genymotion"
)
||
Build
.
PRODUCT
.
contains
(
"sdk_google"
)
||
Build
.
PRODUCT
.
contains
(
"google_sdk"
)
||
Build
.
PRODUCT
.
contains
(
"sdk"
)
||
Build
.
PRODUCT
.
contains
(
"sdk_x86"
)
||
Build
.
PRODUCT
.
contains
(
"vbox86p"
)
||
Build
.
PRODUCT
.
contains
(
"emulator"
)
||
Build
.
PRODUCT
.
contains
(
"simulator"
))
}
val
isConnected
by
lazy
{
val
isConnected
by
lazy
{
ObservableBoolean
(
false
).
also
{
field
->
ObservableBoolean
(
false
).
also
{
field
->
...
...
app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
View file @
e57556a8
...
@@ -369,3 +369,13 @@ fun Int.dpInPx(): Int {
...
@@ -369,3 +369,13 @@ fun Int.dpInPx(): Int {
val
scale
=
AssetHack
.
resource
.
displayMetrics
.
density
val
scale
=
AssetHack
.
resource
.
displayMetrics
.
density
return
(
this
*
scale
+
0.5
).
toInt
()
return
(
this
*
scale
+
0.5
).
toInt
()
}
}
@SuppressLint
(
"PrivateApi"
)
fun
getProperty
(
key
:
String
,
def
:
String
):
String
{
runCatching
{
val
clazz
=
Class
.
forName
(
"android.os.SystemProperties"
)
val
get
=
clazz
.
getMethod
(
"get"
,
String
::
class
.
java
,
String
::
class
.
java
)
return
get
.
invoke
(
clazz
,
key
,
def
)
as
String
}
return
def
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment