diff --git a/Android.mk b/Android.mk index 24e717d2fa6b1..08a8b645fdb61 100644 --- a/Android.mk +++ b/Android.mk @@ -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 \ diff --git a/cmds/statsd/Android.mk b/cmds/statsd/Android.mk index d8603636c7c09..45ae56f214dda 100644 --- a/cmds/statsd/Android.mk +++ b/cmds/statsd/Android.mk @@ -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 \ diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp index ef01ec7563f5c..31d32b43d1c03 100644 --- a/cmds/statsd/src/StatsService.cpp +++ b/cmds/statsd/src/StatsService.cpp @@ -690,12 +690,6 @@ Status StatsService::removeConfiguration(const String16& key, bool* success) { } void StatsService::binderDied(const wp & who) { - for (size_t i = 0; i < mCallbacks.size(); i++) { - if (IInterface::asBinder(mCallbacks[i]) == who) { - mCallbacks.removeAt(i); - break; - } - } } } // namespace statsd diff --git a/cmds/statsd/src/StatsService.h b/cmds/statsd/src/StatsService.h index 888f97b6e954e..4d768f630362b 100644 --- a/cmds/statsd/src/StatsService.h +++ b/cmds/statsd/src/StatsService.h @@ -24,7 +24,6 @@ #include "packages/UidMap.h" #include -#include #include #include #include @@ -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 > mCallbacks; }; } // namespace statsd diff --git a/core/java/android/os/IStatsCallbacks.aidl b/core/java/android/os/IStatsCallbacks.aidl deleted file mode 100644 index 02e7cd3978c8e..0000000000000 --- a/core/java/android/os/IStatsCallbacks.aidl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * 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); -} diff --git a/core/java/android/os/IStatsManager.aidl b/core/java/android/os/IStatsManager.aidl index a6c3009acba2f..8e33b652a87e8 100644 --- a/core/java/android/os/IStatsManager.aidl +++ b/core/java/android/os/IStatsManager.aidl @@ -16,8 +16,6 @@ package android.os; -import android.os.IStatsCallbacks; - /** * Binder interface to communicate with the statistics management service. * {@hide}