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

Commit 63a89b31 authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

Merge "BT_MAINLINE Delete getControllerActivityEnergyInfo" am: cd49fe4b am:... 

Merge "BT_MAINLINE Delete getControllerActivityEnergyInfo" am: cd49fe4b am: 8c5918d6 am: e03b155f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1896735

Change-Id: I393a6820be537ba580b4aa260d93f48f997358ba
parents ccd8b4ac e03b155f

framework/java/android/bluetooth/BluetoothAdapter.java

+0 −35
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import android.compat.annotation.UnsupportedAppUsage; 
import android.content.Attributable;

import android.content.AttributionSource;

import android.content.Context;

import android.os.BatteryStats;

import android.os.Binder;

import android.os.Build;

import android.os.IBinder;
@@ -59,7 +58,6 @@ 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;
@@ -82,7 +80,6 @@ import java.util.Set; 
import java.util.UUID;

import java.util.WeakHashMap;

import java.util.concurrent.Executor;

import java.util.concurrent.TimeoutException;

import java.util.concurrent.locks.ReentrantReadWriteLock;



/**
@@ -2423,38 +2420,6 @@ public final class BluetoothAdapter { 
        return false;

    }



    /**

     * Return 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.

     *

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

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

     * unsupported

     * @hide

     * @deprecated use the asynchronous {@link #requestControllerActivityEnergyInfo(ResultReceiver)}

     * instead.

     */

    @Deprecated

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public BluetoothActivityEnergyInfo getControllerActivityEnergyInfo(int updateType) {

        SynchronousResultReceiver receiver = new SynchronousResultReceiver();

        requestControllerActivityEnergyInfo(receiver);

        try {

            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