Hash :
00643e7d
Author :
Date :
2020-07-22T20:58:49
Use Android API to get storage path. This pipes through to a system call via JNI. This will allow Chromium changes to land that were prevented because ANGLE hard-coded some parts of this path. This in turn will allow us to more easily override these paths for changes needed for Android R support. Bug: chromium:1094062 Change-Id: I20d75b8ee40d418ba5c057f618640ef896248299 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2315483 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287
//
// Copyright 2016 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// AndroidWindow.cpp: Implementation of OSWindow for Android
#include "util/android/AndroidWindow.h"
#include <pthread.h>
#include "common/debug.h"
#include "util/android/third_party/android_native_app_glue.h"
namespace
{
struct android_app *sApp = nullptr;
pthread_mutex_t sInitWindowMutex;
pthread_cond_t sInitWindowCond;
bool sInitWindowDone = false;
JNIEnv *gJni = nullptr;
// SCREEN_ORIENTATION_LANDSCAPE and SCREEN_ORIENTATION_PORTRAIT are
// available from Android API level 1
// https://developer.android.com/reference/android/app/Activity#setRequestedOrientation(int)
const int kScreenOrientationLandscape = 0;
const int kScreenOrientationPortrait = 1;
JNIEnv *GetJniEnv()
{
if (gJni)
return gJni;
sApp->activity->vm->AttachCurrentThread(&gJni, NULL);
return gJni;
}
int SetScreenOrientation(struct android_app *app, int orientation)
{
// Use reverse JNI to call the Java entry point that rotates the
// display to respect width and height
JNIEnv *jni = GetJniEnv();
if (!jni)
{
WARN() << "Failed to get JNI env for screen rotation";
return JNI_ERR;
}
jclass clazz = jni->GetObjectClass(app->activity->clazz);
jmethodID methodID = jni->GetMethodID(clazz, "setRequestedOrientation", "(I)V");
jni->CallVoidMethod(app->activity->clazz, methodID, orientation);
return 0;
}
} // namespace
AndroidWindow::AndroidWindow() {}
AndroidWindow::~AndroidWindow() {}
bool AndroidWindow::initializeImpl(const std::string &name, int width, int height)
{
return resize(width, height);
}
void AndroidWindow::destroy() {}
void AndroidWindow::disableErrorMessageDialog() {}
void AndroidWindow::resetNativeWindow() {}
EGLNativeWindowType AndroidWindow::getNativeWindow() const
{
// Return the entire Activity Surface for now
// sApp->window is valid only after sInitWindowDone, which is true after initializeImpl()
return sApp->window;
}
EGLNativeDisplayType AndroidWindow::getNativeDisplay() const
{
return EGL_DEFAULT_DISPLAY;
}
void AndroidWindow::messageLoop()
{
// TODO: accumulate events in the real message loop of android_main,
// and process them here
}
void AndroidWindow::setMousePosition(int x, int y)
{
UNIMPLEMENTED();
}
bool AndroidWindow::setOrientation(int width, int height)
{
// Set tests to run in correct orientation
int32_t err = SetScreenOrientation(
sApp, (width > height) ? kScreenOrientationLandscape : kScreenOrientationPortrait);
return err == 0;
}
bool AndroidWindow::setPosition(int x, int y)
{
UNIMPLEMENTED();
return false;
}
bool AndroidWindow::resize(int width, int height)
{
mWidth = width;
mHeight = height;
// sApp->window used below is valid only after Activity Surface is created
pthread_mutex_lock(&sInitWindowMutex);
while (!sInitWindowDone)
{
pthread_cond_wait(&sInitWindowCond, &sInitWindowMutex);
}
pthread_mutex_unlock(&sInitWindowMutex);
// TODO: figure out a way to set the format as well,
// which is available only after EGLWindow initialization
int32_t err = ANativeWindow_setBuffersGeometry(sApp->window, mWidth, mHeight, 0);
return err == 0;
}
void AndroidWindow::setVisible(bool isVisible) {}
void AndroidWindow::signalTestEvent()
{
UNIMPLEMENTED();
}
static void onAppCmd(struct android_app *app, int32_t cmd)
{
switch (cmd)
{
case APP_CMD_INIT_WINDOW:
pthread_mutex_lock(&sInitWindowMutex);
sInitWindowDone = true;
pthread_cond_broadcast(&sInitWindowCond);
pthread_mutex_unlock(&sInitWindowMutex);
break;
case APP_CMD_DESTROY:
if (gJni)
{
sApp->activity->vm->DetachCurrentThread();
}
gJni = nullptr;
break;
// TODO: process other commands and pass them to AndroidWindow for handling
// TODO: figure out how to handle APP_CMD_PAUSE,
// which should immediately halt all the rendering,
// since Activity Surface is no longer available.
// Currently tests crash when paused, for example, due to device changing orientation
}
}
static int32_t onInputEvent(struct android_app *app, AInputEvent *event)
{
// TODO: Handle input events
return 0; // 0 == not handled
}
void android_main(struct android_app *app)
{
int events;
struct android_poll_source *source;
sApp = app;
pthread_mutex_init(&sInitWindowMutex, nullptr);
pthread_cond_init(&sInitWindowCond, nullptr);
// Event handlers, invoked from source->process()
app->onAppCmd = onAppCmd;
app->onInputEvent = onInputEvent;
// Message loop, polling for events indefinitely (due to -1 timeout)
// Must be here in order to handle APP_CMD_INIT_WINDOW event,
// which occurs after AndroidWindow::initializeImpl(), but before AndroidWindow::messageLoop
while (ALooper_pollAll(-1, nullptr, &events, reinterpret_cast<void **>(&source)) >= 0)
{
if (source != nullptr)
{
source->process(app, source);
}
}
}
// static
std::string AndroidWindow::GetExternalStorageDirectory()
{
// Use reverse JNI.
JNIEnv *jni = GetJniEnv();
if (!jni)
{
WARN() << "GetExternalStorageDirectory:: Failed to get JNI env";
return "";
}
// https://stackoverflow.com/questions/12841240/android-pass-parameter-to-native-activity
jclass clazz = jni->GetObjectClass(sApp->activity->clazz);
if (clazz == 0)
{
WARN() << "GetExternalStorageDirectory: Bad activity";
return "";
}
jmethodID giid = jni->GetMethodID(clazz, "getIntent", "()Landroid/content/Intent;");
if (giid == 0)
{
WARN() << "GetExternalStorageDirectory: Could not find getIntent";
return "";
}
jobject intent = jni->CallObjectMethod(sApp->activity->clazz, giid);
if (intent == 0)
{
WARN() << "GetExternalStorageDirectory: Error calling getIntent";
return "";
}
jclass icl = jni->GetObjectClass(intent);
if (icl == 0)
{
WARN() << "GetExternalStorageDirectory: Error getting getIntent class";
return "";
}
jmethodID gseid =
jni->GetMethodID(icl, "getStringExtra", "(Ljava/lang/String;)Ljava/lang/String;");
if (gseid == 0)
{
WARN() << "GetExternalStorageDirectory: Could not find getStringExtra";
return "";
}
jstring stringPath = static_cast<jstring>(jni->CallObjectMethod(
intent, gseid, jni->NewStringUTF("org.chromium.base.test.util.UrlUtils.RootDirectory")));
if (stringPath != 0)
{
const char *path = jni->GetStringUTFChars(stringPath, nullptr);
return std::string(path) + "/chromium_tests_root";
}
jclass environment = jni->FindClass("org/chromium/base/test/util/UrlUtils");
if (environment == 0)
{
WARN() << "GetExternalStorageDirectory: Failed to find Environment";
return "";
}
jmethodID getDir =
jni->GetStaticMethodID(environment, "getIsolatedTestRoot", "()Ljava/lang/String;");
if (getDir == 0)
{
WARN() << "GetExternalStorageDirectory: Failed to get static method";
return "";
}
stringPath = static_cast<jstring>(jni->CallStaticObjectMethod(environment, getDir));
jthrowable exception = jni->ExceptionOccurred();
if (exception != 0)
{
jni->ExceptionDescribe();
jni->ExceptionClear();
WARN() << "GetExternalStorageDirectory: Failed because of exception";
return "";
}
const char *path = jni->GetStringUTFChars(stringPath, nullptr);
return std::string(path);
}
// static
OSWindow *OSWindow::New()
{
// There should be only one live instance of AndroidWindow at a time,
// as there is only one Activity Surface behind it.
// Creating a new AndroidWindow each time works for ANGLETest,
// as it destroys an old window before creating a new one.
// TODO: use GLSurfaceView to support multiple windows
return new AndroidWindow();
}