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

Commit c47d1cc7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge 13c8b52c on remote branch"

parents 18a4266d 98018122

core/jni/android_hardware_Camera.cpp

+21 −0
Original line number Diff line number Diff line
@@ -701,6 +701,24 @@ static void android_hardware_Camera_setHasPreviewCallback(JNIEnv *env, jobject t 
    context->setCallbackMode(env, installed, manualBuffer);

}



static void android_hardware_Camera_setMetadataCb(JNIEnv *env, jobject thiz, jboolean mode)

{

    ALOGV("setMetadataCb: mode:%d", (int)mode);

    JNICameraContext* context;

    status_t rc;

    sp<Camera> camera = get_native_camera(env, thiz, &context);

    if (camera == 0) return;



    if (mode == true)

        rc = camera->sendCommand(CAMERA_CMD_METADATA_ON, 0, 0);

    else

        rc = camera->sendCommand(CAMERA_CMD_METADATA_OFF, 0, 0);



    if (rc != NO_ERROR) {

        jniThrowException(env, "java/lang/RuntimeException", "set metadata mode failed");

    }

}



static void android_hardware_Camera_addCallbackBuffer(JNIEnv *env, jobject thiz, jbyteArray bytes, int msgType) {

    ALOGV("addCallbackBuffer: 0x%x", msgType);
@@ -981,6 +999,9 @@ static JNINativeMethod camMethods[] = { 
  { "native_setHistogramMode",

    "(Z)V",

     (void *)android_hardware_Camera_setHistogramMode },

  { "native_setMetadataCb",

    "(Z)V",

     (void *)android_hardware_Camera_setMetadataCb },

  { "native_sendHistogramData",

    "()V",

     (void *)android_hardware_Camera_sendHistogramData },

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -1399,6 +1399,10 @@ 
         error cause as Regular deactivation(36). -->

    <bool name="config_radio_reset_on_regular_deactivation">true</bool>



    <!-- Configuartion to support 7bit Ascii encoding and decoding

         for long messages. -->

    <bool name="config_ascii_7bit_support_for_long_message">false</bool>



    <!-- bool value to for enabling motion accelerometer -->

    <bool name="use_motion_accel">false</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ 
  <java-symbol type="bool" name="skip_radio_power_off_on_sim_refresh_reset" />

  <java-symbol type="bool" name="config_radio_reset_on_regular_deactivation" />

  <java-symbol type="bool" name="config_send_sms1x_on_voice_call" />

  <java-symbol type="bool" name="config_ascii_7bit_support_for_long_message" />



  <java-symbol type="integer" name="config_cursorWindowSize" />

  <java-symbol type="integer" name="config_extraFreeKbytesAdjust" />

packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ public class KeyguardViewMediator { 
                    break;

                case READY:

                    synchronized (this) {

                        if (isShowing()) {

                        if (isShowing() && !isSecure()) {

                            resetStateLocked(null);

                        }

                    }

wifi/java/android/net/wifi/WifiStateMachine.java

+6 −3
Original line number Diff line number Diff line
@@ -3879,11 +3879,14 @@ public class WifiStateMachine extends StateMachine { 
        }

        @Override

        public void exit() {

            if (Settings.Global.getInt(mContext.getContentResolver(),

                    Settings.Global.AIRPLANE_MODE_ON, 0) != 1) {

                /* Request a CS wakelock during transition to mobile */

                checkAndSetConnectivityInstance();

                mCm.requestNetworkTransitionWakelock(getName());

            }

        }

    }



    class DisconnectingState extends State {

        @Override