Projects information

Chunk

Conflicting content
data.recycle(); } <<<<<<< HEAD public boolean switchUser(int userid) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(userid); mRemote.transact(SWITCH_USER_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; } public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(taskId); data.writeInt(subTaskIndex); mRemote.transact(REMOVE_SUB_TASK_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; } public boolean removeTask(int taskId, int flags) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(taskId); data.writeInt(flags); mRemote.transact(REMOVE_TASK_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; } public void registerProcessObserver(IProcessObserver observer) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeStrongBinder(observer != null ? observer.asBinder() : null); mRemote.transact(REGISTER_PROCESS_OBSERVER_TRANSACTION, data, reply, 0); reply.readException(); data.recycle(); reply.recycle(); } public void unregisterProcessObserver(IProcessObserver observer) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeStrongBinder(observer != null ? observer.asBinder() : null); mRemote.transact(UNREGISTER_PROCESS_OBSERVER_TRANSACTION, data, reply, 0); reply.readException(); data.recycle(); reply.recycle(); ======= public boolean getPackageAskScreenCompat(String packageName) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeString(packageName); mRemote.transact(GET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION, data, reply, 0); reply.readException(); boolean ask = reply.readInt() != 0; reply.recycle(); data.recycle(); return ask; } public void setPackageAskScreenCompat(String packageName, boolean ask) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeString(packageName); data.writeInt(ask ? 1 : 0); mRemote.transact(SET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION, data, reply, 0); reply.readException(); reply.recycle(); data.recycle(); >>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3 } private IBinder mRemote;

Conflicting content

        data.recycle();
    }

<<<<<<< HEAD
    public boolean switchUser(int userid) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(userid);
        mRemote.transact(SWITCH_USER_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
    }
    
    public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(taskId);
        data.writeInt(subTaskIndex);
        mRemote.transact(REMOVE_SUB_TASK_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
    }

    public boolean removeTask(int taskId, int flags) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(taskId);
        data.writeInt(flags);
        mRemote.transact(REMOVE_TASK_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
    }

    public void registerProcessObserver(IProcessObserver observer) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeStrongBinder(observer != null ? observer.asBinder() : null);
        mRemote.transact(REGISTER_PROCESS_OBSERVER_TRANSACTION, data, reply, 0);
        reply.readException();
        data.recycle();
        reply.recycle();
    }
    public void unregisterProcessObserver(IProcessObserver observer) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeStrongBinder(observer != null ? observer.asBinder() : null);
        mRemote.transact(UNREGISTER_PROCESS_OBSERVER_TRANSACTION, data, reply, 0);
        reply.readException();
        data.recycle();
        reply.recycle();
=======
    public boolean getPackageAskScreenCompat(String packageName) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeString(packageName);
        mRemote.transact(GET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean ask = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return ask;
    }

    public void setPackageAskScreenCompat(String packageName, boolean ask)
            throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeString(packageName);
        data.writeInt(ask ? 1 : 0);
        mRemote.transact(SET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION, data, reply, 0);
        reply.readException();
        reply.recycle();
        data.recycle();
>>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3
    }

    private IBinder mRemote;

Solution content
Parcel reply = Parcel.obtain(); reply.recycle(); data.recycle(); } data.recycle(); } public boolean getPackageAskScreenCompat(String packageName) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeString(packageName); mRemote.transact(GET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION, data, reply, 0); reply.readException(); boolean ask = reply.readInt() != 0; reply.recycle(); data.recycle(); return ask; } public void setPackageAskScreenCompat(String packageName, boolean ask) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeString(packageName); data.writeInt(ask ? 1 : 0); data.writeInterfaceToken(IActivityManager.descriptor); data.writeStrongBinder(observer != null ? observer.asBinder() : null); mRemote.transact(UNREGISTER_PROCESS_OBSERVER_TRANSACTION, data, reply, 0); reply.readException(); data.recycle(); reply.recycle(); } mRemote.transact(SET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION, data, reply, 0); private IBinder mRemote; reply.readException(); public void unregisterProcessObserver(IProcessObserver observer) throws RemoteException { public boolean switchUser(int userid) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(userid); mRemote.transact(SWITCH_USER_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; } public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(taskId); data.writeInt(subTaskIndex); mRemote.transact(REMOVE_SUB_TASK_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; } public boolean removeTask(int taskId, int flags) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(taskId); data.writeInt(flags); mRemote.transact(REMOVE_TASK_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; } public void registerProcessObserver(IProcessObserver observer) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeStrongBinder(observer != null ? observer.asBinder() : null); mRemote.transact(REGISTER_PROCESS_OBSERVER_TRANSACTION, data, reply, 0); reply.readException(); data.recycle(); reply.recycle(); } Parcel data = Parcel.obtain();

