Projects >> platform_packages_apps_packageinstaller >>696c8820726c6041995d02c6ec377b93840be524

Chunk
Conflicting content 
        View decor = getWindow().getDecorView();
        getWindowManager().removeViewImmediate(decor);
        getWindowManager().addView(decor, decor.getLayoutParams());
<<<<<<< HEAD
        if (mViewHandler instanceof GrantPermissionsViewHandlerImpl) {
            ((GrantPermissionsViewHandlerImpl) mViewHandler).onConfigurationChanged();
=======
        if (mViewHandler instanceof GrantPermissionsDefaultViewHandler) {
            ((GrantPermissionsDefaultViewHandler) mViewHandler).onConfigurationChanged();
>>>>>>> bd0d2c00d4e1fcd558fc8dde3c72267c293e3c7e
        }
    }
Solution content 
        View decor = getWindow().getDecorView();
        getWindowManager().removeViewImmediate(decor);
        getWindowManager().addView(decor, decor.getLayoutParams());
        if (mViewHandler instanceof GrantPermissionsViewHandlerImpl) {
            ((GrantPermissionsViewHandlerImpl) mViewHandler).onConfigurationChanged();
        }
    }
File
GrantPermissionsActivity.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation