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

Commit 7b9939b2 authored by Jef Oliver's avatar Jef Oliver Committed by Gerrit Code Review
Browse files

Merge "Port wimax support changes from CM9." into jellybean

parents a63e33d3 7305fbee

core/java/android/app/ContextImpl.java

+7 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ import android.net.wifi.IWifiManager; 
import android.net.wifi.WifiManager;

import android.net.wifi.p2p.IWifiP2pManager;

import android.net.wifi.p2p.WifiP2pManager;

import android.net.wimax.WimaxHelper;

import android.net.wimax.WimaxManagerConstants;

import android.nfc.NfcManager;

import android.os.Binder;

import android.os.Bundle;
@@ -496,6 +498,11 @@ class ContextImpl extends Context { 
                    final Context outerContext = ctx.getOuterContext();

                    return new ProfileManager (outerContext, ctx.mMainThread.getHandler());

                }});



        registerService(WimaxManagerConstants.WIMAX_SERVICE, new ServiceFetcher() {

                public Object createService(ContextImpl ctx) {

                    return WimaxHelper.createWimaxService(ctx, ctx.mMainThread.getHandler());

                }});

    }



    static ContextImpl getImpl(Context context) {

core/java/android/net/wimax/WimaxManagerConstants.java

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ public class WimaxManagerConstants 
     * The lookup key for an int that indicates whether Wimax is enabled,

     * disabled, enabling, disabling, or unknown.

     */

    public static final String EXTRA_WIMAX_STATUS = "wimax_status";

    public static final String EXTRA_4G_STATE = "4g_state";



    /**

     * Broadcast intent action indicating that Wimax state has been changed
@@ -48,7 +48,6 @@ public class WimaxManagerConstants 
     * initializing, initialized, unknown and ready.

     */

    public static final String EXTRA_WIMAX_STATE = "WimaxState";

    public static final String EXTRA_4G_STATE = "4g_state";

    public static final String EXTRA_WIMAX_STATE_INT = "WimaxStateInt";

    /**

     * The lookup key for an int that indicates whether state of Wimax

packages/SystemUI/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
    <uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" />

    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />

    <uses-permission android:name="com.android.phone.CHANGE_NETWORK_MODE" />

    <uses-permission android:name="android.permission.ACCESS_4G_RADIO_DISABLE" />

    <uses-permission android:name="android.permission.ACCESS_4G_STATE" />

    <uses-permission android:name="android.permission.CHANGE_4G_STATE" />



    <!-- Physical hardware -->

    <uses-permission android:name="android.permission.MANAGE_USB" />

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

+2 −10
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import android.net.Proxy; 
import android.net.ProxyProperties;

import android.net.RouteInfo;

import android.net.wifi.WifiStateTracker;

import android.net.wimax.WimaxHelper;

import android.net.wimax.WimaxManagerConstants;

import android.os.Binder;

import android.os.FileUtils;
@@ -557,8 +558,6 @@ private NetworkStateTracker makeWimaxStateTracker() { 
        Class wimaxStateTrackerClass = null;

        Class wimaxServiceClass = null;

        Class wimaxManagerClass;

        String wimaxJarLocation;

        String wimaxLibLocation;

        String wimaxManagerClassName;

        String wimaxServiceClassName;

        String wimaxStateTrackerClassName;
@@ -570,10 +569,6 @@ private NetworkStateTracker makeWimaxStateTracker() { 


        if (isWimaxEnabled) {

            try {

                wimaxJarLocation = mContext.getResources().getString(

                        com.android.internal.R.string.config_wimaxServiceJarLocation);

                wimaxLibLocation = mContext.getResources().getString(

                        com.android.internal.R.string.config_wimaxNativeLibLocation);

                wimaxManagerClassName = mContext.getResources().getString(

                        com.android.internal.R.string.config_wimaxManagerClassname);

                wimaxServiceClassName = mContext.getResources().getString(
@@ -581,10 +576,7 @@ private NetworkStateTracker makeWimaxStateTracker() { 
                wimaxStateTrackerClassName = mContext.getResources().getString(

                        com.android.internal.R.string.config_wimaxStateTrackerClassname);



                log("wimaxJarLocation: " + wimaxJarLocation);

                wimaxClassLoader =  new DexClassLoader(wimaxJarLocation,

                        new ContextWrapper(mContext).getCacheDir().getAbsolutePath(),

                        wimaxLibLocation, ClassLoader.getSystemClassLoader());

                wimaxClassLoader = WimaxHelper.getWimaxClassLoader(mContext);



                try {

                    wimaxManagerClass = wimaxClassLoader.loadClass(wimaxManagerClassName);