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

Commit 3efbdf6f authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 20267 into donut

* changes:
  Do not merge
parents d2102a3f bf70afa2
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -139,7 +139,13 @@ class GearsPermissionsManager {
        file = new File(file.getAbsolutePath() + File.separator
                + GEARS_DATABASE_DIR + File.separator + GEARS_DATABASE_FILE);
        // Remember whether or not we need to create the LocationAccess table.
        boolean needToCreateTables = !file.exists();
        boolean needToCreateTables = false;
        if (!file.exists()) {
            needToCreateTables = true;
            // Create the path or else SQLiteDatabase.openOrCreateDatabase()
            // may throw on the device.
            file.getParentFile().mkdirs();
        }
        // If the database file does not yet exist and the system location
        // setting says that the Gears origins need to be removed from the
        // location permission table, it means that we don't actually need
+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ public class WebSettings {
                    switch (msg.what) {
                        case SYNC:
                            synchronized (WebSettings.this) {
                                checkGearsPermissions();
                                if (mBrowserFrame.mNativeFrame != 0) {
                                    nativeSync(mBrowserFrame.mNativeFrame);
                                }