Projects >> android-platform_sdk >>b21fe3ca66ad5a0464bfc3c42d3e32cbc78c183c

Chunk
Conflicting content 
    /**
     * Creates a new AVD. It is expected that there is no existing AVD with this name already.
<<<<<<< HEAD:sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
     * 
=======
     *
>>>>>>> 9c995875b466df1e152b80336541ac4b0efd0d11:sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
     * @param avdFolder the data folder for the AVD. It will be created as needed.
     * @param name the name of the AVD
     * @param target the target of the AVD
Solution content 
    /**
     * Creates a new AVD. It is expected that there is no existing AVD with this name already.
     * 
     * @param avdFolder the data folder for the AVD. It will be created as needed.
     * @param name the name of the AVD
     * @param target the target of the AVD
File
AvdManager.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
     * @param target the target of the AVD
     * @param skinName the name of the skin. Can be null. Must have been verified by caller.
     * @param sdcard the parameter value for the sdCard. Can be null. This is either a path to
<<<<<<< HEAD:sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
     *        an existing sdcard image or a sdcard size (\d+, \d+K, \dM).
=======
     * an existing sdcard image or a sdcard size (\d+, \d+K, \dM).
>>>>>>> 9c995875b466df1e152b80336541ac4b0efd0d11:sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
     * @param hardwareConfig the hardware setup for the AVD. Can be null to use defaults.
     * @param removePrevious If true remove any previous files.
     * @return The new {@link AvdInfo} in case of success (which has just been added to the
Solution content 
     * @param target the target of the AVD
     * @param skinName the name of the skin. Can be null. Must have been verified by caller.
     * @param sdcard the parameter value for the sdCard. Can be null. This is either a path to
     *        an existing sdcard image or a sdcard size (\d+, \d+K, \dM).
     * @param hardwareConfig the hardware setup for the AVD. Can be null to use defaults.
     * @param removePrevious If true remove any previous files.
     * @return The new {@link AvdInfo} in case of success (which has just been added to the
File
AvdManager.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
                    target.hashString(),
                    target, values);

<<<<<<< HEAD:sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
            AvdInfo oldAvdInfo = getAvd(name, false /*validAvdOnly*/);
            
            synchronized (mAllAvdList) {
                if (oldAvdInfo != null && removePrevious) {
                    mAllAvdList.remove(oldAvdInfo);
                }
=======
            synchronized (mAllAvdList) {
>>>>>>> 9c995875b466df1e152b80336541ac4b0efd0d11:sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
                mAllAvdList.add(newAvdInfo);
                mValidAvdList = mBrokenAvdList = null;
            }
Solution content 
                    target.hashString(),
                    target, values);

            AvdInfo oldAvdInfo = getAvd(name, false /*validAvdOnly*/);
            
            synchronized (mAllAvdList) {
                if (oldAvdInfo != null && removePrevious) {
                    mAllAvdList.remove(oldAvdInfo);
                }
                mAllAvdList.add(newAvdInfo);
                mValidAvdList = mBrokenAvdList = null;
            }
File
AvdManager.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Synchronized statement
Variable
Chunk
Conflicting content 
                mValidAvdList = mBrokenAvdList = null;
            }

<<<<<<< HEAD:sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
            if (removePrevious &&
                    newAvdInfo != null && 
                    oldAvdInfo != null &&
                    !oldAvdInfo.getPath().equals(newAvdInfo.getPath())) {
                mSdkLog.warning("Removing previous AVD directory at %s", oldAvdInfo.getPath());
                // Remove the old data directory
                File dir = new File(oldAvdInfo.getPath());
                recursiveDelete(dir);
                dir.delete();
            }

=======
>>>>>>> 9c995875b466df1e152b80336541ac4b0efd0d11:sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
            return newAvdInfo;
        } catch (AndroidLocationException e) {
            if (mSdkLog != null) {
Solution content 
                mValidAvdList = mBrokenAvdList = null;
            }

            if (removePrevious &&
                    newAvdInfo != null && 
                    oldAvdInfo != null &&
                    !oldAvdInfo.getPath().equals(newAvdInfo.getPath())) {
                mSdkLog.warning("Removing previous AVD directory at %s", oldAvdInfo.getPath());
                // Remove the old data directory
                File dir = new File(oldAvdInfo.getPath());
                recursiveDelete(dir);
                dir.delete();
            }

            return newAvdInfo;
        } catch (AndroidLocationException e) {
            if (mSdkLog != null) {
File
AvdManager.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
        if (oldProperties != null) {
            properties.putAll(oldProperties);
        }
<<<<<<< HEAD:sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
        
=======

>>>>>>> 9c995875b466df1e152b80336541ac4b0efd0d11:sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
        AvdStatus status;

        // create the path to the new system images.
Solution content 
        if (oldProperties != null) {
            properties.putAll(oldProperties);
        }
        
        AvdStatus status;
        
        // create the path to the new system images.
File
AvdManager.java
Developer's decision
Version 1
Kind of conflict
Blank