Restore getCallingUid Hook

Signed-off-by: tiann <[email protected]>

Author: tiann

VirtualApp/lib/src/main/jni/Foundation/VMPatch.cpp

@@ -441,10 +441,7 @@ void hookAndroidVM(JArrayClass<jobject> javaMethods,
         }
     }
     measureNativeOffset(isArt);
-    // Crash on Q if hook directly by modify entrypoint of function.
-    // Just skip this step on Q and get never crash
-    if(apiLevel <= 28)
-        replaceGetCallingUid(isArt);
+    replaceGetCallingUid(isArt);
 
     replaceOpenDexFileMethod(javaMethods.getElement(OPEN_DEX).get(), isArt,
                              apiLevel);

VirtualApp/lib/src/main/jni/fb/jni/Environment.cpp

@@ -90,10 +90,6 @@ void Environment::detachCurrentThread() {
 
 /* static */
 JNIEnv* Environment::ensureCurrentThreadIsAttached() {
-  auto scope = currentScope();
-  if (scope && scope->env_) {
-    return scope->env_;
-  }
 
   JNIEnv* env;
   // We should be able to just get the JNIEnv* by just calling
@@ -104,7 +100,6 @@ JNIEnv* Environment::ensureCurrentThreadIsAttached() {
   FBASSERT(result == JNI_OK || result == JNI_EDETACHED);
   if (result == JNI_EDETACHED) {
     // The thread should not be detached while a ThreadScope is in the stack.
-    FBASSERT(!scope);
     env = attachCurrentThread();
   }
   FBASSERT(env);