From a250cbc60fb2e133b62db2a3f01484939bd9f7f2 Mon Sep 17 00:00:00 2001
From: Emilian Peev <epeev@google.com>
Date: Tue, 15 Jun 2021 16:15:54 -0700
Subject: [PATCH] Camera: Switch camera extension proxy service package name

The current service package name is somewhat generic. To avoid
any potential name clashes, include the word 'extensions'.

Bug: 191192321
Test: Camera CTS
Change-Id: Ib89c455bcadc2c7c888ababd077d4deebe3e8d14
---
 .../hardware/camera2/CameraExtensionCharacteristics.java      | 4 ++--
 packages/services/CameraExtensionsProxy/AndroidManifest.xml   | 2 +-
 .../CameraExtensionsProxyService.java                         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/services/CameraExtensionsProxy/src/com/android/{camera => cameraextensions}/CameraExtensionsProxyService.java (99%)

diff --git a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
index cb0179de6118c..6962060de45c3 100644
--- a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
@@ -210,9 +210,9 @@ public final class CameraExtensionCharacteristics {
      */
     private static final class CameraExtensionManagerGlobal {
         private static final String TAG = "CameraExtensionManagerGlobal";
-        private static final String PROXY_PACKAGE_NAME = "com.android.camera";
+        private static final String PROXY_PACKAGE_NAME = "com.android.cameraextensions";
         private static final String PROXY_SERVICE_NAME =
-                "com.android.camera.CameraExtensionsProxyService";
+                "com.android.cameraextensions.CameraExtensionsProxyService";
 
         // Singleton instance
         private static final CameraExtensionManagerGlobal GLOBAL_CAMERA_MANAGER =
diff --git a/packages/services/CameraExtensionsProxy/AndroidManifest.xml b/packages/services/CameraExtensionsProxy/AndroidManifest.xml
index e5f460e593b32..d356894137494 100644
--- a/packages/services/CameraExtensionsProxy/AndroidManifest.xml
+++ b/packages/services/CameraExtensionsProxy/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.camera">
+    package="com.android.cameraextensions">
 
     <application
         android:label="@string/app_name"
diff --git a/packages/services/CameraExtensionsProxy/src/com/android/camera/CameraExtensionsProxyService.java b/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java
similarity index 99%
rename from packages/services/CameraExtensionsProxy/src/com/android/camera/CameraExtensionsProxyService.java
rename to packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java
index 7b9ca2ddc3450..69874f8a305a3 100644
--- a/packages/services/CameraExtensionsProxy/src/com/android/camera/CameraExtensionsProxyService.java
+++ b/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.camera;
+package com.android.cameraextensions;
 
 import android.app.Service;
 import android.content.Context;