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

Commit f3fda696 authored by Jonathan Dixon's avatar Jonathan Dixon Committed by Android (Google) Code Review
Browse files

Merge "Minor code tidying up in WebStorage & GeolocationPermission"

parents c97ed10b 36196b6d
Loading
Loading
Loading
Loading
+2 −7
Original line number Diff line number Diff line
@@ -18,14 +18,12 @@ package android.webkit;

import android.os.Handler;
import android.os.Message;
import android.util.Log;

import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.Vector;


/**
 * This class is used to manage permissions for the WebView's Geolocation
 * JavaScript API.
@@ -47,7 +45,7 @@ import java.util.Vector;
 * Geolocation permissions at any time.
 */
// This class is the Java counterpart of the WebKit C++ GeolocationPermissions
// class. It simply marshalls calls from the UI thread to the WebKit thread.
// class. It simply marshals calls from the UI thread to the WebKit thread.
//
// Within WebKit, Geolocation permissions may be applied either temporarily
// (for the duration of the page) or permanently. This class deals only with
@@ -70,9 +68,6 @@ public final class GeolocationPermissions {
        public void invoke(String origin, boolean allow, boolean retain);
    };

    // Log tag
    private static final String TAG = "geolocationPermissions";

    // Global instance
    private static GeolocationPermissions sInstance;

+1 −7
Original line number Diff line number Diff line
@@ -18,13 +18,10 @@ package android.webkit;

import android.os.Handler;
import android.os.Message;
import android.util.Log;

import java.util.Collection;
import java.util.Map;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

/**
@@ -44,9 +41,6 @@ public final class WebStorage {
        public void updateQuota(long newQuota);
    };

    // Log tag
    private static final String TAG = "webstorage";

    // Global instance of a WebStorage
    private static WebStorage sWebStorage;