Renamed device Id to androidId

Author: BWMuller

packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java

@@ -5,7 +5,7 @@
 package io.flutter.plugins.deviceinfo;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
+import android.content.Context;
 import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
@@ -21,7 +21,7 @@
 
 /** DeviceInfoPlugin */
 public class DeviceInfoPlugin implements MethodCallHandler {
-  private final Activity activity;
+  private final Context context;
 
   /** Substitute for missing values. */
   private static final String[] EMPTY_STRING_LIST = new String[] {};
@@ -34,8 +34,8 @@ public static void registerWith(Registrar registrar) {
   }
 
   /** Do not allow direct instantiation. */
-  private DeviceInfoPlugin(Activity activity) {
-    this.activity = activity;
+  private DeviceInfoPlugin(Context context) {
+    this.context = context;
   }
 
   @Override
@@ -66,7 +66,7 @@ public void onMethodCall(MethodCall call, Result result) {
       build.put("tags", Build.TAGS);
       build.put("type", Build.TYPE);
       build.put("isPhysicalDevice", !isEmulator());
-      build.put("deviceId", getDeviceId());
+      build.put("androidId", getAndroidId());
 
       Map<String, Object> version = new HashMap<>();
       if (VERSION.SDK_INT >= VERSION_CODES.M) {
@@ -87,15 +87,15 @@ public void onMethodCall(MethodCall call, Result result) {
   }
 
   /**
-   * Simple call to get the android hardware device Id that is unique between the device + user and
+   * 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
+   * factory reset will also result in a value change.
    *
-   * @return The device ID
+   * @return The android ID
    */
   @SuppressLint("HardwareIds")
-  private String getDeviceId() {
-    return Settings.Secure.getString(activity.getContentResolver(), Settings.Secure.ANDROID_ID);
+  private String getAndroidId() {
+    return Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
   }
 
   /**

packages/device_info/example/lib/main.dart

@@ -82,7 +82,7 @@ class _MyAppState extends State<MyApp> {
       'tags': build.tags,
       'type': build.type,
       'isPhysicalDevice': build.isPhysicalDevice,
-      'device_id': build.deviceId,
+      'androidId': build.androidId,
     };
   }
 

packages/device_info/lib/device_info.dart

@@ -58,7 +58,7 @@ class AndroidDeviceInfo {
     this.tags,
     this.type,
     this.isPhysicalDevice,
-    this.deviceId,
+    this.androidId,
   })  : supported32BitAbis = new List<String>.unmodifiable(supported32BitAbis),
         supported64BitAbis = new List<String>.unmodifiable(supported64BitAbis),
         supportedAbis = new List<String>.unmodifiable(supportedAbis);
@@ -120,8 +120,8 @@ class AndroidDeviceInfo {
   /// `false` if the application is running in an emulator, `true` otherwise.
   final bool isPhysicalDevice;
 
-  ///
-  final String deviceId;
+  /// The Android hardware device ID that is unique between the device + user and app signing.
+  final String androidId;
 
   /// Deserializes from the message received from [_kChannel].
   static AndroidDeviceInfo _fromMap(dynamic message) {
@@ -146,7 +146,7 @@ class AndroidDeviceInfo {
       tags: map['tags'],
       type: map['type'],
       isPhysicalDevice: map['isPhysicalDevice'],
-      deviceId: map['deviceId'],
+      androidId: map['androidId'],
     );
   }