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

Chunk
Conflicting content
    public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 1<<19;
    
    /**
<<<<<<< HEAD
     * Value for {@link #flags}: true when the application's rendering should
     * be hardware accelerated.
     */
    public static final int FLAG_HARDWARE_ACCELERATED = 1<<20;
=======
     * Value for {@link #flags}: set to true if the application
     * has reported that it is heavy-weight, and thus can not participate in
     * the normal application lifecycle.
     * 
     * 

Comes from the * {@link android.R.styleable#AndroidManifestApplication_heavyWeight android:heavyWeight} * attribute of the <application> tag. */ public static final int FLAG_HEAVY_WEIGHT = 1<<20; >>>>>>> f3307ae892f7752779fd1f0e8e4ad813546c25c9 /** * Value for {@link #flags}: this is true if the application has set

Solution content
    /**
     * Value for {@link #flags}: set to true if the application
     * has reported that it is heavy-weight, and thus can not participate in
     * the normal application lifecycle.
     * 
     * 

Comes from the public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 1<<19; * {@link android.R.styleable#AndroidManifestApplication_heavyWeight android:heavyWeight} * attribute of the <application> tag. */ public static final int FLAG_HEAVY_WEIGHT = 1<<20; /** * Value for {@link #flags}: true when the application's rendering should * be hardware accelerated. */ public static final int FLAG_HARDWARE_ACCELERATED = 1<<21; /** * Value for {@link #flags}: this is true if the application has set

File
ApplicationInfo.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment