From 70bcc12021df8ddc459e0f2fe9ad1e756ff8c505 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Mon, 12 Feb 2018 06:57:01 +0000 Subject: [PATCH] Add more APIs to hidden API greylist APIs seen in use by common apps. Bug: 73211878 Bug: 73211350 Bug: 73211163 Bug: 73211208 Bug: 73103890 Bug: 73103761 Test: make Change-Id: Ic438f4614f6452b14ea07f4c35b39d3be34ff49d --- config/hiddenapi-light-greylist.txt | 97 +++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 3eeaf65c903cf..7b70f59977628 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -37,9 +37,11 @@ Landroid/app/ActivityThread;->currentActivityThread()Landroid/app/ActivityThread Landroid/app/ActivityThread;->currentApplication()Landroid/app/Application; Landroid/app/ActivityThread;->currentPackageName()Ljava/lang/String; Landroid/app/ActivityThread;->currentProcessName()Ljava/lang/String; +Landroid/app/ActivityThread;->getActivity(Landroid/os/IBinder;)Landroid/app/Activity; Landroid/app/ActivityThread;->getApplication()Landroid/app/Application; Landroid/app/ActivityThread;->getApplicationThread()Landroid/app/ActivityThread$ApplicationThread; Landroid/app/ActivityThread;->getHandler()Landroid/os/Handler; +Landroid/app/ActivityThread;->getInstrumentation()Landroid/app/Instrumentation; Landroid/app/ActivityThread;->getPackageManager()Landroid/content/pm/IPackageManager; Landroid/app/ActivityThread;->getProcessName()Ljava/lang/String; Landroid/app/ActivityThread$H;->BIND_SERVICE:I @@ -573,6 +575,7 @@ Landroid/net/TrafficStats;->getStatsService()Landroid/net/INetworkStatsService; Landroid/net/TrafficStats;->setThreadStatsTagBackup()V Landroid/net/TrafficStats;->setThreadStatsTagRestore()V Landroid/net/TrafficStats;->setThreadStatsUid(I)V +Landroid/net/WebAddress;->(Ljava/lang/String;)V Landroid/net/WifiKey;->(Ljava/lang/String;Ljava/lang/String;)V Landroid/net/wifi/p2p/WifiP2pGroup;->getNetworkId()I Landroid/net/wifi/p2p/WifiP2pGroupList;->getGroupList()Ljava/util/Collection; @@ -616,6 +619,7 @@ Landroid/net/wifi/WifiScanner;->startBackgroundScan(Landroid/net/wifi/WifiScanne Landroid/net/wifi/WifiScanner;->startScan(Landroid/net/wifi/WifiScanner$ScanSettings;Landroid/net/wifi/WifiScanner$ScanListener;Landroid/os/WorkSource;)V Landroid/net/wifi/WifiScanner;->startScan(Landroid/net/wifi/WifiScanner$ScanSettings;Landroid/net/wifi/WifiScanner$ScanListener;)V Landroid/net/wifi/WifiScanner;->stopBackgroundScan(Landroid/net/wifi/WifiScanner$ScanListener;)V +Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String; Landroid/nfc/NfcAdapter;->addNfcUnlockHandler(Landroid/nfc/NfcAdapter$NfcUnlockHandler;[Ljava/lang/String;)Z Landroid/nfc/NfcAdapter;->disable()Z Landroid/nfc/NfcAdapter;->enable()Z @@ -875,6 +879,7 @@ Landroid/service/trust/TrustAgentService;->()V Landroid/service/voice/VoiceInteractionService;->isKeyphraseAndLocaleSupportedForHotword(Ljava/lang/String;Ljava/util/Locale;)Z Landroid/service/wallpaper/WallpaperService$Engine;->setFixedSizeAllowed(Z)V Landroid/speech/tts/TextToSpeech;->getCurrentEngine()Ljava/lang/String; +Landroid/system/StructTimeval;->fromMillis(J)Landroid/system/StructTimeval; Landroid/telecom/AudioState;->getRoute()I Landroid/telecom/AudioState;->getSupportedRouteMask()I Landroid/telecom/AudioState;->isMuted()Z @@ -969,6 +974,7 @@ Landroid/text/SpannableStringInternal;->sendSpanRemoved(Ljava/lang/Object;II)V Landroid/text/SpannableStringInternal;->setSpan(Ljava/lang/Object;III)V Landroid/text/SpannableStringInternal;->setSpan(Ljava/lang/Object;IIIZ)V Landroid/text/SpannableStringInternal;->START:I +Landroid/text/StaticLayout;->(Ljava/lang/CharSequence;IILandroid/text/TextPaint;ILandroid/text/Layout$Alignment;Landroid/text/TextDirectionHeuristic;FFZLandroid/text/TextUtils$TruncateAt;II)V Landroid/text/StaticLayout;->mColumns:I Landroid/text/StaticLayout;->mLineCount:I Landroid/text/StaticLayout;->mLines:[I @@ -1017,6 +1023,7 @@ Landroid/view/LayoutInflater;->mFactory2:Landroid/view/LayoutInflater$Factory2; Landroid/view/LayoutInflater;->mFactory:Landroid/view/LayoutInflater$Factory; Landroid/view/LayoutInflater;->mFactorySet:Z Landroid/view/LayoutInflater;->sConstructorMap:Ljava/util/HashMap; +Landroid/view/LayoutInflater;->setPrivateFactory(Landroid/view/LayoutInflater$Factory2;)V Landroid/view/MotionEvent;->HISTORY_CURRENT:I Landroid/view/MotionEvent;->mNativePtr:J Landroid/view/MotionEvent;->nativeGetRawAxisValue(JIII)F @@ -1089,6 +1096,7 @@ Landroid/view/View;->mScrollCache:Landroid/view/View$ScrollabilityCache; Landroid/view/View;->mScrollX:I Landroid/view/View;->mScrollY:I Landroid/view/View;->mStartActivityRequestWho:Ljava/lang/String; +Landroid/view/View;->mTag:Ljava/lang/Object; Landroid/view/View;->mTop:I Landroid/view/View;->mUnscaledDrawingCache:Landroid/graphics/Bitmap; Landroid/view/View;->notifySubtreeAccessibilityStateChangedIfNeeded()V @@ -1127,20 +1135,72 @@ Landroid/view/WindowManager$LayoutParams;->userActivityTimeout:J Landroid/view/Window;->mAppName:Ljava/lang/String; Landroid/view/Window;->mAppToken:Landroid/os/IBinder; Landroid/view/Window;->mHardwareAccelerated:Z +Landroid/webkit/FindActionModeCallback;->findAll()V +Landroid/webkit/FindActionModeCallback;->(Landroid/content/Context;)V +Landroid/webkit/FindActionModeCallback;->setText(Ljava/lang/String;)V +Landroid/webkit/FindActionModeCallback;->setWebView(Landroid/webkit/WebView;)V +Landroid/webkit/FindActionModeCallback;->showSoftInput()V +Landroid/webkit/GeolocationPermissions;->()V +Landroid/webkit/HttpAuthHandler;->()V +Landroid/webkit/JsDialogHelper;->(Landroid/webkit/JsPromptResult;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V +Landroid/webkit/JsDialogHelper;->showDialog(Landroid/content/Context;)V +Landroid/webkit/JsPromptResult;->getStringResult()Ljava/lang/String; +Landroid/webkit/JsPromptResult;->(Landroid/webkit/JsResult$ResultReceiver;)V +Landroid/webkit/SslErrorHandler;->()V +Landroid/webkit/TokenBindingService;->()V +Landroid/webkit/TokenBindingService$TokenBindingKey;->()V +Landroid/webkit/WebChromeClient;->openFileChooser(Landroid/webkit/ValueCallback;Ljava/lang/String;Ljava/lang/String;)V +Landroid/webkit/WebMessagePort;->()V +Landroid/webkit/WebResourceError;->()V +Landroid/webkit/WebResourceResponse;->(ZLjava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/util/Map;Ljava/io/InputStream;)V +Landroid/webkit/WebSettings;->getAcceptThirdPartyCookies()Z +Landroid/webkit/WebSettings;->setAcceptThirdPartyCookies(Z)V Landroid/webkit/WebSettings;->setNavDump(Z)V Landroid/webkit/WebSettings;->setPluginsEnabled(Z)V +Landroid/webkit/WebStorage;->()V +Landroid/webkit/WebStorage$Origin;->(Ljava/lang/String;JJ)V Landroid/webkit/WebView;->debugDump()V +Landroid/webkit/WebViewDelegate;->addWebViewAssetPath(Landroid/content/Context;)V +Landroid/webkit/WebViewDelegate;->callDrawGlFunction(Landroid/graphics/Canvas;JLjava/lang/Runnable;)V +Landroid/webkit/WebViewDelegate;->callDrawGlFunction(Landroid/graphics/Canvas;J)V +Landroid/webkit/WebViewDelegate;->canInvokeDrawGlFunctor(Landroid/view/View;)Z +Landroid/webkit/WebViewDelegate;->detachDrawGlFunctor(Landroid/view/View;J)V +Landroid/webkit/WebViewDelegate;->getApplication()Landroid/app/Application; +Landroid/webkit/WebViewDelegate;->getDataDirectorySuffix()Ljava/lang/String; +Landroid/webkit/WebViewDelegate;->getErrorString(Landroid/content/Context;I)Ljava/lang/String; +Landroid/webkit/WebViewDelegate;->getPackageId(Landroid/content/res/Resources;Ljava/lang/String;)I +Landroid/webkit/WebViewDelegate;->invokeDrawGlFunctor(Landroid/view/View;JZ)V +Landroid/webkit/WebViewDelegate;->isMultiProcessEnabled()Z +Landroid/webkit/WebViewDelegate;->isTraceTagEnabled()Z +Landroid/webkit/WebViewDelegate;->setOnTraceEnabledChangeListener(Landroid/webkit/WebViewDelegate$OnTraceEnabledChangeListener;)V Landroid/webkit/WebView;->disablePlatformNotifications()V Landroid/webkit/WebView;->emulateShiftHeld()V Landroid/webkit/WebView;->enablePlatformNotifications()V Landroid/webkit/WebViewFactory;->getLoadedPackageInfo()Landroid/content/pm/PackageInfo; Landroid/webkit/WebViewFactory;->getProvider()Landroid/webkit/WebViewFactoryProvider; +Landroid/webkit/WebViewFactory;->loadWebViewNativeLibraryFromPackage(Ljava/lang/String;Ljava/lang/ClassLoader;)I Landroid/webkit/WebViewFactory;->sPackageInfo:Landroid/content/pm/PackageInfo; Landroid/webkit/WebView;->getVisibleTitleHeight()I Landroid/webkit/WebView;->getWebViewProvider()Landroid/webkit/WebViewProvider; +Landroid/webkit/WebView$HitTestResult;->()V +Landroid/webkit/WebView$HitTestResult;->setExtra(Ljava/lang/String;)V +Landroid/webkit/WebView$HitTestResult;->setType(I)V Landroid/webkit/WebView;->isPaused()Z Landroid/webkit/WebView;->mProvider:Landroid/webkit/WebViewProvider; Landroid/webkit/WebView;->notifyFindDialogDismissed()V +Landroid/webkit/WebView$PrivateAccess;->overScrollBy(IIIIIIIIZ)V +Landroid/webkit/WebView$PrivateAccess;->setMeasuredDimension(II)V +Landroid/webkit/WebView$PrivateAccess;->super_dispatchKeyEvent(Landroid/view/KeyEvent;)Z +Landroid/webkit/WebView$PrivateAccess;->super_getScrollBarStyle()I +Landroid/webkit/WebView$PrivateAccess;->super_onDrawVerticalScrollBar(Landroid/graphics/Canvas;Landroid/graphics/drawable/Drawable;IIII)V +Landroid/webkit/WebView$PrivateAccess;->super_onGenericMotionEvent(Landroid/view/MotionEvent;)Z +Landroid/webkit/WebView$PrivateAccess;->super_performAccessibilityAction(ILandroid/os/Bundle;)Z +Landroid/webkit/WebView$PrivateAccess;->super_performLongClick()Z +Landroid/webkit/WebView$PrivateAccess;->super_requestFocus(ILandroid/graphics/Rect;)Z +Landroid/webkit/WebView$PrivateAccess;->super_scrollTo(II)V +Landroid/webkit/WebView$PrivateAccess;->super_setFrame(IIII)Z +Landroid/webkit/WebView$PrivateAccess;->super_setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V +Landroid/webkit/WebView$PrivateAccess;->super_startActivityForResult(Landroid/content/Intent;I)V Landroid/webkit/WebView;->restorePicture(Landroid/os/Bundle;Ljava/io/File;)Z Landroid/webkit/WebView;->savePicture(Landroid/os/Bundle;Ljava/io/File;)Z Landroid/webkit/WebView;->sEnforceThreadChecking:Z @@ -1395,6 +1455,7 @@ Ldalvik/system/CloseGuard;->close()V Ldalvik/system/CloseGuard;->get()Ldalvik/system/CloseGuard; Ldalvik/system/CloseGuard;->open(Ljava/lang/String;)V Ldalvik/system/CloseGuard;->warnIfOpen()V +Ldalvik/system/DexFile;->loadClassBinaryName(Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/List;)Ljava/lang/Class; Ldalvik/system/DexFile;->mCookie:Ljava/lang/Object; Ldalvik/system/DexFile;->mFileName:Ljava/lang/String; Ldalvik/system/DexFile;->openDexFile(Ljava/lang/String;Ljava/lang/String;ILjava/lang/ClassLoader;[Ldalvik/system/DexPathList$Element;)Ljava/lang/Object; @@ -1414,6 +1475,7 @@ Ldalvik/system/VMRuntime;->is64Bit()Z Ldalvik/system/VMRuntime;->newNonMovableArray(Ljava/lang/Class;I)Ljava/lang/Object; Ldalvik/system/VMRuntime;->registerNativeAllocation(I)V Ldalvik/system/VMRuntime;->registerNativeFree(I)V +Ldalvik/system/VMRuntime;->runFinalization(J)V Ldalvik/system/VMRuntime;->setMinimumHeapSize(J)J Ldalvik/system/VMRuntime;->setTargetHeapUtilization(F)F Ldalvik/system/VMRuntime;->trackExternalAllocation(J)Z @@ -1434,13 +1496,39 @@ Ljava/lang/Daemons$Daemon;->thread:Ljava/lang/Thread; Ljava/lang/Daemons$FinalizerDaemon;->finalizingObject:Ljava/lang/Object; Ljava/lang/Daemons$FinalizerDaemon;->INSTANCE:Ljava/lang/Daemons$FinalizerDaemon; Ljava/lang/Daemons$FinalizerWatchdogDaemon;->INSTANCE:Ljava/lang/Daemons$FinalizerWatchdogDaemon; +Ljava/lang/Daemons;->requestHeapTrim()V +Ljava/lang/Daemons;->start()V +Ljava/lang/Daemons;->stop()V +Ljava/lang/ref/FinalizerReference;->add(Ljava/lang/Object;)V +Ljava/lang/reflect/Executable;->artMethod:J +Ljava/lang/reflect/Parameter;->(Ljava/lang/String;ILjava/lang/reflect/Executable;I)V +Ljava/lang/ref/ReferenceQueue;->add(Ljava/lang/ref/Reference;)V Ljava/lang/Runtime;->loadLibrary(Ljava/lang/String;Ljava/lang/ClassLoader;)V Ljava/lang/Runtime;->load(Ljava/lang/String;Ljava/lang/ClassLoader;)V Ljava/lang/Runtime;->nativeLoad(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/String; +Ljava/lang/String;->(II[C)V +Ljava/lang/Thread;->daemon:Z +Ljava/lang/Thread;->dispatchUncaughtException(Ljava/lang/Throwable;)V +Ljava/lang/ThreadGroup;->add(Ljava/lang/Thread;)V +Ljava/lang/ThreadGroup;->groups:[Ljava/lang/ThreadGroup; +Ljava/lang/Thread;->group:Ljava/lang/ThreadGroup; +Ljava/lang/ThreadGroup;->mainThreadGroup:Ljava/lang/ThreadGroup; +Ljava/lang/ThreadGroup;->name:Ljava/lang/String; +Ljava/lang/ThreadGroup;->ngroups:I Ljava/lang/ThreadGroup;->parent:Ljava/lang/ThreadGroup; Ljava/lang/ThreadGroup;->systemThreadGroup:Ljava/lang/ThreadGroup; +Ljava/lang/ThreadGroup;->threadTerminated(Ljava/lang/Thread;)V Ljava/lang/Thread;->inheritableThreadLocals:Ljava/lang/ThreadLocal$ThreadLocalMap; +Ljava/lang/Thread;->(Ljava/lang/ThreadGroup;Ljava/lang/String;IZ)V +Ljava/lang/Thread;->lock:Ljava/lang/Object; +Ljava/lang/Thread;->name:Ljava/lang/String; +Ljava/lang/Thread;->nativePeer:J +Ljava/lang/Thread;->priority:I +Ljava/lang/Throwable;->backtrace:Ljava/lang/Object; +Ljava/lang/Throwable;->cause:Ljava/lang/Throwable; Ljava/lang/Throwable;->detailMessage:Ljava/lang/String; +Ljava/lang/Throwable;->stackTrace:[Ljava/lang/StackTraceElement; +Ljava/lang/Throwable;->suppressedExceptions:Ljava/util/List; Ljava/net/Authenticator;->theAuthenticator:Ljava/net/Authenticator; Ljava/net/DatagramSocket;->impl:Ljava/net/DatagramSocketImpl; Ljava/net/InetAddress;->clearDnsCache()V @@ -1449,9 +1537,17 @@ Ljava/net/InetAddress;->parseNumericAddress(Ljava/lang/String;)Ljava/net/InetAdd Ljava/net/Socket;->impl:Ljava/net/SocketImpl; Ljava/net/URI;->host:Ljava/lang/String; Ljava/nio/Buffer;->address:J +Ljava/nio/Buffer;->capacity:I +Ljava/nio/Buffer;->limit:I +Ljava/nio/ByteBuffer;->hb:[B +Ljava/nio/ByteBuffer;->isReadOnly:Z +Ljava/nio/ByteBuffer;->offset:I Ljava/nio/charset/CharsetEncoder;->canEncode(Ljava/nio/CharBuffer;)Z +Ljava/nio/DirectByteBuffer;->(JI)V Ljava/security/spec/ECParameterSpec;->getCurveName()Ljava/lang/String; Ljava/security/spec/ECParameterSpec;->setCurveName(Ljava/lang/String;)V +Ljava/util/ArrayList;->elementData:[Ljava/lang/Object; +Ljava/util/ArrayList;->size:I Ljava/util/ArrayList$SubList;->parent:Ljava/util/AbstractList; Ljava/util/ArrayList$SubList;->parentOffset:I Ljava/util/ArrayList$SubList;->size:I @@ -1461,6 +1557,7 @@ Ljava/util/concurrent/FutureTask;->callable:Ljava/util/concurrent/Callable; Ljava/util/Locale;->createConstant(Ljava/lang/String;Ljava/lang/String;)Ljava/util/Locale; Ljavax/net/ssl/SSLServerSocketFactory;->defaultServerSocketFactory:Ljavax/net/ssl/SSLServerSocketFactory; Ljavax/net/ssl/SSLSocketFactory;->defaultSocketFactory:Ljavax/net/ssl/SSLSocketFactory; +Llibcore/util/ZoneInfo;->mTransitions:[J Lorg/apache/http/conn/ssl/SSLSocketFactory;->(Ljavax/net/ssl/SSLSocketFactory;)V Lorg/json/JSONArray;->values:Ljava/util/List; Lsun/misc/Unsafe;->theUnsafe:Lsun/misc/Unsafe;