Solution content

        Parcel reply = Parcel.obtain();
        reply.recycle();
        data.recycle();
    }
        data.recycle();
    }

    public boolean getPackageAskScreenCompat(String packageName) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeString(packageName);
        mRemote.transact(GET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean ask = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return ask;
    }

    public void setPackageAskScreenCompat(String packageName, boolean ask)
            throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeString(packageName);
        data.writeInt(ask ? 1 : 0);

        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeStrongBinder(observer != null ? observer.asBinder() : null);
        mRemote.transact(UNREGISTER_PROCESS_OBSERVER_TRANSACTION, data, reply, 0);
        reply.readException();
        data.recycle();
        reply.recycle();
    }
        mRemote.transact(SET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION, data, reply, 0);

    private IBinder mRemote;
        reply.readException();
    public void unregisterProcessObserver(IProcessObserver observer) throws RemoteException {
    public boolean switchUser(int userid) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(userid);
        mRemote.transact(SWITCH_USER_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
    }
    
    public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(taskId);
        data.writeInt(subTaskIndex);
        mRemote.transact(REMOVE_SUB_TASK_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
    }

    public boolean removeTask(int taskId, int flags) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(taskId);
        data.writeInt(flags);
        mRemote.transact(REMOVE_TASK_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
    }

    public void registerProcessObserver(IProcessObserver observer) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeStrongBinder(observer != null ? observer.asBinder() : null);
        mRemote.transact(REGISTER_PROCESS_OBSERVER_TRANSACTION, data, reply, 0);
        reply.readException();
        data.recycle();
        reply.recycle();
    }

        Parcel data = Parcel.obtain();

File
ActivityManagerNative.java

Developer's decision
Concatenation

Kind of conflict
Method declaration
Method invocation
Method signature
Variable

Chunk

Conflicting content
public int getPackageScreenCompatMode(String packageName) throws RemoteException; public void setPackageScreenCompatMode(String packageName, int mode) throws RemoteException; <<<<<<< HEAD // Multi-user APIs public boolean switchUser(int userid) throws RemoteException; public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException; public boolean removeTask(int taskId, int flags) throws RemoteException; public void registerProcessObserver(IProcessObserver observer) throws RemoteException; public void unregisterProcessObserver(IProcessObserver observer) throws RemoteException; ======= public boolean getPackageAskScreenCompat(String packageName) throws RemoteException; public void setPackageAskScreenCompat(String packageName, boolean ask) throws RemoteException; >>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3 /* * Private non-Binder interfaces

Conflicting content

    public int getPackageScreenCompatMode(String packageName) throws RemoteException;
    public void setPackageScreenCompatMode(String packageName, int mode)
            throws RemoteException;
<<<<<<< HEAD
    
    // Multi-user APIs
    public boolean switchUser(int userid) throws RemoteException;
    
    public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException;

    public boolean removeTask(int taskId, int flags) throws RemoteException;

    public void registerProcessObserver(IProcessObserver observer) throws RemoteException;
    public void unregisterProcessObserver(IProcessObserver observer) throws RemoteException;
=======
    public boolean getPackageAskScreenCompat(String packageName) throws RemoteException;
    public void setPackageAskScreenCompat(String packageName, boolean ask)
            throws RemoteException;
