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

Commit e77b7142 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev 

am: 0d47f4b

* commit '0d47f4b6463077074abd6bed489a5f9243615c64':
  BatteryStats: Introduce Async external stats requests

Change-Id: I7319535a0210e38a6bc3731a9f0ec42a4485924f
parents f86663ec 6b31ff83

framework/java/android/bluetooth/BluetoothActivityEnergyInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ public final class BluetoothActivityEnergyInfo implements Parcelable { 
     * @return if the record is valid

     */

    public boolean isValid() {

        return ((mControllerTxTimeMs !=0) ||

                (mControllerRxTimeMs !=0) ||

                (mControllerIdleTimeMs !=0));

        return ((mControllerTxTimeMs >=0) &&

                (mControllerRxTimeMs >=0) &&

                (mControllerIdleTimeMs >=0));

    }

}

framework/java/android/bluetooth/BluetoothAdapter.java

+43 −10
Original line number Diff line number Diff line
@@ -31,11 +31,14 @@ import android.bluetooth.le.ScanRecord; 
import android.bluetooth.le.ScanResult;

import android.bluetooth.le.ScanSettings;

import android.content.Context;

import android.os.BatteryStats;

import android.os.Binder;

import android.os.IBinder;

import android.os.ParcelUuid;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ServiceManager;

import android.os.SynchronousResultReceiver;

import android.os.SystemProperties;

import android.util.Log;

import android.util.Pair;
@@ -53,6 +56,7 @@ import java.util.Locale; 
import java.util.Map;

import java.util.Set;

import java.util.UUID;

import java.util.concurrent.TimeoutException;



/**

 * Represents the local device Bluetooth adapter. The {@link BluetoothAdapter}
@@ -1369,33 +1373,62 @@ public final class BluetoothAdapter { 
     *

     * @return a record with {@link BluetoothActivityEnergyInfo} or null if

     * report is unavailable or unsupported

     * @deprecated use the asynchronous

     * {@link #requestControllerActivityEnergyInfo(int, ResultReceiver)} instead.

     * @hide

     */

    @Deprecated

    public BluetoothActivityEnergyInfo getControllerActivityEnergyInfo(int updateType) {

        if (getState() != STATE_ON) return null;

        SynchronousResultReceiver receiver = new SynchronousResultReceiver();

        requestControllerActivityEnergyInfo(updateType, receiver);

        try {

            BluetoothActivityEnergyInfo record;

            if (!mService.isActivityAndEnergyReportingSupported()) {

            SynchronousResultReceiver.Result result = receiver.awaitResult(1000);

            if (result.bundle != null) {

                return result.bundle.getParcelable(BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY);

            }

        } catch (TimeoutException e) {

            Log.e(TAG, "getControllerActivityEnergyInfo timed out");

        }

        return null;

    }



    /**

     * Request the record of {@link BluetoothActivityEnergyInfo} object that

     * has the activity and energy info. This can be used to ascertain what

     * the controller has been up to, since the last sample.

     *

     * A null value for the activity info object may be sent if the bluetooth service is

     * unreachable or the device does not support reporting such information.

     *

     * @param updateType Type of info, cached vs refreshed.

     * @param result The callback to which to send the activity info.

     * @hide

     */

    public void requestControllerActivityEnergyInfo(int updateType, ResultReceiver result) {

        if (getState() != STATE_ON) {

            result.send(0, null);

            return;

        }



        try {

            if (!mService.isActivityAndEnergyReportingSupported()) {

                result.send(0, null);

                return;

            }

            synchronized(this) {

                if (updateType == ACTIVITY_ENERGY_INFO_REFRESHED) {

                    mService.getActivityEnergyInfoFromController();

                    wait(CONTROLLER_ENERGY_UPDATE_TIMEOUT_MILLIS);

                }

                record = mService.reportActivityInfo();

                if (record.isValid()) {

                    return record;

                } else {

                    return null;

                }

                mService.requestActivityInfo(result);

            }

        } catch (InterruptedException e) {

            Log.e(TAG, "getControllerActivityEnergyInfoCallback wait interrupted: " + e);

            result.send(0, null);

        } catch (RemoteException e) {

            Log.e(TAG, "getControllerActivityEnergyInfoCallback: " + e);

            result.send(0, null);

        }

        return null;

    }



    /**

framework/java/android/bluetooth/IBluetooth.aidl

+10 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.bluetooth.BluetoothDevice; 
import android.bluetooth.OobData;

import android.os.ParcelUuid;

import android.os.ParcelFileDescriptor;

import android.os.ResultReceiver;



/**

 * System private API for talking with the Bluetooth service.
@@ -104,6 +105,15 @@ interface IBluetooth 
    void getActivityEnergyInfoFromController();

    BluetoothActivityEnergyInfo reportActivityInfo();



    /**

     * Requests the controller activity info asynchronously.

     * The implementor is expected to reply with the

     * {@link android.bluetooth.BluetoothActivityEnergyInfo} object placed into the Bundle with the

     * key {@link android.os.BatteryStats#RESULT_RECEIVER_CONTROLLER_KEY}.

     * The result code is ignored.

     */

    oneway void requestActivityInfo(in ResultReceiver result);



    void onLeServiceUp();

    void onBrEdrDown();

}