Projects >> android-frameworks-base-with-remote-control-service >>a45307e47f4e2092c8aaf301039601cb0c21a44d

Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
     * Helper function for code readability: only to be called from
     *    checkUpdateRemoteControlDisplay_syncAfRcs() which checks the preconditions for
     *    this method.
     * Preconditions:
     *    - called synchronized mAudioFocusLock then on mRCStack
     *    - mRCStack.isEmpty() is false
=======
     * Helper function:
     * Called synchronized on mRCStack
     * mRCStack.isEmpty() is false
>>>>>>> 44f9614a8de9b44049f8e64f7b31fb517e662f30
     */
    private void updateRemoteControlDisplay_syncAfRcs(int infoChangedFlags) {
        RemoteControlStackEntry rcse = mRCStack.peek();
Solution content 
    }

    /**
     * Helper function for code readability: only to be called from
     *    checkUpdateRemoteControlDisplay_syncAfRcs() which checks the preconditions for
     *    this method.
     * Preconditions:
     *    - called synchronized mAudioFocusLock then on mRCStack
     *    - mRCStack.isEmpty() is false
     */
    private void updateRemoteControlDisplay_syncAfRcs(int infoChangedFlags) {
        RemoteControlStackEntry rcse = mRCStack.peek();
File
AudioService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
            return;
        }
        // refresh conditions were verified: update the remote controls
<<<<<<< HEAD
        // ok to call: synchronized mAudioFocusLock then on mRCStack, mRCStack is not empty
        updateRemoteControlDisplay_syncAfRcs(infoChangedFlags);
=======
        // ok to call, mRCStack is not empty
        updateRemoteControlDisplay_syncRcs(infoChangedFlags);
>>>>>>> 44f9614a8de9b44049f8e64f7b31fb517e662f30
    }

    /** see AudioManager.registerMediaButtonEventReceiver(ComponentName eventReceiver) */
Solution content 
            return;
        }
        // refresh conditions were verified: update the remote controls
        // ok to call: synchronized mAudioFocusLock then on mRCStack, mRCStack is not empty
        updateRemoteControlDisplay_syncAfRcs(infoChangedFlags);
    }

    /** see AudioManager.registerMediaButtonEventReceiver(ComponentName eventReceiver) */
File
AudioService.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
                    }
                }

<<<<<<< HEAD
                // we have a new display, of which all the clients are now aware: have it be updated
                checkUpdateRemoteControlDisplay_syncAfRcs(RC_INFO_ALL);
=======
            if (!mRCStack.isEmpty()) {
                // we have a new display, of which all the clients are now aware: have it be updated
                updateRemoteControlDisplay_syncRcs(RC_INFO_ALL);
>>>>>>> 44f9614a8de9b44049f8e64f7b31fb517e662f30
            }
        }
    }
Solution content 
                    }
                }

                // we have a new display, of which all the clients are now aware: have it be updated
                checkUpdateRemoteControlDisplay_syncAfRcs(RC_INFO_ALL);
            }
        }
    }
File
AudioService.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation