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

Commit 0cea41d8 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Re-declare BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY am: aefe16d2 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1965085

Change-Id: I637cded8d0b9a837da4fee144268e5a2c1f0711c
parents 6bd1f528 aefe16d2

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+3 −2
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ import android.content.IntentFilter; 
import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.os.AsyncTask;

import android.os.BatteryStats;

import android.os.BatteryStatsManager;

import android.os.Binder;

import android.os.Bundle;
@@ -215,6 +214,8 @@ public class AdapterService extends Service { 
    public static final String ACTIVITY_ATTRIBUTION_NO_ACTIVE_DEVICE_ADDRESS =

            "no_active_device_address";



    public static final String RESULT_RECEIVER_CONTROLLER_KEY = "controller_activity";



    // Report ID definition

    public enum BqrQualityReportId {

        QUALITY_REPORT_ID_MONITOR_MODE(0x01),
@@ -2850,7 +2851,7 @@ public class AdapterService extends Service { 
        @Override

        public void requestActivityInfo(ResultReceiver result, AttributionSource source) {

            Bundle bundle = new Bundle();

            bundle.putParcelable(BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY,

            bundle.putParcelable(RESULT_RECEIVER_CONTROLLER_KEY,

                    reportActivityInfo(source));

            result.send(0, bundle);

        }