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

Commit d9b89352 authored by Natiq Ahmed's avatar Natiq Ahmed
Browse files

Telephony and fixes. 

Change-Id: I09ee69a0096c10bebc6ec2bb5c8de970c10ffc87
parent 5f250bdc

api/current.txt

+0 −4
Original line number Diff line number Diff line
@@ -28714,10 +28714,6 @@ 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

+0 −4
Original line number Diff line number Diff line
@@ -30988,10 +30988,6 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,8 @@ 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_left_eye },

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

        { "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 },
@@ -1201,6 +1203,8 @@ 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 },

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

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

        { "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 },

telephony/java/android/telephony/TelephonyManager.java

+4 −0
Original line number Diff line number Diff line
@@ -3320,9 +3320,13 @@ public class TelephonyManager { 
    /**

     * Values used to return status for hasCarrierPrivileges call.

     */

    /** @hide */

    public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1;

    /** @hide */

    public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0;

    /** @hide */

    public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1;

    /** @hide */

    public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2;



    /**

wifi/java/android/net/wifi/WifiConfiguration.java

+0 −7
Original line number Diff line number Diff line
@@ -865,11 +865,6 @@ public class WifiConfiguration implements Parcelable { 
     */

    public HashMap<String, Integer>  linkedConfigurations;



    /**

     * @hide

     * Duplicate Wifi Configuration

     */

    public boolean duplicateNetwork;



    public WifiConfiguration() {

        networkId = INVALID_NETWORK_ID;
@@ -896,7 +891,6 @@ public class WifiConfiguration implements Parcelable { 
        ephemeral = false;

        validatedInternetAccess = false;

        mIpConfiguration = new IpConfiguration();

        duplicateNetwork = false;

        SIMNum = 0;

    }
@@ -1596,7 +1590,6 @@ public class WifiConfiguration implements Parcelable { 
                    = source.autoJoinUseAggressiveJoinAttemptThreshold;

            autoJoinBailedDueToLowRssi = source.autoJoinBailedDueToLowRssi;

            dirty = source.dirty;

            duplicateNetwork = source.duplicateNetwork;

            SIMNum = source.SIMNum;

            numNoInternetAccessReports = source.numNoInternetAccessReports;

        }