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

Commit bf991a8f authored by John Spurlock's avatar John Spurlock
Browse files

Move battery stats call from SystemUI to system server. 

The UPDATE_DEVICE_STATS permission is no longer required in sysui.

Change-Id: Icc3120b7873563e3727e56bed9f3b4767da0606d
parent 73cbbc3d

packages/SystemUI/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
    <uses-permission android:name="android.permission.MANAGE_USB" />

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

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

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

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

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

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java

+0 −19
Original line number Diff line number Diff line
@@ -27,11 +27,9 @@ import android.net.wifi.WifiConfiguration; 
import android.net.wifi.WifiInfo;

import android.net.wifi.WifiManager;

import android.net.wimax.WimaxManagerConstants;

import android.os.Binder;

import android.os.Handler;

import android.os.Message;

import android.os.Messenger;

import android.os.RemoteException;

import android.provider.Settings;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;
@@ -42,12 +40,10 @@ import android.view.View; 
import android.widget.ImageView;

import android.widget.TextView;



import com.android.internal.app.IBatteryStats;

import com.android.internal.telephony.IccCardConstants;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.cdma.EriInfo;

import com.android.internal.util.AsyncChannel;

import com.android.server.am.BatteryStatsService;

import com.android.systemui.R;



import java.io.FileDescriptor;
@@ -166,9 +162,6 @@ public class NetworkController extends BroadcastReceiver { 


    boolean mDataAndWifiStacked = false;



    // yuck -- stop doing this here and put it in the framework

    IBatteryStats mBatteryStats;



    public interface SignalCluster {

        void setWifiIndicators(boolean visible, int strengthIcon, int activityIcon,

                String contentDescription);
@@ -253,9 +246,6 @@ public class NetworkController extends BroadcastReceiver { 
        // AIRPLANE_MODE_CHANGED is sent at boot; we've probably already missed it

        updateAirplaneMode();



        // yuck

        mBatteryStats = BatteryStatsService.getService();



        mLastLocale = mContext.getResources().getConfiguration().locale;

    }
@@ -792,15 +782,6 @@ public class NetworkController extends BroadcastReceiver { 
            }

        }



        // yuck - this should NOT be done by the status bar

        long ident = Binder.clearCallingIdentity();

        try {

            mBatteryStats.notePhoneDataConnectionState(mPhone.getNetworkType(), visible);

        } catch (RemoteException e) {

        } finally {

            Binder.restoreCallingIdentity(ident);

        }



        mDataDirectionIconId = iconId;

        mDataConnected = visible;

    }

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

+6 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ import com.android.internal.telephony.Phone; 
import com.android.internal.telephony.PhoneConstants;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.am.BatteryStatsService;

import com.android.server.connectivity.DataConnectionStats;

import com.android.server.connectivity.Nat464Xlat;

import com.android.server.connectivity.Tethering;

