This repository was archived by the owner on Feb 22, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 9.7k
[device_info] Support v2 android embedder. #2163
Merged
Merged
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
952b5d0
draft
ead4e1e
migrate device_info
5c8ebe7
refactor
6c96b7a
rename activities
e587caa
move handler non-publick
5597833
Update MainActivity.java
af6f345
fix gradle
05d9709
review fixes
2dd9444
e2e tests
5fee116
Update CHANGELOG.md
727a3b6
Update MainActivity.java
835793a
remove android x
b7e025a
Update CHANGELOG.md
f3dc369
place test files at the corret place
7d4c91c
Merge branch 'migrate_device_info' of github.com:cyanglaz/plugins int…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
draft
- Loading branch information
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
...es/device_info/android/src/main/java/dev/flutter/plugins/deviceinfo/DeviceInfoPlugin.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package dev.flutter.plugins.deviceinfo; | ||
|
|
||
| import io.flutter.embedding.engine.plugins.FlutterPlugin; | ||
| import io.flutter.plugin.common.MethodChannel; | ||
| import io.flutter.plugins.deviceinfo.MethodCallHandlerImpl; | ||
|
|
||
| /** | ||
| * Entry point of the plugin. It sets up the {@link io.flutter.plugin.common.MethodChannel.MethodCallHandler} | ||
| * during {@link #onAttachedToEngine(FlutterPluginBinding)}. | ||
| */ | ||
| public class DeviceInfoPlugin implements FlutterPlugin { | ||
|
|
||
| @Override | ||
| public void onAttachedToEngine(FlutterPluginBinding binding) { | ||
| final MethodChannel channel = | ||
| new MethodChannel(binding.getFlutterEngine().getDartExecutor(), "plugins.flutter.io/device_info"); | ||
|
|
||
| final MethodCallHandlerImpl handler = new MethodCallHandlerImpl(binding.getApplicationContext().getContentResolver()); | ||
| channel.setMethodCallHandler(handler); | ||
| } | ||
|
|
||
| @Override | ||
| public void onDetachedFromEngine(FlutterPluginBinding binding) { | ||
|
|
||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 121 additions & 0 deletions
121
...evice_info/android/src/main/java/io/flutter/plugins/deviceinfo/MethodCallHandlerImpl.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| // Copyright 2017 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| package io.flutter.plugins.deviceinfo; | ||
|
|
||
| import android.annotation.SuppressLint; | ||
| import android.content.ContentResolver; | ||
| import android.os.Build; | ||
| import android.provider.Settings; | ||
|
|
||
| import androidx.annotation.NonNull; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import io.flutter.plugin.common.MethodCall; | ||
| import io.flutter.plugin.common.MethodChannel; | ||
|
|
||
| /** | ||
| * The implementation of {@link MethodChannel.MethodCallHandler} for the plugin. | ||
| * Responsible for receiving method calls from method channel. | ||
| */ | ||
| public class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler { | ||
|
|
||
| private ContentResolver contentResolver; | ||
|
|
||
| /** Substitute for missing values. */ | ||
| private static final String[] EMPTY_STRING_LIST = new String[] {}; | ||
|
|
||
| /** | ||
| * Constructs DeviceInfo. The {@code contentResolver} must not be null. | ||
| */ | ||
| public MethodCallHandlerImpl(@NonNull ContentResolver contentResolver) { | ||
| this.contentResolver = contentResolver; | ||
| } | ||
|
|
||
| @Override | ||
| public void onMethodCall(MethodCall call, MethodChannel.Result result) { | ||
| if (call.method.equals("getAndroidDeviceInfo")) { | ||
| Map<String, Object> build = new HashMap<>(); | ||
| build.put("board", Build.BOARD); | ||
| build.put("bootloader", Build.BOOTLOADER); | ||
| build.put("brand", Build.BRAND); | ||
| build.put("device", Build.DEVICE); | ||
| build.put("display", Build.DISPLAY); | ||
| build.put("fingerprint", Build.FINGERPRINT); | ||
| build.put("hardware", Build.HARDWARE); | ||
| build.put("host", Build.HOST); | ||
| build.put("id", Build.ID); | ||
| build.put("manufacturer", Build.MANUFACTURER); | ||
| build.put("model", Build.MODEL); | ||
| build.put("product", Build.PRODUCT); | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { | ||
| build.put("supported32BitAbis", Arrays.asList(Build.SUPPORTED_32_BIT_ABIS)); | ||
| build.put("supported64BitAbis", Arrays.asList(Build.SUPPORTED_64_BIT_ABIS)); | ||
| build.put("supportedAbis", Arrays.asList(Build.SUPPORTED_ABIS)); | ||
| } else { | ||
| build.put("supported32BitAbis", Arrays.asList(EMPTY_STRING_LIST)); | ||
| build.put("supported64BitAbis", Arrays.asList(EMPTY_STRING_LIST)); | ||
| build.put("supportedAbis", Arrays.asList(EMPTY_STRING_LIST)); | ||
| } | ||
| build.put("tags", Build.TAGS); | ||
| build.put("type", Build.TYPE); | ||
| build.put("isPhysicalDevice", !isEmulator()); | ||
| build.put("androidId", getAndroidId()); | ||
|
|
||
| Map<String, Object> version = new HashMap<>(); | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { | ||
| version.put("baseOS", Build.VERSION.BASE_OS); | ||
| version.put("previewSdkInt", Build.VERSION.PREVIEW_SDK_INT); | ||
| version.put("securityPatch", Build.VERSION.SECURITY_PATCH); | ||
| } | ||
| version.put("codename", Build.VERSION.CODENAME); | ||
| version.put("incremental", Build.VERSION.INCREMENTAL); | ||
| version.put("release", Build.VERSION.RELEASE); | ||
| version.put("sdkInt", Build.VERSION.SDK_INT); | ||
| build.put("version", version); | ||
|
|
||
| result.success(build); | ||
| } else { | ||
| result.notImplemented(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns the Android hardware device ID that is unique between the device + user and app | ||
| * signing. This key will change if the app is uninstalled or its data is cleared. Device factory | ||
| * reset will also result in a value change. | ||
| * | ||
| * @return The android ID | ||
| */ | ||
| @SuppressLint("HardwareIds") | ||
| private String getAndroidId() { | ||
| return Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID); | ||
| } | ||
|
|
||
| /** | ||
| * A simple emulator-detection based on the flutter tools detection logic and a couple of legacy | ||
| * detection systems | ||
| */ | ||
| private boolean isEmulator() { | ||
| 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"); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,4 @@ | ||
| org.gradle.jvmargs=-Xmx1536M | ||
| android.enableR8=true | ||
| android.useAndroidX=true | ||
| android.enableJetifier=true |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we make this class default (package-private) so that we don't need to worry about breaking other clients who may be using it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done