Projects >> platform_frameworks_base >>99fd373cc66e0b4512b6b32c08c453501482a76e

Chunk
Conflicting content 
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
<<<<<<< HEAD
import android.content.res.Resources;
=======
>>>>>>> d4e00d2b9d29e62b1ad989afb1fe2bfe3b519891
import android.database.ContentObserver;
import android.hardware.soundtrigger.IRecognitionStatusCallback;
import android.hardware.soundtrigger.SoundTrigger.KeyphraseSoundModel;
Solution content 
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.content.res.Resources;
import android.database.ContentObserver;
import android.hardware.soundtrigger.IRecognitionStatusCallback;
import android.hardware.soundtrigger.SoundTrigger.KeyphraseSoundModel;
File
VoiceInteractionManagerService.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            }
        }

<<<<<<< HEAD
        private boolean shouldEnableService(Resources res) {
            // VoiceInteractionService should not be enabled on low ram devices unless it has the config flag.
            return !ActivityManager.isLowRamDeviceStatic() ||
                    getForceVoiceInteractionServicePackage(res) != null;
        }

        private String getForceVoiceInteractionServicePackage(Resources res) {
            String interactorPackage =
                    res.getString(com.android.internal.R.string.config_forceVoiceInteractionServicePackage);
            return TextUtils.isEmpty(interactorPackage) ? null : interactorPackage;
        }

=======
>>>>>>> d4e00d2b9d29e62b1ad989afb1fe2bfe3b519891
        public void systemRunning(boolean safeMode) {
            mSafeMode = safeMode;
Solution content 
            }
        }

        private boolean shouldEnableService(Resources res) {
            // VoiceInteractionService should not be enabled on low ram devices unless it has the config flag.
            return !ActivityManager.isLowRamDeviceStatic() ||
                    getForceVoiceInteractionServicePackage(res) != null;
        }

        private String getForceVoiceInteractionServicePackage(Resources res) {
            String interactorPackage =
                    res.getString(com.android.internal.R.string.config_forceVoiceInteractionServicePackage);
            return TextUtils.isEmpty(interactorPackage) ? null : interactorPackage;
        }

        public void systemRunning(boolean safeMode) {
            mSafeMode = safeMode;
File
VoiceInteractionManagerService.java
Developer's decision
Version 1
Kind of conflict
Method declaration