Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: Switch camera extension proxy service package name" into sc-dev am: 81419f4be3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986716

Change-Id: I8e7cfbe9efc841da05626109c4f994cccbbc508e
This commit is contained in:
TreeHugger Robot
2021-06-23 19:01:22 +00:00
committed by Automerger Merge Worker
parent 6271ec4e51 81419f4be3
commit cdde21bd14
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
View File

@@ -212,9 +212,9 @@ public final class CameraExtensionCharacteristics {
*/ */
private static final class CameraExtensionManagerGlobal { private static final class CameraExtensionManagerGlobal {
private static final String TAG = "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 = private static final String PROXY_SERVICE_NAME =
"com.android.camera.CameraExtensionsProxyService"; "com.android.cameraextensions.CameraExtensionsProxyService";
// Singleton instance // Singleton instance
private static final CameraExtensionManagerGlobal GLOBAL_CAMERA_MANAGER = private static final CameraExtensionManagerGlobal GLOBAL_CAMERA_MANAGER =

2
packages/services/CameraExtensionsProxy/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.camera"> package="com.android.cameraextensions">
<application <application
android:label="@string/app_name" android:label="@string/app_name"

2
packages/services/CameraExtensionsProxy/src/com/android/camera/CameraExtensionsProxyService.java → packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.android.camera; package com.android.cameraextensions;
import android.app.Service; import android.app.Service;
import android.content.Context; import android.content.Context;