Projects >> android-frameworks-base-with-screenshot-tweaks >>dc28be1095c681522ed0784038b30f5630e62291

Chunk
Conflicting content 
     */
    public static final String LOCATION_SERVICE = "location";

<<<<<<< HEAD
    /**
     * Use with {@link #getSystemService} to retrieve a
     * {@link android.location.CountryDetector} for detecting the country that
     * the user is in.
     *
     * @hide
     */
    public static final String COUNTRY_DETECTOR = "country_detector";

=======
>>>>>>> 177b05d6140cb0fb25fa75a61b888cf53f44564e
    /**
     * Use with {@link #getSystemService} to retrieve a {@link
     * android.app.SearchManager} for handling searches.
Solution content 
     */
    public static final String LOCATION_SERVICE = "location";

    /**
     * Use with {@link #getSystemService} to retrieve a
     * {@link android.location.CountryDetector} for detecting the country that
     * the user is in.
     *
     * @hide
     */
    public static final String COUNTRY_DETECTOR = "country_detector";

    /**
     * Use with {@link #getSystemService} to retrieve a {@link
     * android.app.SearchManager} for handling searches.
File
Context.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment