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

Commit 8f9b33e7 authored by Jake Hamby's avatar Jake Hamby
Browse files

Add new RIL commands to read/write NV items and reset NV config. 

Add new RIL commands and generic code cleanups.

The only changes required for OMA DM support are the
addition of five new methods in ITelephony.aidl for
reading/writing NV items and performing NV config and
radio resets (requires MODIFY_PHONE_STATE), along with
the new RIL request IDs in RILConstants.java.

Bug: 12864208
Change-Id: I958d2571580d98a49936ef2e6822e5ac086acbe2
parent 6c90d439

core/java/android/net/ConnectivityManager.java

+2 −0
Original line number Diff line number Diff line
@@ -800,6 +800,8 @@ public class ConnectivityManager { 
     * Ensure that a network route exists to deliver traffic to the specified

     * host via the specified network interface. An attempt to add a route that

     * already exists is ignored, but treated as successful.

     * <p>This method requires the caller to hold the permission

     * {@link android.Manifest.permission#CHANGE_NETWORK_STATE}.

     * @param networkType the type of the network over which traffic to the specified

     * host is to be routed

     * @param hostAddress the IP address of the host to which the route is desired

core/java/android/net/MobileDataStateTracker.java

+4 −4
Original line number Diff line number Diff line
@@ -306,18 +306,18 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { 
                    if (VDBG) {

                        Slog.d(TAG, "TelephonyMgr.DataConnectionStateChanged");

                        if (mNetworkInfo != null) {

                            Slog.d(TAG, "NetworkInfo = " + mNetworkInfo.toString());

                            Slog.d(TAG, "subType = " + String.valueOf(mNetworkInfo.getSubtype()));

                            Slog.d(TAG, "NetworkInfo = " + mNetworkInfo);

                            Slog.d(TAG, "subType = " + mNetworkInfo.getSubtype());

                            Slog.d(TAG, "subType = " + mNetworkInfo.getSubtypeName());

                        }

                        if (mLinkProperties != null) {

                            Slog.d(TAG, "LinkProperties = " + mLinkProperties.toString());

                            Slog.d(TAG, "LinkProperties = " + mLinkProperties);

                        } else {

                            Slog.d(TAG, "LinkProperties = " );

                        }



                        if (mLinkCapabilities != null) {

                            Slog.d(TAG, "LinkCapabilities = " + mLinkCapabilities.toString());

                            Slog.d(TAG, "LinkCapabilities = " + mLinkCapabilities);

                        } else {

                            Slog.d(TAG, "LinkCapabilities = " );

                        }

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ 
    <!-- =============================================================== -->

    <eat-comment />



    <!-- Used for permissions that provide access to the user voicemail box. -->

    <!-- Used for permissions that provide access to device alarms. -->

    <permission-group android:name="android.permission-group.DEVICE_ALARMS"

        android:label="@string/permgrouplab_deviceAlarms"

        android:icon="@drawable/perm_group_device_alarms"
@@ -1061,7 +1061,7 @@ 
    <!-- =========================================== -->

    <eat-comment />



    <!-- Used for permissions that are associated with accessing and modifyign

    <!-- Used for permissions that are associated with accessing and modifying

         telephony state: placing calls, intercepting outgoing calls, reading

         and modifying the phone state. -->

    <permission-group android:name="android.permission-group.PHONE_CALLS"

services/core/java/com/android/server/ConnectivityService.java

+11 −6
Original line number Diff line number Diff line
@@ -169,9 +169,9 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
    private static final String TAG = "ConnectivityService";



    private static final boolean DBG = true;

    private static final boolean VDBG = false;

    private static final boolean VDBG = true;



    private static final boolean LOGD_RULES = false;

    private static final boolean LOGD_RULES = true;



    // TODO: create better separation between radio types and network types
@@ -4495,12 +4495,17 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
         * @param seconds

         */

        private static void sleep(int seconds) {

            log("XXXXX sleeping for " + seconds + " sec");

            long stopTime = System.nanoTime() + (seconds * 1000000000);

            long sleepTime;

            while ((sleepTime = stopTime - System.nanoTime()) > 0) {

                try {

                Thread.sleep(seconds * 1000);

            } catch (InterruptedException e) {

                e.printStackTrace();

                    Thread.sleep(sleepTime / 1000000);

                } catch (InterruptedException ignored) {

                }

            }

            log("XXXXX returning from sleep");

        }



        private static void log(String s) {

            Slog.d(ConnectivityService.TAG, "[" + CHECKMP_TAG + "] " + s);

telephony/java/android/telephony/CellInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public abstract class CellInfo implements Parcelable { 
        return mRegistered;

    }

    /** @hide */

    public void setRegisterd(boolean registered) {

    public void setRegistered(boolean registered) {

        mRegistered = registered;

    }