>>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3

    /*
     * Private non-Binder interfaces

Solution content
public int getPackageScreenCompatMode(String packageName) throws RemoteException; public void setPackageScreenCompatMode(String packageName, int mode) throws RemoteException; public boolean getPackageAskScreenCompat(String packageName) throws RemoteException; public void setPackageAskScreenCompat(String packageName, boolean ask) throws RemoteException; // Multi-user APIs public boolean switchUser(int userid) throws RemoteException; public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException; public boolean removeTask(int taskId, int flags) throws RemoteException; public void registerProcessObserver(IProcessObserver observer) throws RemoteException; public void unregisterProcessObserver(IProcessObserver observer) throws RemoteException; /* * Private non-Binder interfaces

Solution content

    public int getPackageScreenCompatMode(String packageName) throws RemoteException;
    public void setPackageScreenCompatMode(String packageName, int mode)
            throws RemoteException;
    public boolean getPackageAskScreenCompat(String packageName) throws RemoteException;
    public void setPackageAskScreenCompat(String packageName, boolean ask)
            throws RemoteException;
    
    // Multi-user APIs
    public boolean switchUser(int userid) throws RemoteException;
    
    public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException;

    public boolean removeTask(int taskId, int flags) throws RemoteException;

    public void registerProcessObserver(IProcessObserver observer) throws RemoteException;
    public void unregisterProcessObserver(IProcessObserver observer) throws RemoteException;

    /*
     * Private non-Binder interfaces

File
IActivityManager.java

Developer's decision
Concatenation

Kind of conflict
Comment
Method interface

Chunk

Conflicting content
int SET_FRONT_ACTIVITY_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+124; int GET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+125; int SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+126; <<<<<<< HEAD int SWITCH_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+127; int REMOVE_SUB_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+128; int REMOVE_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+129; int REGISTER_PROCESS_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+130; int UNREGISTER_PROCESS_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+131; ======= int GET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+127; int SET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+128; >>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3 }

Conflicting content

    int SET_FRONT_ACTIVITY_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+124;
    int GET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+125;
    int SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+126;
<<<<<<< HEAD
    int SWITCH_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+127;
    int REMOVE_SUB_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+128;
    int REMOVE_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+129;
    int REGISTER_PROCESS_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+130;
    int UNREGISTER_PROCESS_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+131;
=======
    int GET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+127;
    int SET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+128;
>>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3
}

Solution content
int SET_FRONT_ACTIVITY_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+124; int GET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+125; int SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+126; int GET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+127; int SET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+128; int SWITCH_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+129; int REMOVE_SUB_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+130; int REMOVE_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+131; int REGISTER_PROCESS_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+132; int UNREGISTER_PROCESS_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+133; }

Solution content

    int SET_FRONT_ACTIVITY_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+124;
    int GET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+125;
    int SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+126;
    int GET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+127;
    int SET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+128;
    int SWITCH_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+129;
    int REMOVE_SUB_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+130;
    int REMOVE_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+131;
    int REGISTER_PROCESS_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+132;
    int UNREGISTER_PROCESS_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+133;
}

File
IActivityManager.java

Developer's decision
Manual

Kind of conflict
Attribute

Chunk

Conflicting content
final LayoutTransition transitioner = new LayoutTransition(); } <<<<<<< HEAD:packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java throw new IllegalArgumentException("missing RecentsListView/RecentsScrollView"); ((ViewGroup)mRecentsContainer).setLayoutTransition(transitioner); createCustomAnimations(transitioner); ======= mRecentsContainer = (ListView) findViewById(R.id.recents_container); View footer = inflater.inflate(R.layout.status_bar_recent_panel_footer, mRecentsContainer, false); mRecentsContainer.setScrollbarFadingEnabled(true); mRecentsContainer.addFooterView(footer, null, false); mRecentsContainer.setAdapter(mListAdapter = new ActvityDescriptionAdapter(mContext)); mRecentsContainer.setOnItemClickListener(this); final int leftPadding = mContext.getResources() .getDimensionPixelOffset(R.dimen.status_bar_recents_thumbnail_left_margin); mRecentsContainer.setOverScrollEffectPadding(leftPadding, 0); >>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3:packages/SystemUI/src/com/android/systemui/statusbar/tablet/RecentAppsPanel.java mRecentsGlowView = findViewById(R.id.recents_glow); mRecentsScrim = (View) findViewById(R.id.recents_bg_protect);

Conflicting content

        final LayoutTransition transitioner = new LayoutTransition();
        }

<<<<<<< HEAD:packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
            throw new IllegalArgumentException("missing RecentsListView/RecentsScrollView");
        ((ViewGroup)mRecentsContainer).setLayoutTransition(transitioner);
        createCustomAnimations(transitioner);
=======
        mRecentsContainer = (ListView) findViewById(R.id.recents_container);
        View footer = inflater.inflate(R.layout.status_bar_recent_panel_footer,
                mRecentsContainer, false);
        mRecentsContainer.setScrollbarFadingEnabled(true);
        mRecentsContainer.addFooterView(footer, null, false);
        mRecentsContainer.setAdapter(mListAdapter = new ActvityDescriptionAdapter(mContext));
        mRecentsContainer.setOnItemClickListener(this);
        final int leftPadding = mContext.getResources()
            .getDimensionPixelOffset(R.dimen.status_bar_recents_thumbnail_left_margin);
        mRecentsContainer.setOverScrollEffectPadding(leftPadding, 0);
>>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3:packages/SystemUI/src/com/android/systemui/statusbar/tablet/RecentAppsPanel.java

        mRecentsGlowView = findViewById(R.id.recents_glow);
        mRecentsScrim = (View) findViewById(R.id.recents_bg_protect);

Solution content
throw new IllegalArgumentException("missing RecentsListView/RecentsScrollView"); } final LayoutTransition transitioner = new LayoutTransition(); ((ViewGroup)mRecentsContainer).setLayoutTransition(transitioner); createCustomAnimations(transitioner); mRecentsGlowView = findViewById(R.id.recents_glow); mRecentsScrim = (View) findViewById(R.id.recents_bg_protect);

Solution content

            throw new IllegalArgumentException("missing RecentsListView/RecentsScrollView");
        }

        final LayoutTransition transitioner = new LayoutTransition();
        ((ViewGroup)mRecentsContainer).setLayoutTransition(transitioner);
        createCustomAnimations(transitioner);

        mRecentsGlowView = findViewById(R.id.recents_glow);
        mRecentsScrim = (View) findViewById(R.id.recents_bg_protect);

File
RecentsPanelView.java

Developer's decision
Version 1

Kind of conflict
Attribute
Cast expression
Method invocation
Variable

Chunk

Conflicting content
return desc; } <<<<<<< HEAD:packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java ======= private void updateShownCompatMode() { if (mCompatMode == null) { return; } final ActivityManager am = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE); int mode = am.getFrontActivityScreenCompatMode(); switch (mode) { case ActivityManager.COMPAT_MODE_DISABLED: mCompatMode.setVisibility(View.VISIBLE); mCompatMode.setChecked(true); break; case ActivityManager.COMPAT_MODE_ENABLED: mCompatMode.setVisibility(View.VISIBLE); mCompatMode.setChecked(false); break; default: mCompatMode.setVisibility(View.GONE); break; } } >>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3:packages/SystemUI/src/com/android/systemui/statusbar/tablet/RecentAppsPanel.java private void refreshApplicationList() { mActivityDescriptions = getRecentTasks(); mListAdapter.notifyDataSetInvalidated();

Conflicting content

        return desc;
    }

<<<<<<< HEAD:packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
=======
    private void updateShownCompatMode() {
        if (mCompatMode == null) {
            return;
        }
        final ActivityManager am = (ActivityManager)
                mContext.getSystemService(Context.ACTIVITY_SERVICE);
        int mode = am.getFrontActivityScreenCompatMode();
        switch (mode) {
            case ActivityManager.COMPAT_MODE_DISABLED:
                mCompatMode.setVisibility(View.VISIBLE);
                mCompatMode.setChecked(true);
                break;
            case ActivityManager.COMPAT_MODE_ENABLED:
                mCompatMode.setVisibility(View.VISIBLE);
                mCompatMode.setChecked(false);
                break;
            default:
                mCompatMode.setVisibility(View.GONE);
                break;
        }
    }

>>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3:packages/SystemUI/src/com/android/systemui/statusbar/tablet/RecentAppsPanel.java
    private void refreshApplicationList() {
        mActivityDescriptions = getRecentTasks();
        mListAdapter.notifyDataSetInvalidated();

Solution content
return desc; } private void refreshApplicationList() { mActivityDescriptions = getRecentTasks(); mListAdapter.notifyDataSetInvalidated();

File
RecentsPanelView.java

Developer's decision
Version 1

Kind of conflict
Method declaration

Chunk

Conflicting content
======= static final int SHOW_COMPAT_MODE_DIALOG_MSG = 30; >>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3 static final int DISPATCH_PROCESS_DIED = 31; static final int CHECK_EXCESSIVE_WAKE_LOCKS_MSG = 27; static final int CLEAR_DNS_CACHE = 28; static final int UPDATE_HTTP_PROXY = 29; <<<<<<< HEAD static final int DISPATCH_FOREGROUND_ACTIVITIES_CHANGED = 30; AlertDialog mUidAlert; CompatModeDialog mCompatModeDialog;

Conflicting content

=======
    static final int SHOW_COMPAT_MODE_DIALOG_MSG = 30;
>>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3

    static final int DISPATCH_PROCESS_DIED = 31;
    static final int CHECK_EXCESSIVE_WAKE_LOCKS_MSG = 27;
    static final int CLEAR_DNS_CACHE = 28;
    static final int UPDATE_HTTP_PROXY = 29;
<<<<<<< HEAD
    static final int DISPATCH_FOREGROUND_ACTIVITIES_CHANGED = 30;
    AlertDialog mUidAlert;
    CompatModeDialog mCompatModeDialog;

Solution content
static final int CHECK_EXCESSIVE_WAKE_LOCKS_MSG = 27; static final int CLEAR_DNS_CACHE = 28; static final int UPDATE_HTTP_PROXY = 29; static final int SHOW_COMPAT_MODE_DIALOG_MSG = 30; static final int DISPATCH_FOREGROUND_ACTIVITIES_CHANGED = 31; static final int DISPATCH_PROCESS_DIED = 32; AlertDialog mUidAlert; CompatModeDialog mCompatModeDialog;

Solution content

    static final int CHECK_EXCESSIVE_WAKE_LOCKS_MSG = 27;
    static final int CLEAR_DNS_CACHE = 28;
    static final int UPDATE_HTTP_PROXY = 29;
    static final int SHOW_COMPAT_MODE_DIALOG_MSG = 30;
    static final int DISPATCH_FOREGROUND_ACTIVITIES_CHANGED = 31;
    static final int DISPATCH_PROCESS_DIED = 32;

    AlertDialog mUidAlert;
    CompatModeDialog mCompatModeDialog;

File
ActivityManagerService.java

Developer's decision
Manual

Kind of conflict
Attribute

Chunk

Conflicting content
sendMessageDelayed(nmsg, POWER_CHECK_DELAY); } } break; <<<<<<< HEAD case DISPATCH_FOREGROUND_ACTIVITIES_CHANGED: { final ProcessRecord app = (ProcessRecord) msg.obj; final boolean foregroundActivities = msg.arg1 != 0; dispatchForegroundActivitiesChanged( app.pid, app.info.uid, foregroundActivities); break; } case DISPATCH_PROCESS_DIED: { final ProcessRecord app = (ProcessRecord) msg.obj; dispatchProcessDied(app.pid, app.info.uid); break; ======= case SHOW_COMPAT_MODE_DIALOG_MSG: { synchronized (ActivityManagerService.this) { ActivityRecord ar = (ActivityRecord)msg.obj; if (mCompatModeDialog != null) { if (mCompatModeDialog.mAppInfo.packageName.equals( ar.info.applicationInfo.packageName)) { return; } mCompatModeDialog.dismiss(); mCompatModeDialog = null; } if (ar != null) { if (mCompatModePackages.getPackageAskCompatModeLocked( ar.packageName)) { int mode = mCompatModePackages.computeCompatModeLocked( ar.info.applicationInfo); if (mode == ActivityManager.COMPAT_MODE_DISABLED \|\| mode == ActivityManager.COMPAT_MODE_ENABLED) { mCompatModeDialog = new CompatModeDialog( ActivityManagerService.this, mContext, ar.info.applicationInfo); mCompatModeDialog.show(); } } } } >>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3 } } }

Conflicting content

                    sendMessageDelayed(nmsg, POWER_CHECK_DELAY);
                }
            } break;
<<<<<<< HEAD
            case DISPATCH_FOREGROUND_ACTIVITIES_CHANGED: {
                final ProcessRecord app = (ProcessRecord) msg.obj;
                final boolean foregroundActivities = msg.arg1 != 0;
                dispatchForegroundActivitiesChanged(
                        app.pid, app.info.uid, foregroundActivities);
                break;
            }
            case DISPATCH_PROCESS_DIED: {
                final ProcessRecord app = (ProcessRecord) msg.obj;
                dispatchProcessDied(app.pid, app.info.uid);
                break;
=======
            case SHOW_COMPAT_MODE_DIALOG_MSG: {
                synchronized (ActivityManagerService.this) {
                    ActivityRecord ar = (ActivityRecord)msg.obj;
                    if (mCompatModeDialog != null) {
                        if (mCompatModeDialog.mAppInfo.packageName.equals(
                                ar.info.applicationInfo.packageName)) {
                            return;
                        }
                        mCompatModeDialog.dismiss();
                        mCompatModeDialog = null;
                    }
                    if (ar != null) {
                        if (mCompatModePackages.getPackageAskCompatModeLocked(
                                ar.packageName)) {
                            int mode = mCompatModePackages.computeCompatModeLocked(
                                    ar.info.applicationInfo);
                            if (mode == ActivityManager.COMPAT_MODE_DISABLED
                                    || mode == ActivityManager.COMPAT_MODE_ENABLED) {
                                mCompatModeDialog = new CompatModeDialog(
                                        ActivityManagerService.this, mContext,
                                        ar.info.applicationInfo);
                                mCompatModeDialog.show();
                            }
                        }
                    }
                }
>>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3
            }
            }
        }

Solution content
sendMessageDelayed(nmsg, POWER_CHECK_DELAY); } } break; case SHOW_COMPAT_MODE_DIALOG_MSG: { synchronized (ActivityManagerService.this) { ActivityRecord ar = (ActivityRecord)msg.obj; if (mCompatModeDialog != null) { if (mCompatModeDialog.mAppInfo.packageName.equals( ar.info.applicationInfo.packageName)) { return; } mCompatModeDialog.dismiss(); mCompatModeDialog = null; } if (ar != null) { if (mCompatModePackages.getPackageAskCompatModeLocked( ar.packageName)) { int mode = mCompatModePackages.computeCompatModeLocked( ar.info.applicationInfo); if (mode == ActivityManager.COMPAT_MODE_DISABLED \|\| mode == ActivityManager.COMPAT_MODE_ENABLED) { mCompatModeDialog = new CompatModeDialog( ActivityManagerService.this, mContext, ar.info.applicationInfo); mCompatModeDialog.show(); } } } } break; } case DISPATCH_FOREGROUND_ACTIVITIES_CHANGED: { final ProcessRecord app = (ProcessRecord) msg.obj; final boolean foregroundActivities = msg.arg1 != 0; dispatchForegroundActivitiesChanged( app.pid, app.info.uid, foregroundActivities); break; } case DISPATCH_PROCESS_DIED: { final ProcessRecord app = (ProcessRecord) msg.obj; dispatchProcessDied(app.pid, app.info.uid); break; } } }

Solution content

                    sendMessageDelayed(nmsg, POWER_CHECK_DELAY);
                }
            } break;
            case SHOW_COMPAT_MODE_DIALOG_MSG: {
                synchronized (ActivityManagerService.this) {
                    ActivityRecord ar = (ActivityRecord)msg.obj;
                    if (mCompatModeDialog != null) {
                        if (mCompatModeDialog.mAppInfo.packageName.equals(
                                ar.info.applicationInfo.packageName)) {
                            return;
                        }
                        mCompatModeDialog.dismiss();
                        mCompatModeDialog = null;
                    }
                    if (ar != null) {
                        if (mCompatModePackages.getPackageAskCompatModeLocked(
                                ar.packageName)) {
                            int mode = mCompatModePackages.computeCompatModeLocked(
                                    ar.info.applicationInfo);
                            if (mode == ActivityManager.COMPAT_MODE_DISABLED
                                    || mode == ActivityManager.COMPAT_MODE_ENABLED) {
                                mCompatModeDialog = new CompatModeDialog(
                                        ActivityManagerService.this, mContext,
                                        ar.info.applicationInfo);
                                mCompatModeDialog.show();
                            }
                        }
                    }
                }
                break;
            }
            case DISPATCH_FOREGROUND_ACTIVITIES_CHANGED: {
                final ProcessRecord app = (ProcessRecord) msg.obj;
                final boolean foregroundActivities = msg.arg1 != 0;
                dispatchForegroundActivitiesChanged(
                        app.pid, app.info.uid, foregroundActivities);
                break;
            }
            case DISPATCH_PROCESS_DIED: {
                final ProcessRecord app = (ProcessRecord) msg.obj;
                dispatchProcessDied(app.pid, app.info.uid);
                break;
            }
            }
        }

File
ActivityManagerService.java

Developer's decision
Manual

Kind of conflict
Break statement
Case statement
Cast expression
Method invocation
Synchronized statement
Variable

Chunk

Conflicting content
long lastActiveTime; // Last time this task was active, including sleep. boolean rootWasReset; // True if the intent at the root of the task had // the FLAG_ACTIVITY_RESET_TASK_IF_NEEDED flag. <<<<<<< HEAD ======= boolean askedCompatMode;// Have asked the user about compat mode for this task. Bitmap lastThumbnail; // Last thumbnail captured for this task. CharSequence lastDescription; // Last description captured for this task. >>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3 String stringName; // caching of toString() result.

Conflicting content

    long lastActiveTime;    // Last time this task was active, including sleep.
    boolean rootWasReset;   // True if the intent at the root of the task had
                            // the FLAG_ACTIVITY_RESET_TASK_IF_NEEDED flag.
<<<<<<< HEAD
=======
    boolean askedCompatMode;// Have asked the user about compat mode for this task.
    Bitmap lastThumbnail;   // Last thumbnail captured for this task.
    CharSequence lastDescription; // Last description captured for this task.
>>>>>>> 590ec479fd51e13d077212833e2ac4f848a49cc3

    String stringName;      // caching of toString() result.

Solution content
long lastActiveTime; // Last time this task was active, including sleep. boolean rootWasReset; // True if the intent at the root of the task had // the FLAG_ACTIVITY_RESET_TASK_IF_NEEDED flag. boolean askedCompatMode;// Have asked the user about compat mode for this task. String stringName; // caching of toString() result.

Solution content

    long lastActiveTime;    // Last time this task was active, including sleep.
    boolean rootWasReset;   // True if the intent at the root of the task had
                            // the FLAG_ACTIVITY_RESET_TASK_IF_NEEDED flag.
    boolean askedCompatMode;// Have asked the user about compat mode for this task.

    String stringName;      // caching of toString() result.

File
TaskRecord.java

Developer's decision
Combination

Kind of conflict
Attribute
Comment

Projects >> android-frameworks-base-with-remote-control-service >>36f80f3a5a3de42d4e7ca4b53d4aa3e567f4df6f