Unverified Commit 3fc691ba authored by pjgowtham's avatar pjgowtham
Browse files

nicky: Rebrand Camera Helper to avoid conflicts

parent 2e186790

camera_helper/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := optional 


LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := OnePlusCameraHelper

LOCAL_PACKAGE_NAME := NickyCameraHelper

LOCAL_CERTIFICATE := platform

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_PRIVILEGED_MODULE := true

camera_helper/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
        android:targetSdkVersion="21"/>



    <application

        android:label="OnePlusCameraHelper"

        android:label="NickyCameraHelper"

        android:persistent="true">



        <receiver android:name="org.lineageos.camerahelper.BootCompletedReceiver">
@@ -24,11 +24,11 @@ 
        </receiver>



        <service android:name="org.lineageos.camerahelper.CameraMotorService"

                 android:permission="OnePlusCameraHelperService">

                 android:permission="NickyCameraHelperService">

        </service>



        <service android:name="org.lineageos.camerahelper.FallSensorService"

                 android:permission="OnePlusCameraHelperService">

                 android:permission="NickyCameraHelperService">

        </service>

    </application>

</manifest>

camera_helper/src/org/lineageos/camerahelper/BootCompletedReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.content.Intent; 
import android.util.Log;



public class BootCompletedReceiver extends BroadcastReceiver {

    private static final String TAG = "OnePlusCameraHelper";

    private static final String TAG = "NickyCameraHelper";



    @Override

    public void onReceive(final Context context, Intent intent) {

device.mk

+2 −1
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ PRODUCT_PACKAGES += \ 
# Camera

PRODUCT_PACKAGES += \

    android.hardware.camera.provider@2.4-impl \

    android.hardware.camera.provider@2.4-service_64

    android.hardware.camera.provider@2.4-service_64 \

    NickyCameraHelper



PRODUCT_PACKAGES += \

    libcamera2ndk_vendor \