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

Merge "Remove synchronized from static methods in WebView."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-19 11:42:00 +00:00
committed by Android (Google) Code Review
parent 16560f6eb9 59375a015a
commit c1b775584d
6 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -45254,7 +45254,7 @@ package android.webkit {
method public static boolean allowFileSchemeCookies();
method public abstract void flush();
method public abstract java.lang.String getCookie(java.lang.String);
method public static synchronized android.webkit.CookieManager getInstance();
method public static android.webkit.CookieManager getInstance();
method public abstract boolean hasCookies();
method public abstract deprecated void removeAllCookie();
method public abstract void removeAllCookies(android.webkit.ValueCallback<java.lang.Boolean>);
@@ -45269,8 +45269,8 @@ package android.webkit {
}
public final deprecated class CookieSyncManager extends android.webkit.WebSyncManager {
method public static synchronized android.webkit.CookieSyncManager createInstance(android.content.Context);
method public static synchronized android.webkit.CookieSyncManager getInstance();
method public static android.webkit.CookieSyncManager createInstance(android.content.Context);
method public static android.webkit.CookieSyncManager getInstance();
method protected deprecated void syncFromRamToFlash();
field protected static final java.lang.String LOGTAG = "websync";
field protected android.webkit.WebViewDatabase mDataBase;

6
api/system-current.txt
View File

@@ -48416,7 +48416,7 @@ package android.webkit {
method public abstract java.lang.String getCookie(java.lang.String);
method public abstract java.lang.String getCookie(java.lang.String, boolean);
method public synchronized java.lang.String getCookie(android.net.WebAddress);
method public static synchronized android.webkit.CookieManager getInstance();
method public static android.webkit.CookieManager getInstance();
method public abstract boolean hasCookies();
method public abstract boolean hasCookies(boolean);
method public abstract deprecated void removeAllCookie();
@@ -48433,8 +48433,8 @@ package android.webkit {
}
public final deprecated class CookieSyncManager extends android.webkit.WebSyncManager {
method public static synchronized android.webkit.CookieSyncManager createInstance(android.content.Context);
method public static synchronized android.webkit.CookieSyncManager getInstance();
method public static android.webkit.CookieSyncManager createInstance(android.content.Context);
method public static android.webkit.CookieSyncManager getInstance();
method protected deprecated void syncFromRamToFlash();
field protected static final java.lang.String LOGTAG = "websync";
field protected android.webkit.WebViewDatabase mDataBase;

6
api/test-current.txt
View File

@@ -45334,7 +45334,7 @@ package android.webkit {
method public static boolean allowFileSchemeCookies();
method public abstract void flush();
method public abstract java.lang.String getCookie(java.lang.String);
method public static synchronized android.webkit.CookieManager getInstance();
method public static android.webkit.CookieManager getInstance();
method public abstract boolean hasCookies();
method public abstract deprecated void removeAllCookie();
method public abstract void removeAllCookies(android.webkit.ValueCallback<java.lang.Boolean>);
@@ -45349,8 +45349,8 @@ package android.webkit {
}
public final deprecated class CookieSyncManager extends android.webkit.WebSyncManager {
method public static synchronized android.webkit.CookieSyncManager createInstance(android.content.Context);
method public static synchronized android.webkit.CookieSyncManager getInstance();
method public static android.webkit.CookieSyncManager createInstance(android.content.Context);
method public static android.webkit.CookieSyncManager getInstance();
method protected deprecated void syncFromRamToFlash();
field protected static final java.lang.String LOGTAG = "websync";
field protected android.webkit.WebViewDatabase mDataBase;

2
core/java/android/webkit/CookieManager.java
View File

@@ -35,7 +35,7 @@ public abstract class CookieManager {
*
* @return the singleton CookieManager instance
*/
public static synchronized CookieManager getInstance() {
public static CookieManager getInstance() {
return WebViewFactory.getProvider().getCookieManager();
}

25
core/java/android/webkit/CookieSyncManager.java
View File

@@ -65,6 +65,7 @@ public final class CookieSyncManager extends WebSyncManager {
private static CookieSyncManager sRef;
private static boolean sGetInstanceAllowed = false;
private static final Object sLock = new Object();
private CookieSyncManager() {
super(null, null);
@@ -77,12 +78,14 @@ public final class CookieSyncManager extends WebSyncManager {
*
* @return CookieSyncManager
*/
public static synchronized CookieSyncManager getInstance() {
checkInstanceIsAllowed();
if (sRef == null) {
sRef = new CookieSyncManager();
public static CookieSyncManager getInstance() {
synchronized (sLock) {
checkInstanceIsAllowed();
if (sRef == null) {
sRef = new CookieSyncManager();
}
return sRef;
}
return sRef;
}
/**
@@ -90,12 +93,14 @@ public final class CookieSyncManager extends WebSyncManager {
* @param context
* @return CookieSyncManager
*/
public static synchronized CookieSyncManager createInstance(Context context) {
if (context == null) {
throw new IllegalArgumentException("Invalid context argument");
public static CookieSyncManager createInstance(Context context) {
synchronized (sLock) {
if (context == null) {
throw new IllegalArgumentException("Invalid context argument");
}
setGetInstanceIsAllowed();
return getInstance();
}
setGetInstanceIsAllowed();
return getInstance();
}
/**

2
core/java/android/webkit/WebView.java
View File

@@ -2322,7 +2322,7 @@ public class WebView extends AbsoluteLayout
}
}
private static synchronized WebViewFactoryProvider getFactory() {
private static WebViewFactoryProvider getFactory() {
return WebViewFactory.getProvider();
}