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

Commit 7921bea2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove IStatsCallback aidl from master"

parents 4db5cb7b 29f69e8f

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IRecoverySystemProgressListener.aidl \

	core/java/android/os/IRemoteCallback.aidl \

	core/java/android/os/ISchedulingPolicyService.aidl \

	core/java/android/os/IStatsCallbacks.aidl \

	core/java/android/os/IStatsCompanionService.aidl \

	core/java/android/os/IStatsManager.aidl \

	core/java/android/os/IThermalEventListener.aidl \

cmds/statsd/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
LOCAL_PATH:= $(call my-dir)



statsd_common_src := \

    ../../core/java/android/os/IStatsCallbacks.aidl \

    ../../core/java/android/os/IStatsCompanionService.aidl \

    ../../core/java/android/os/IStatsManager.aidl \

    src/stats_log.proto \

cmds/statsd/src/StatsService.cpp

+0 −6
Original line number Diff line number Diff line
@@ -690,12 +690,6 @@ Status StatsService::removeConfiguration(const String16& key, bool* success) { 
}



void StatsService::binderDied(const wp <IBinder>& who) {

    for (size_t i = 0; i < mCallbacks.size(); i++) {

        if (IInterface::asBinder(mCallbacks[i]) == who) {

            mCallbacks.removeAt(i);

            break;

        }

    }

}



}  // namespace statsd

cmds/statsd/src/StatsService.h

+0 −11
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "packages/UidMap.h"



#include <android/os/BnStatsManager.h>

#include <android/os/IStatsCallbacks.h>

#include <android/os/IStatsCompanionService.h>

#include <binder/IResultReceiver.h>

#include <utils/Looper.h>
@@ -195,16 +194,6 @@ private: 
     * Whether this is an eng build.

     */

    bool mEngBuild;



    /**

     * Lock for callback handling.

     */

    std::mutex mLock;



    /**

     * Vector maintaining the list of callbacks for clients.

     */

    Vector< sp<IStatsCallbacks> > mCallbacks;

};



}  // namespace statsd

core/java/android/os/IStatsCallbacks.aidl

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2016, 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 android.os;



/**

  * Callback for Statsd to allow binder calls to clients.

  * {@hide}

  */

interface IStatsCallbacks {

    void onReceiveLogs(out byte[] log);

}