From c8d1a7ff4f6ff09eaf66198bd7117af7a81e312f Mon Sep 17 00:00:00 2001
From: Rami Mosleh <engrbm87@gmail.com>
Date: Fri, 6 Oct 2023 19:10:32 +0300
Subject: [PATCH] Remove references to `name` key in android ip webcam (#99590)

---
 homeassistant/components/android_ip_webcam/camera.py | 10 +---------
 homeassistant/components/android_ip_webcam/entity.py |  5 -----
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/homeassistant/components/android_ip_webcam/camera.py b/homeassistant/components/android_ip_webcam/camera.py
index 92ff29177dd..a12798a5b91 100644
--- a/homeassistant/components/android_ip_webcam/camera.py
+++ b/homeassistant/components/android_ip_webcam/camera.py
@@ -5,7 +5,6 @@ from homeassistant.components.mjpeg import MjpegCamera, filter_urllib3_logging
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
-    CONF_NAME,
     CONF_PASSWORD,
     CONF_USERNAME,
     HTTP_BASIC_AUTHENTICATION,
@@ -39,14 +38,7 @@ class IPWebcamCamera(MjpegCamera):
 
     def __init__(self, coordinator: AndroidIPCamDataUpdateCoordinator) -> None:
         """Initialize the camera."""
-        name = None
-        # keep imported name until YAML is removed
-        if CONF_NAME in coordinator.config_entry.data:
-            name = coordinator.config_entry.data[CONF_NAME]
-            self._attr_has_entity_name = False
-
         super().__init__(
-            name=name,
             mjpeg_url=coordinator.cam.mjpeg_url,
             still_image_url=coordinator.cam.image_url,
             authentication=HTTP_BASIC_AUTHENTICATION,
@@ -56,5 +48,5 @@ class IPWebcamCamera(MjpegCamera):
         self._attr_unique_id = f"{coordinator.config_entry.entry_id}-camera"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, coordinator.config_entry.entry_id)},
-            name=name or coordinator.config_entry.data[CONF_HOST],
+            name=coordinator.config_entry.data[CONF_HOST],
         )
diff --git a/homeassistant/components/android_ip_webcam/entity.py b/homeassistant/components/android_ip_webcam/entity.py
index d729da22a9d..e0432ad060c 100644
--- a/homeassistant/components/android_ip_webcam/entity.py
+++ b/homeassistant/components/android_ip_webcam/entity.py
@@ -19,11 +19,6 @@ class AndroidIPCamBaseEntity(CoordinatorEntity[AndroidIPCamDataUpdateCoordinator
     ) -> None:
         """Initialize the base entity."""
         super().__init__(coordinator)
-        if CONF_NAME in coordinator.config_entry.data:
-            # name is legacy imported from YAML config
-            # this block can be removed when removing import from YAML
-            self._attr_name = f"{coordinator.config_entry.data[CONF_NAME]} {self.entity_description.name}"
-            self._attr_has_entity_name = False
         self.cam = coordinator.cam
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, coordinator.config_entry.entry_id)},