import com.android.server.connectivity.Vpn;
@@ -346,6 +347,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
    // the set of network types that can only be enabled by system/sig apps

    List mProtectedNetworks;



    private DataConnectionStats mDataConnectionStats;



    public ConnectivityService(Context context, INetworkManagementService netd,

            INetworkStatsService statsService, INetworkPolicyManager policyManager) {

        // Currently, omitting a NetworkFactory will create one internally
@@ -574,6 +577,9 @@ public class ConnectivityService extends IConnectivityManager.Stub { 


        mCaptivePortalTracker = CaptivePortalTracker.makeCaptivePortalTracker(mContext, this);

        loadGlobalProxy();



        mDataConnectionStats = new DataConnectionStats(mContext);

        mDataConnectionStats.startMonitoring();

    }



    /**

services/java/com/android/server/connectivity/DataConnectionStats.java

0 → 100644
+154 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.connectivity;



import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.net.ConnectivityManager;

import android.os.RemoteException;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.TelephonyManager;

import android.util.Log;



import com.android.internal.app.IBatteryStats;

import com.android.internal.telephony.IccCardConstants;

import com.android.internal.telephony.TelephonyIntents;

import com.android.server.am.BatteryStatsService;



public class DataConnectionStats extends BroadcastReceiver {

    private static final String TAG = "DataConnectionStats";

    private static final boolean DEBUG = false;



    private final Context mContext;

    private final IBatteryStats mBatteryStats;



    private IccCardConstants.State mSimState = IccCardConstants.State.READY;

    private SignalStrength mSignalStrength;

    private ServiceState mServiceState;

    private int mDataState = TelephonyManager.DATA_DISCONNECTED;



    public DataConnectionStats(Context context) {

        mContext = context;

        mBatteryStats = BatteryStatsService.getService();

    }



    public void startMonitoring() {

        TelephonyManager phone =

                (TelephonyManager)mContext.getSystemService(Context.TELEPHONY_SERVICE);

        phone.listen(mPhoneStateListener,

                PhoneStateListener.LISTEN_SERVICE_STATE

              | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

              | PhoneStateListener.LISTEN_DATA_CONNECTION_STATE

              | PhoneStateListener.LISTEN_DATA_ACTIVITY);



        IntentFilter filter = new IntentFilter();

        filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);

        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);

        filter.addAction(ConnectivityManager.INET_CONDITION_ACTION);

        mContext.registerReceiver(this, filter);

    }



    @Override

    public void onReceive(Context context, Intent intent) {

        final String action = intent.getAction();

        if (action.equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) {

            updateSimState(intent);

            notePhoneDataConnectionState();

        } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION) ||

                action.equals(ConnectivityManager.INET_CONDITION_ACTION)) {

            notePhoneDataConnectionState();

       }

    }



    private void notePhoneDataConnectionState() {

        if (mServiceState == null) {

            return;

        }

        boolean simReadyOrUnknown = mSimState == IccCardConstants.State.READY

                || mSimState == IccCardConstants.State.UNKNOWN;

        boolean visible = (simReadyOrUnknown || isCdma()) // we only check the sim state for GSM

                && hasService()

                && mDataState == TelephonyManager.DATA_CONNECTED;

        int networkType = mServiceState.getDataNetworkType();

        if (DEBUG) Log.d(TAG, String.format("Noting data connection for network type %s: %svisible",

                networkType, visible ? "" : "not "));

        try {

            mBatteryStats.notePhoneDataConnectionState(networkType, visible);

        } catch (RemoteException e) {

            Log.w(TAG, "Error noting data connection state", e);

        }

    }



    private final void updateSimState(Intent intent) {

        String stateExtra = intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE);

        if (IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(stateExtra)) {

            mSimState = IccCardConstants.State.ABSENT;

        } else if (IccCardConstants.INTENT_VALUE_ICC_READY.equals(stateExtra)) {

            mSimState = IccCardConstants.State.READY;

        } else if (IccCardConstants.INTENT_VALUE_ICC_LOCKED.equals(stateExtra)) {

            final String lockedReason =

                    intent.getStringExtra(IccCardConstants.INTENT_KEY_LOCKED_REASON);

            if (IccCardConstants.INTENT_VALUE_LOCKED_ON_PIN.equals(lockedReason)) {

                mSimState = IccCardConstants.State.PIN_REQUIRED;

            } else if (IccCardConstants.INTENT_VALUE_LOCKED_ON_PUK.equals(lockedReason)) {

                mSimState = IccCardConstants.State.PUK_REQUIRED;

            } else {

                mSimState = IccCardConstants.State.NETWORK_LOCKED;

            }

        } else {

            mSimState = IccCardConstants.State.UNKNOWN;

        }

    }



    private boolean isCdma() {

        return mSignalStrength != null && !mSignalStrength.isGsm();

    }



    private boolean hasService() {

        return mServiceState != null

                && mServiceState.getState() != ServiceState.STATE_OUT_OF_SERVICE

                && mServiceState.getState() != ServiceState.STATE_POWER_OFF;

    }



    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {

        @Override

        public void onSignalStrengthsChanged(SignalStrength signalStrength) {

            mSignalStrength = signalStrength;

        }



        @Override

        public void onServiceStateChanged(ServiceState state) {

            mServiceState = state;

            notePhoneDataConnectionState();

        }



        @Override

        public void onDataConnectionStateChanged(int state, int networkType) {

            mDataState = state;

            notePhoneDataConnectionState();

        }



        @Override

        public void onDataActivity(int direction) {

            notePhoneDataConnectionState();

        }

    };

}