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

Commit 311dea2a authored by Natiq Ahmed's avatar Natiq Ahmed
Browse files

Fix compilation and Current.text errors 

Change-Id: Ibb971cd7336241134376d1f58679c1cf21bd0077
parent 8fd5d25a

api/current.txt

+4 −2
Original line number Diff line number Diff line
@@ -28660,8 +28660,6 @@ package android.telephony { 
    method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);

    field public static final int DATA_ROAMING_DISABLE = 0; // 0x0

    field public static final int DATA_ROAMING_ENABLE = 1; // 0x1

    method public void registerOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);

    method public void unregisterOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);

  }















  public static class SubscriptionManager.OnSubscriptionsChangedListener {










@@ -28716,6 +28714,10 @@ package android.telephony {













    field public static final int CALL_STATE_IDLE = 0; // 0x0















    field public static final int CALL_STATE_OFFHOOK = 2; // 0x2















    field public static final int CALL_STATE_RINGING = 1; // 0x1













    field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe













    field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1













    field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0













    field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff















    field public static final int DATA_ACTIVITY_DORMANT = 4; // 0x4















    field public static final int DATA_ACTIVITY_IN = 1; // 0x1















    field public static final int DATA_ACTIVITY_INOUT = 3; // 0x3

























api/system-current.txt



+65
−4




























Original line number
Diff line number
Diff line








@@ -10478,6 +10478,14 @@ package android.drm {













    field public static final java.lang.String REMAINING_REPEAT_COUNT = "remaining_repeat_count";















  }



























  public static class DrmStore.DrmDeliveryType {













    ctor public DrmStore.DrmDeliveryType();













    field public static final int COMBINED_DELIVERY = 2; // 0x2













    field public static final int FORWARD_LOCK = 1; // 0x1













    field public static final int SEPARATE_DELIVERY = 3; // 0x3













    field public static final int SEPARATE_DELIVERY_FL = 4; // 0x4













  }



























  public static class DrmStore.DrmObjectType {















    ctor public deprecated DrmStore.DrmObjectType();















    field public static final int CONTENT = 1; // 0x1










@@ -10807,15 +10815,23 @@ package android.graphics {













  public class BitmapFactory {















    ctor public BitmapFactory();















    method public static android.graphics.Bitmap decodeByteArray(byte[], int, int, android.graphics.BitmapFactory.Options);













    method public static android.graphics.Bitmap decodeByteArray(byte[], int, int, android.graphics.BitmapFactory.Options, boolean);















    method public static android.graphics.Bitmap decodeByteArray(byte[], int, int);













    method public static android.graphics.Bitmap decodeByteArray(byte[], int, int, boolean);















    method public static android.graphics.Bitmap decodeFile(java.lang.String, android.graphics.BitmapFactory.Options);













    method public static android.graphics.Bitmap decodeFile(java.lang.String, android.graphics.BitmapFactory.Options, boolean);















    method public static android.graphics.Bitmap decodeFile(java.lang.String);















    method public static android.graphics.Bitmap decodeFileDescriptor(java.io.FileDescriptor, android.graphics.Rect, android.graphics.BitmapFactory.Options);













    method public static android.graphics.Bitmap decodeFileDescriptor(java.io.FileDescriptor, android.graphics.Rect, android.graphics.BitmapFactory.Options, boolean);















    method public static android.graphics.Bitmap decodeFileDescriptor(java.io.FileDescriptor);















    method public static android.graphics.Bitmap decodeResource(android.content.res.Resources, int, android.graphics.BitmapFactory.Options);













    method public static android.graphics.Bitmap decodeResource(android.content.res.Resources, int, android.graphics.BitmapFactory.Options, boolean);















    method public static android.graphics.Bitmap decodeResource(android.content.res.Resources, int);













    method public static android.graphics.Bitmap decodeResource(android.content.res.Resources, int, boolean);















    method public static android.graphics.Bitmap decodeResourceStream(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, android.graphics.Rect, android.graphics.BitmapFactory.Options);













    method public static android.graphics.Bitmap decodeResourceStream(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, android.graphics.Rect, android.graphics.BitmapFactory.Options, boolean);















    method public static android.graphics.Bitmap decodeStream(java.io.InputStream, android.graphics.Rect, android.graphics.BitmapFactory.Options);













    method public static android.graphics.Bitmap decodeStream(java.io.InputStream, android.graphics.Rect, android.graphics.BitmapFactory.Options, boolean);















    method public static android.graphics.Bitmap decodeStream(java.io.InputStream);















  }
























@@ -16651,7 +16667,7 @@ package android.media {













    method public android.database.Cursor getCursor();















    method public static int getDefaultType(android.net.Uri);















    method public static android.net.Uri getDefaultUri(int);













    method public deprecated boolean getIncludeDrm();













    method public boolean getIncludeDrm();















    method public android.media.Ringtone getRingtone(int);















    method public static android.media.Ringtone getRingtone(android.content.Context, android.net.Uri);















    method public int getRingtonePosition(android.net.Uri);









@@ -16661,14 +16677,14 @@ package android.media {













    method public int inferStreamType();















    method public static boolean isDefault(android.net.Uri);















    method public static void setActualDefaultRingtoneUri(android.content.Context, int, android.net.Uri);













    method public deprecated void setIncludeDrm(boolean);













    method public void setIncludeDrm(boolean);















    method public void setStopPreviousRingtone(boolean);















    method public void setType(int);















    method public void stopPreviousRingtone();















    field public static final java.lang.String ACTION_RINGTONE_PICKER = "android.intent.action.RINGTONE_PICKER";















    field public static final java.lang.String EXTRA_RINGTONE_DEFAULT_URI = "android.intent.extra.ringtone.DEFAULT_URI";















    field public static final java.lang.String EXTRA_RINGTONE_EXISTING_URI = "android.intent.extra.ringtone.EXISTING_URI";













    field public static final deprecated java.lang.String EXTRA_RINGTONE_INCLUDE_DRM = "android.intent.extra.ringtone.INCLUDE_DRM";













    field public static final java.lang.String EXTRA_RINGTONE_INCLUDE_DRM = "android.intent.extra.ringtone.INCLUDE_DRM";















    field public static final java.lang.String EXTRA_RINGTONE_PICKED_URI = "android.intent.extra.ringtone.PICKED_URI";















    field public static final java.lang.String EXTRA_RINGTONE_SHOW_DEFAULT = "android.intent.extra.ringtone.SHOW_DEFAULT";















    field public static final java.lang.String EXTRA_RINGTONE_SHOW_SILENT = "android.intent.extra.ringtone.SHOW_SILENT";










@@ -29913,6 +29929,7 @@ package android.telecom {













    method public void hold();















    method public void mergeConference();















    method public void phoneAccountSelected(android.telecom.PhoneAccountHandle, boolean);













    method public void phoneAccountSelected(android.telecom.PhoneAccountHandle);















    method public void playDtmfTone(char);















    method public void postDialContinue(boolean);















    method public void reject(boolean, java.lang.String);









@@ -29937,6 +29954,7 @@ package android.telecom {













    method public android.telecom.PhoneAccountHandle getAccountHandle();















    method public int getCallCapabilities();















    method public int getCallProperties();













    method public int getCallSubstate();















    method public java.lang.String getCallerDisplayName();















    method public int getCallerDisplayNamePresentation();















    method public long getConnectTimeMillis();










@@ -29997,6 +30015,7 @@ package android.telecom {













    method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();















    method public android.telecom.Connection getPrimaryConnection();















    method public final int getState();













    method public void onAddParticipant(java.lang.String);















    method public void onAudioStateChanged(android.telecom.AudioState);















    method public void onConnectionAdded(android.telecom.Connection);















    method public void onDisconnect();









@@ -30015,7 +30034,9 @@ package android.telecom {













    method public final void setConnectionCapabilities(int);















    method public final void setDisconnected(android.telecom.DisconnectCause);















    method public final void setOnHold();













    method public final void setVideoState(android.telecom.Connection, int);















    field public static long CONNECT_TIME_NOT_SPECIFIED;













    field public static final long NO_CONNECTTIME = 0L; // 0x0L















    field protected android.telecom.PhoneAccountHandle mPhoneAccount;















  }























@@ -30030,6 +30051,7 @@ package android.telecom {













    method public final boolean getAudioModeIsVoip();















    method public final android.telecom.AudioState getAudioState();















    method public final deprecated int getCallCapabilities();













    method public final int getCallProperties();















    method public final java.lang.String getCallerDisplayName();















    method public final int getCallerDisplayNamePresentation();















    method public final android.telecom.Conference getConference();









@@ -30039,10 +30061,11 @@ package android.telecom {













    method public final int getState();















    method public final android.telecom.StatusHints getStatusHints();















    method public final boolean isRingbackRequested();













    method protected void notifyConferenceStarted();















    method public void onAbort();















    method public void onAnswer();















    method public void onAudioStateChanged(android.telecom.AudioState);













    method public void onConferenceChanged();













    method public void onConferenceWith(android.telecom.Connection);















    method public void onDisconnect();















    method public void onHold();















    method public void onPlayDtmfTone(char);









@@ -30052,10 +30075,12 @@ package android.telecom {













    method public void onStateChanged(int);















    method public void onStopDtmfTone();















    method public void onUnhold();













    method public final void resetCdmaConnectionTime();















    method public final void setActive();















    method public final void setAddress(android.net.Uri, int);















    method public final void setAudioModeIsVoip(boolean);















    method public final deprecated void setCallCapabilities(int);













    method public final void setCallProperties(int);















    method public final void setCallerDisplayName(java.lang.String, int);















    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);















    method public final void setConferenceables(java.util.List<android.telecom.IConferenceable>);









@@ -30063,6 +30088,7 @@ package android.telecom {













    method public final void setConnectionService(android.telecom.ConnectionService);















    method public final void setDialing();















    method public final void setDisconnected(android.telecom.DisconnectCause);













    method public final void setExtras(android.os.Bundle);















    method public final void setInitialized();















    method public final void setInitializing();















    method public final void setOnHold();









@@ -30071,6 +30097,12 @@ package android.telecom {













    method public final void setRinging();















    method public final void setStatusHints(android.telecom.StatusHints);















    method public static java.lang.String stateToString(int);













    field public static final int CALL_SUBSTATE_ALL = 15; // 0xf













    field public static final int CALL_SUBSTATE_AUDIO_CONNECTED_SUSPENDED = 1; // 0x1













    field public static final int CALL_SUBSTATE_AVP_RETRY = 4; // 0x4













    field public static final int CALL_SUBSTATE_MEDIA_PAUSED = 8; // 0x8













    field public static final int CALL_SUBSTATE_NONE = 0; // 0x0













    field public static final int CALL_SUBSTATE_VIDEO_CONNECTED_SUSPENDED = 2; // 0x2















    field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000















    field public static final int CAPABILITY_HOLD = 1; // 0x1















    field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80










@@ -30113,6 +30145,7 @@ package android.telecom {













    method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);















    method public void onRemoteConferenceAdded(android.telecom.RemoteConference);















    method public void onRemoteExistingConnectionAdded(android.telecom.RemoteConnection);













    method public void triggerConferenceRecalculate();















    field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.ConnectionService";















  }
























@@ -30193,6 +30226,7 @@ package android.telecom {













    method public android.telecom.PhoneAccountHandle getAccountHandle();















    method public android.net.Uri getAddress();















    method public int getCapabilities();













    method public int getColor();















    method public int getHighlightColor();















    method public android.graphics.Bitmap getIconBitmap();















    method public java.lang.String getIconPackageName();









@@ -30209,6 +30243,7 @@ package android.telecom {













    field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10















    field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4















    field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;













    field public static final int NO_COLOR = -1; // 0xffffffff















    field public static final int NO_HIGHLIGHT_COLOR = 0; // 0x0















    field public static final int NO_ICON_TINT = 0; // 0x0















    field public static final int NO_RESOURCE_ID = -1; // 0xffffffff









@@ -30223,12 +30258,15 @@ package android.telecom {













    method public android.telecom.PhoneAccount build();















    method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri);















    method public android.telecom.PhoneAccount.Builder setCapabilities(int);













    method public android.telecom.PhoneAccount.Builder setColor(int);















    method public android.telecom.PhoneAccount.Builder setHighlightColor(int);















    method public android.telecom.PhoneAccount.Builder setIcon(android.content.Context, int);















    method public android.telecom.PhoneAccount.Builder setIcon(java.lang.String, int);















    method public android.telecom.PhoneAccount.Builder setIcon(android.content.Context, int, int);















    method public android.telecom.PhoneAccount.Builder setIcon(java.lang.String, int, int);















    method public android.telecom.PhoneAccount.Builder setIcon(android.graphics.Bitmap);













    method public android.telecom.PhoneAccount.Builder setIconBitmap(android.graphics.Bitmap);













    method public android.telecom.PhoneAccount.Builder setIconPackageName(java.lang.String);















    method public android.telecom.PhoneAccount.Builder setShortDescription(java.lang.CharSequence);















    method public android.telecom.PhoneAccount.Builder setSubscriptionAddress(android.net.Uri);















    method public android.telecom.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>);









@@ -30243,8 +30281,23 @@ package android.telecom {













    field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccountHandle> CREATOR;















  }



























  public final class PhoneCapabilities {













    method public static java.lang.String toString(int);













    field public static final int ALL = 12527; // 0x30ef













    field public static final int DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000













    field public static final int HOLD = 1; // 0x1













    field public static final int MANAGE_CONFERENCE = 128; // 0x80













    field public static final int MERGE_CONFERENCE = 4; // 0x4













    field public static final int MUTE = 64; // 0x40













    field public static final int RESPOND_VIA_TEXT = 32; // 0x20













    field public static final int SEPARATE_FROM_CONFERENCE = 4096; // 0x1000













    field public static final int SUPPORT_HOLD = 2; // 0x2













    field public static final int SWAP_CONFERENCE = 8; // 0x8













  }



























  public final class RemoteConference {















    method public void disconnect();













    method public final int getCallProperties();















    method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections();















    method public final int getConnectionCapabilities();















    method public final java.util.List<android.telecom.RemoteConnection> getConnections();









@@ -30270,6 +30323,7 @@ package android.telecom {













    method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection);















    method public void onDestroyed(android.telecom.RemoteConference);















    method public void onDisconnected(android.telecom.RemoteConference, android.telecom.DisconnectCause);













    method public void onPropertiesChanged(android.telecom.RemoteConference, int);















    method public void onStateChanged(android.telecom.RemoteConference, int, int);















  }























@@ -30279,6 +30333,7 @@ package android.telecom {













    method public void disconnect();















    method public android.net.Uri getAddress();















    method public int getAddressPresentation();













    method public int getCallProperties();















    method public java.lang.CharSequence getCallerDisplayName();















    method public int getCallerDisplayNamePresentation();















    method public android.telecom.RemoteConference getConference();









@@ -30303,6 +30358,7 @@ package android.telecom {













  public static abstract class RemoteConnection.Callback {















    ctor public RemoteConnection.Callback();















    method public void onAddressChanged(android.telecom.RemoteConnection, android.net.Uri, int);













    method public void onCallPropertiesChanged(android.telecom.RemoteConnection, int);















    method public void onCallerDisplayNameChanged(android.telecom.RemoteConnection, java.lang.String, int);















    method public void onConferenceChanged(android.telecom.RemoteConnection, android.telecom.RemoteConference);















    method public void onConferenceableConnectionsChanged(android.telecom.RemoteConnection, java.util.List<android.telecom.RemoteConnection>);










@@ -30899,6 +30955,7 @@ package android.telephony {













    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);















    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);















    method public boolean isDataConnectivityPossible();













    method public boolean isDataPossibleForSubscription(int, java.lang.String);















    method public boolean isIdle();















    method public boolean isNetworkRoaming();















    method public boolean isOffhook();










@@ -30931,6 +30988,10 @@ package android.telephony {













    field public static final int CALL_STATE_IDLE = 0; // 0x0















    field public static final int CALL_STATE_OFFHOOK = 2; // 0x2















    field public static final int CALL_STATE_RINGING = 1; // 0x1













    field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe













    field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1













    field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0













    field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff















    field public static final int DATA_ACTIVITY_DORMANT = 4; // 0x4















    field public static final int DATA_ACTIVITY_IN = 1; // 0x1















    field public static final int DATA_ACTIVITY_INOUT = 3; // 0x3

























core/jni/android_hardware_Camera.cpp
100644 → 100755



+15
−40




























Original line number
Diff line number
Diff line








@@ -61,8 +61,6 @@ struct fields_t {













    jmethodID   post_event;















    jmethodID   rect_constructor;















    jmethodID   face_constructor;













    jfieldID    face_leftEye;













    jfieldID    face_rightEye;















    jfieldID    face_sm_degree;















    jfieldID    face_sm_score;















    jfieldID    face_blink_detected;










@@ -394,37 +392,6 @@ void JNICameraContext::postMetadata(JNIEnv *env, int32_t msgType, camera_frame_m













        env->SetObjectField(face, fields.face_rect, rect);















        env->SetIntField(face, fields.face_score, metadata->faces[i].score);





























        jobject point1 = env->NewObject(mPointClass, fields.point_constructor);













        env->SetIntField(point1, fields.point_x, metadata->faces[i].left_eye[0]);













        env->SetIntField(point1, fields.point_y, metadata->faces[i].left_eye[1]);













        env->SetObjectField(face, fields.face_leftEye, point1);



























        jobject point2 = env->NewObject(mPointClass, fields.point_constructor);













        env->SetIntField(point2, fields.point_x, metadata->faces[i].right_eye[0]);













        env->SetIntField(point2, fields.point_y, metadata->faces[i].right_eye[1]);













        env->SetObjectField(face, fields.face_rightEye, point2);



























        jobject point3 = env->NewObject(mPointClass, fields.point_constructor);













        env->SetIntField(point3, fields.point_x, metadata->faces[i].mouth[0]);













        env->SetIntField(point3, fields.point_y, metadata->faces[i].mouth[1]);













        env->SetObjectField(face, fields.face_mouth, point3);



























        env->SetIntField(face, fields.face_id, metadata->faces[i].id);



























        if (mIsExtendedFace) {













            env->SetIntField(face, fields.face_sm_degree, metadata->faces[i].smile_degree);













            env->SetIntField(face, fields.face_sm_score, metadata->faces[i].smile_score);













            env->SetIntField(face, fields.face_blink_detected, metadata->faces[i].blink_detected);













            env->SetIntField(face, fields.face_recognised, metadata->faces[i].face_recognised);













            env->SetIntField(face, fields.face_gaze_angle, metadata->faces[i].gaze_angle);













            env->SetIntField(face, fields.face_updown_dir, metadata->faces[i].updown_dir);













            env->SetIntField(face, fields.face_leftright_dir, metadata->faces[i].leftright_dir);













            env->SetIntField(face, fields.face_roll_dir, metadata->faces[i].roll_dir);













            env->SetIntField(face, fields.face_leye_blink, metadata->faces[i].leye_blink);













            env->SetIntField(face, fields.face_reye_blink, metadata->faces[i].reye_blink);













            env->SetIntField(face, fields.face_left_right_gaze, metadata->faces[i].left_right_gaze);













            env->SetIntField(face, fields.face_top_bottom_gaze, metadata->faces[i].top_bottom_gaze);













        }















        bool optionalFields = metadata->faces[i].id != 0















            && metadata->faces[i].left_eye[0] != -2000 && metadata->faces[i].left_eye[1] != -2000















            && metadata->faces[i].right_eye[0] != -2000 && metadata->faces[i].right_eye[1] != -2000










@@ -452,12 +419,24 @@ void JNICameraContext::postMetadata(JNIEnv *env, int32_t msgType, camera_frame_m













            env->DeleteLocalRef(mouth);















        }





























        if (mIsExtendedFace) {













            env->SetIntField(face, fields.face_sm_degree, metadata->faces[i].smile_degree);













            env->SetIntField(face, fields.face_sm_score, metadata->faces[i].smile_score);













            env->SetIntField(face, fields.face_blink_detected, metadata->faces[i].blink_detected);













            env->SetIntField(face, fields.face_recognised, metadata->faces[i].face_recognised);













            env->SetIntField(face, fields.face_gaze_angle, metadata->faces[i].gaze_angle);













            env->SetIntField(face, fields.face_updown_dir, metadata->faces[i].updown_dir);













            env->SetIntField(face, fields.face_leftright_dir, metadata->faces[i].leftright_dir);













            env->SetIntField(face, fields.face_roll_dir, metadata->faces[i].roll_dir);













            env->SetIntField(face, fields.face_leye_blink, metadata->faces[i].leye_blink);













            env->SetIntField(face, fields.face_reye_blink, metadata->faces[i].reye_blink);













            env->SetIntField(face, fields.face_left_right_gaze, metadata->faces[i].left_right_gaze);













            env->SetIntField(face, fields.face_top_bottom_gaze, metadata->faces[i].top_bottom_gaze);













        }





























        env->DeleteLocalRef(face);















        env->DeleteLocalRef(rect);





























        env->DeleteLocalRef(point1);













        env->DeleteLocalRef(point2);













        env->DeleteLocalRef(point3);















    }















    env->CallStaticVoidMethod(mCameraJClass, fields.post_event,















            mCameraJObjectWeak, msgType, 0, 0, obj);










@@ -1211,8 +1190,6 @@ int register_android_hardware_Camera(JNIEnv *env)













        { "android/hardware/Camera$Face", "rect", "Landroid/graphics/Rect;", &fields.face_rect },















        { "android/hardware/Camera$Face", "score", "I", &fields.face_score },















        { "android/hardware/Camera$Face", "id", "I", &fields.face_id },













        { "android/hardware/Camera$Face", "leftEye", "Landroid/graphics/Point;", &fields.face_leftEye },













        { "android/hardware/Camera$Face", "rightEye", "Landroid/graphics/Point;", &fields.face_rightEye },















        { "android/hardware/Camera$Face", "mouth", "Landroid/graphics/Point;", &fields.face_mouth },















        { "android/hardware/Camera$Face", "smileDegree", "I", &fields.face_sm_degree },















        { "android/hardware/Camera$Face", "smileScore", "I", &fields.face_sm_score },









@@ -1224,8 +1201,6 @@ int register_android_hardware_Camera(JNIEnv *env)













        { "org/codeaurora/camera/ExtendedFace", "rect", "Landroid/graphics/Rect;", &fields.face_rect },















        { "org/codeaurora/camera/ExtendedFace", "score", "I", &fields.face_score },















        { "org/codeaurora/camera/ExtendedFace", "id", "I", &fields.face_id },













        { "org/codeaurora/camera/ExtendedFace", "leftEye", "Landroid/graphics/Point;", &fields.face_leftEye },













        { "org/codeaurora/camera/ExtendedFace", "rightEye", "Landroid/graphics/Point;", &fields.face_rightEye },















        { "org/codeaurora/camera/ExtendedFace", "mouth", "Landroid/graphics/Point;", &fields.face_mouth },















        { "org/codeaurora/camera/ExtendedFace", "smileDegree", "I", &fields.face_sm_degree },















        { "org/codeaurora/camera/ExtendedFace", "smileScore", "I", &fields.face_sm_score },

































packages/SystemUI/tests/Android.mk



+1
−1




























Original line number
Diff line number
Diff line








@@ -36,4 +36,4 @@ LOCAL_STATIC_JAVA_LIBRARIES := mockito-target Keyguard













# UI it doesn't own. This is necessary to allow screenshots to be taken















LOCAL_CERTIFICATE := platform





























include $(BUILD_PACKAGE)












#include $(BUILD_PACKAGE)
























telecomm/java/android/telecom/Call.java



+12
−0




























Original line number
Diff line number
Diff line








@@ -663,6 +663,18 @@ public final class Call {













        mInCallAdapter.postDialContinue(mTelecomCallId, proceed);















    }





























//FIXME L-MR1-INTERNAL













    /**













     * Notifies this {@code Call} that an account has been selected and to proceed with placing













     * an outgoing call. Optionally sets this account as the default account.













     */













    public void phoneAccountSelected(PhoneAccountHandle accountHandle, boolean setDefault) {













        //mInCallAdapter.phoneAccountSelected(mTelecomCallId, accountHandle, setDefault);



























    }

























































    /**















     * Notifies this {@code Call} that an account has been selected and to proceed with placing















     * an outgoing call.