Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate IRegionSamplingListener interface to AIDL

Browse Source 
This addresses security vulnerabilities due to hard coded binder
interface.

Bug: 195660647
Test: (1) atest RegionSamplingTest
      (2) install Google I/O 2019 app, tap Agenda menu, scrolling to
      examine the bottom horizontal bar color changes
Change-Id: I453e348461ff31b1e12a8080acb87e203dbe4ca0
This commit is contained in:
Huihong Luo
2021-11-20 12:05:03 -08:00
parent fd4dda192c
commit 3c8415330f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/jni/android_view_CompositionSamplingListener.cpp
View File

@@ -16,21 +16,19 @@
#define LOG_TAG "CompositionSamplingListener"
#include "android_util_Binder.h"
#include "core_jni_helpers.h"
#include <nativehelper/JNIHelp.h>
#include <android/gui/BnRegionSamplingListener.h>
#include <android_runtime/AndroidRuntime.h>
#include <android_runtime/Log.h>
#include <utils/Log.h>
#include <utils/RefBase.h>
#include <binder/IServiceManager.h>
#include <gui/IRegionSamplingListener.h>
#include <gui/ISurfaceComposer.h>
#include <gui/SurfaceComposerClient.h>
#include <nativehelper/JNIHelp.h>
#include <ui/Rect.h>
#include <utils/Log.h>
#include <utils/RefBase.h>
#include "android_util_Binder.h"
#include "core_jni_helpers.h"
namespace android {
@@ -41,18 +39,18 @@ struct {
jmethodID mDispatchOnSampleCollected;
} gListenerClassInfo;
struct CompositionSamplingListener : public BnRegionSamplingListener {
struct CompositionSamplingListener : public gui::BnRegionSamplingListener {
CompositionSamplingListener(JNIEnv* env, jobject listener)
: mListener(env->NewWeakGlobalRef(listener)) {}
void onSampleCollected(float medianLuma) override {
binder::Status onSampleCollected(float medianLuma) override {
JNIEnv* env = AndroidRuntime::getJNIEnv();
LOG_ALWAYS_FATAL_IF(env == nullptr, "Unable to retrieve JNIEnv in onSampleCollected.");
jobject listener = env->NewGlobalRef(mListener);
if (listener == NULL) {
// Weak reference went out of scope
return;
return binder::Status::ok();
}
env->CallStaticVoidMethod(gListenerClassInfo.mClass,
gListenerClassInfo.mDispatchOnSampleCollected, listener,
@@ -64,6 +62,8 @@ struct CompositionSamplingListener : public BnRegionSamplingListener {
LOGE_EX(env);
env->ExceptionClear();
}
return binder::Status::ok();
}
protected: