Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7f07b4c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Switch camera extension proxy service package name" into sc-dev... 

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

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

Change-Id: If86cc969ee3f88aee88809875151a9af9a165288
parents bf5f027e cdde21bd

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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 =

packages/services/CameraExtensionsProxy/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line 
<?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"

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;