Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcb17d03 authored by Jonathan Dixon's avatar Jonathan Dixon
Browse files

resolved conflicts for merge of 42513ca1 to master 

frameworks/base/tools was move to frameworks/tools in
I3ffafdab27cc4aca256c3a5806b630795b75d5c8)

Conflicts:
	tools/layoutlib/bridge/src/android/webkit/WebView.java

Change-Id: Idc834b0e1a4bd0d6b2c5cf6de137e45f07da4344
parents 7b0b2643 42513ca1

preloaded-classes

+0 −29
Original line number Diff line number Diff line
@@ -1209,13 +1209,9 @@ android.webkit.BrowserFrame 
android.webkit.BrowserFrame$ConfigCallback

android.webkit.CallbackProxy

android.webkit.CookieManager

android.webkit.CookieManagerClassic

android.webkit.CookieSyncManager

android.webkit.DeviceMotionAndOrientationManager

android.webkit.GeolocationPermissions

android.webkit.GeolocationPermissionsClassic

android.webkit.GeolocationPermissionsClassic$1

android.webkit.GeolocationPermissionsClassic$2

android.webkit.HTML5Audio

android.webkit.HTML5VideoViewProxy

android.webkit.JWebCoreJavaBridge
@@ -1231,42 +1227,19 @@ android.webkit.ViewManager$2 
android.webkit.ViewManager$3

android.webkit.ViewStateSerializer

android.webkit.WebBackForwardList

android.webkit.WebBackForwardListClassic

android.webkit.WebCoreThreadWatchdog

android.webkit.WebHistoryItem

android.webkit.WebHistoryItemClassic

android.webkit.WebIconDatabase

android.webkit.WebIconDatabaseClassic

android.webkit.WebIconDatabaseClassic$EventHandler

android.webkit.WebIconDatabaseClassic$EventHandler$1

android.webkit.WebSettings

android.webkit.WebSettings$LayoutAlgorithm

android.webkit.WebSettings$PluginState

android.webkit.WebSettings$RenderPriority

android.webkit.WebSettings$ZoomDensity

android.webkit.WebSettingsClassic

android.webkit.WebSettingsClassic$AutoFillProfile

android.webkit.WebSettingsClassic$EventHandler

android.webkit.WebSettingsClassic$EventHandler$1

android.webkit.WebStorage

android.webkit.WebStorageClassic

android.webkit.WebStorageClassic$1

android.webkit.WebStorageClassic$2

android.webkit.WebSyncManager

android.webkit.WebSyncManager$SyncHandler

android.webkit.WebView

android.webkit.WebView$PrivateAccess

android.webkit.WebViewClassic

android.webkit.WebViewClassic$Factory

android.webkit.WebViewClassic$OnTrimMemoryListener

android.webkit.WebViewClassic$PackageListener

android.webkit.WebViewClassic$PageSwapDelegate

android.webkit.WebViewClassic$PrivateHandler

android.webkit.WebViewClassic$ProxyReceiver

android.webkit.WebViewClassic$SelectionHandleAlpha

android.webkit.WebViewClassic$TitleBarDelegate

android.webkit.WebViewClassic$TrustStorageListener

android.webkit.WebViewClassic$ViewSizeData

android.webkit.WebViewClient

android.webkit.WebViewCore$AutoFillData

android.webkit.WebViewCore$DrawData
@@ -1278,8 +1251,6 @@ android.webkit.WebViewCore$ViewState 
android.webkit.WebViewCore$WebCoreThread

android.webkit.WebViewCore$WebCoreThread$1

android.webkit.WebViewDatabase

android.webkit.WebViewDatabaseClassic

android.webkit.WebViewDatabaseClassic$1

android.webkit.WebViewFactory

android.webkit.WebViewFactory$Preloader

android.webkit.WebViewFactoryProvider