Projects >> platform_frameworks_base >>4e42abcc00ae5da34b35276a511144907535d9a2

Chunk
Conflicting content 
import android.os.Handler;
import android.os.Message;
import android.provider.Checkin;
<<<<<<< HEAD
import java.lang.SecurityException;
=======

import java.lang.SecurityException;

>>>>>>> 38645ee6d61368f59b2d83256f2612bdaa38ff49
import java.util.Locale;

/**
Solution content 
import android.os.Handler;
import android.os.Message;
import android.provider.Checkin;
import java.lang.SecurityException;
import java.util.Locale;

/**
File
WebSettings.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    private boolean         mSupportZoom = true;
    private boolean         mBuiltInZoomControls = false;
    private boolean         mAllowFileAccess = true;
<<<<<<< HEAD
    private String          mDatabasePath = "";
    private boolean         mDatabaseEnabled = false;
    private String          mAppCachePath = "";
    private boolean         mAppCacheEnabled = false;
    private boolean         mDomStorageEnabled = false;
=======

    // The Gears permissions manager. Only in Donut.
    static GearsPermissionsManager sGearsPermissionsManager;
>>>>>>> 38645ee6d61368f59b2d83256f2612bdaa38ff49

    // Class to handle messages before WebCore is ready.
    private class EventHandler {
Solution content 
    private boolean         mSupportZoom = true;
    private boolean         mBuiltInZoomControls = false;
    private boolean         mAllowFileAccess = true;
    private String          mDatabasePath = "";
    private boolean         mDatabaseEnabled = false;
    private String          mAppCachePath = "";
    private boolean         mAppCacheEnabled = false;
    private boolean         mDomStorageEnabled = false;

    // Class to handle messages before WebCore is ready.
    private class EventHandler {
File
WebSettings.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
        return size;
    }

<<<<<<< HEAD
=======
    private void checkGearsPermissions() {
        // Did we already check the permissions at startup?
        if (sGearsPermissionsManager != null) {
            return;
        }
        // Is the pluginsPath sane?
        String pluginsPath = getPluginsPath();
        if (pluginsPath == null || pluginsPath.length() == 0) {
            // We don't yet have a meaningful plugin path, so
            // we can't do anything about the Gears permissions.
            return;
        }
        sGearsPermissionsManager =
            new GearsPermissionsManager(mContext, pluginsPath);
        sGearsPermissionsManager.doCheckAndStartObserver();
    }

>>>>>>> 38645ee6d61368f59b2d83256f2612bdaa38ff49
    /* Post a SYNC message to handle syncing the native settings. */
    private synchronized void postSync() {
        // Only post if a sync is not pending
Solution content 
        return size;
    }

    /* Post a SYNC message to handle syncing the native settings. */
    private synchronized void postSync() {
        // Only post if a sync is not pending
File
WebSettings.java
Developer's decision
Version 1
Kind of conflict
Method declaration