feat(device_info_plus): Add User Device Name in Android (PR #3437) (#…

…3456)

Co-authored-by: Miguel Beltran <[email protected]>

packages/device_info_plus/device_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.kt

@@ -3,7 +3,6 @@ package dev.fluttercommunity.plus.device_info
 import android.app.ActivityManager
 import android.content.Context
 import android.content.pm.PackageManager
-import android.view.WindowManager
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodChannel
@@ -24,8 +23,10 @@ class DeviceInfoPlusPlugin : FlutterPlugin {
     private fun setupMethodChannel(messenger: BinaryMessenger, context: Context) {
         methodChannel = MethodChannel(messenger, "dev.fluttercommunity.plus/device_info")
         val packageManager: PackageManager = context.packageManager
-        val activityManager: ActivityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
-        val handler = MethodCallHandlerImpl(packageManager, activityManager)
+        val activityManager: ActivityManager =
+            context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+        val contentResolver = context.contentResolver
+        val handler = MethodCallHandlerImpl(packageManager, activityManager, contentResolver)
         methodChannel.setMethodCallHandler(handler)
     }
 }

packages/device_info_plus/device_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.kt

@@ -1,16 +1,15 @@
 package dev.fluttercommunity.plus.device_info
 
 import android.app.ActivityManager
+import android.content.ContentResolver
 import android.content.pm.FeatureInfo
 import android.content.pm.PackageManager
 import android.os.Build
-import android.util.DisplayMetrics
-import android.view.Display
-import android.view.WindowManager
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import kotlin.collections.HashMap
+import android.provider.Settings
 
 /**
  * The implementation of [MethodChannel.MethodCallHandler] for the plugin. Responsible for
@@ -19,6 +18,7 @@ import kotlin.collections.HashMap
 internal class MethodCallHandlerImpl(
     private val packageManager: PackageManager,
     private val activityManager: ActivityManager,
+    private val contentResolver: ContentResolver,
 ) : MethodCallHandler {
 
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
@@ -38,6 +38,10 @@ internal class MethodCallHandlerImpl(
             build["model"] = Build.MODEL
             build["product"] = Build.PRODUCT
 
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+                build["name"] = Settings.Global.getString(contentResolver, Settings.Global.DEVICE_NAME)
+            }
+
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 build["supported32BitAbis"] = listOf(*Build.SUPPORTED_32_BIT_ABIS)
                 build["supported64BitAbis"] = listOf(*Build.SUPPORTED_64_BIT_ABIS)

packages/device_info_plus/device_info_plus/example/integration_test/device_info_plus_test.dart

@@ -99,6 +99,7 @@ void main() {
     expect(androidInfo.manufacturer, isNotNull);
     expect(androidInfo.model, isNotNull);
     expect(androidInfo.product, isNotNull);
+    expect(androidInfo.name, isNotNull);
 
     expect(androidInfo.supported32BitAbis, isNotNull);
     expect(androidInfo.supported64BitAbis, isNotNull);

packages/device_info_plus/device_info_plus/example/lib/main.dart

@@ -94,6 +94,7 @@ class _MyAppState extends State<MyApp> {
       'manufacturer': build.manufacturer,
       'model': build.model,
       'product': build.product,
+      'name': build.name,
       'supported32BitAbis': build.supported32BitAbis,
       'supported64BitAbis': build.supported64BitAbis,
       'supportedAbis': build.supportedAbis,

packages/device_info_plus/device_info_plus/lib/src/model/android_device_info.dart

@@ -23,6 +23,7 @@ class AndroidDeviceInfo extends BaseDeviceInfo {
     required this.manufacturer,
     required this.model,
     required this.product,
+    required this.name,
     required List<String> supported32BitAbis,
     required List<String> supported64BitAbis,
     required List<String> supportedAbis,
@@ -89,6 +90,10 @@ class AndroidDeviceInfo extends BaseDeviceInfo {
   /// https://developer.android.com/reference/android/os/Build#PRODUCT
   final String product;
 
+  /// The name of the device.
+  /// https://developer.android.com/reference/android/provider/Settings.Global#DEVICE_NAME
+  final String name;
+
   /// An ordered list of 32 bit ABIs supported by this device.
   /// Available only on Android L (API 21) and newer
   /// https://developer.android.com/reference/android/os/Build#SUPPORTED_32_BIT_ABIS
@@ -158,6 +163,7 @@ class AndroidDeviceInfo extends BaseDeviceInfo {
       manufacturer: map['manufacturer'],
       model: map['model'],
       product: map['product'],
+      name: map['name'] ?? '',
       supported32BitAbis: _fromList(map['supported32BitAbis'] ?? <String>[]),
       supported64BitAbis: _fromList(map['supported64BitAbis'] ?? <String>[]),
       supportedAbis: _fromList(map['supportedAbis'] ?? []),

packages/device_info_plus/device_info_plus/test/model/android_device_info_fake.dart

@@ -25,6 +25,7 @@ const _fakeAndroidDeviceInfo = <String, dynamic>{
   'brand': 'Google',
   'device': 'device',
   'product': 'product',
+  "name": "Custom Device Name",
   'display': 'display',
   'hardware': 'hardware',
   'isPhysicalDevice': true,

packages/device_info_plus/device_info_plus/test/model/android_device_info_test.dart

@@ -20,6 +20,7 @@ void main() {
       expect(androidDeviceInfo.brand, 'Google');
       expect(androidDeviceInfo.device, 'device');
       expect(androidDeviceInfo.product, 'product');
+      expect(androidDeviceInfo.name, "Custom Device Name");
       expect(androidDeviceInfo.display, 'display');
       expect(androidDeviceInfo.hardware, 'hardware');
       expect(androidDeviceInfo.bootloader, 'bootloader');