summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* AppCompatActionBar: use findClass to test presenceDeepanshu Gupta2015-11-171-10/+9
| | | | | | | To test the presence of WindowDecorActionBar class, use findClass() instead of loadClass() which logs warnings. Change-Id: Ice8a5a6badd764c7f75b5a64a07c48f0a7cfef98
* Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into ↵Michael Wright2015-11-170-0/+0
|\ | | | | | | | | | | | | | | | | mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab * commit 'c73255d8abb343dc88ea56f7f8f5d2fd3dcfeb63': DO NOT MERGE. Prevent recents from coming up when in SUW
| * Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into ↵Michael Wright2015-11-170-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 * commit '313c7b2ee07ea74ac184294e4a6133a813bfcabf': DO NOT MERGE. Prevent recents from coming up when in SUW
| | * Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-devMichael Wright2015-11-170-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am: 4aa1e48a71 * commit '4aa1e48a71df78fed20ac4105a2bd97ff04addf7': DO NOT MERGE. Prevent recents from coming up when in SUW
| | | * Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-devMichael Wright2015-11-171-1/+1
| | | |\
| | | | * DO NOT MERGE. Prevent recents from coming up when in SUWMichael Wright2015-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 25229538 Change-Id: Ib19f368e9ef383ba5e60ea0b88193178d5769469
* | | | | Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-devBryce Lee2015-11-172-0/+44
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | am: cb8749c903 * commit 'cb8749c903d29fd04944550b5f34cc6120b69232': Add Bluetooth headset API to allow disabling audio route.
| * | | | Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-devBryce Lee2015-11-172-0/+44
| |\ \ \ \
| | * | | | Add Bluetooth headset API to allow disabling audio route.Bryce Lee2015-11-162-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This functionality is required by devices which have multiple profiles using the SCO channel. For example, a device that is both a HFP AG and HF. In this case, we must explicitly notify the profiles when they can acquire the channel as they are not aware of each other. A similar change was previously added to the Bluetooth Headset Client profile. Bug: 25485578 Change-Id: Ia60cfdd33c2c3c3f185464b24056f8ccb976056d
* | | | | | Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into ↵Joe LaPenna2015-11-170-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cw-e-dev am: d083b37917 -s ours * commit 'd083b379174b6cdfdd40204f4d4f4207fa2f332e': Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
| * | | | | Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into ↵Joe LaPenna2015-11-172-4/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | cw-e-dev
| | * | | | | Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"Joe LaPenna2015-11-172-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 88c7c3e08051f4a2be8ee5194214678a07ff7f01. Change-Id: I2c6d7d1d076bee0dc905d0986ced55e49481af26 BUG: 23753686
* | | | | | | Merge "Don\'t allow contact sharing by default for device not recognized as ↵Sanket Padawe2015-11-170-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 * commit '63e6aa8571386dcf33ff0cf3949bdaf6c8e350db': Don't allow contact sharing by default for device not recognized as carkit.
| * | | | | | Merge "Don\'t allow contact sharing by default for device not recognized as ↵Sanket Padawe2015-11-170-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae * commit 'ccfcb636ae0c99b974f3cbe3177322c41e33bb15': Don't allow contact sharing by default for device not recognized as carkit.
| | * | | | | Merge "Don\'t allow contact sharing by default for device not recognized as ↵Sanket Padawe2015-11-170-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | carkit." into mnc-dev am: abea6dc466 * commit 'abea6dc466cbd01be261192f8dbc083b58661bad': Don't allow contact sharing by default for device not recognized as carkit.
| | | * | | | Merge "Don't allow contact sharing by default for device not recognized as ↵Sanket Padawe2015-11-171-1/+6
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | carkit." into mnc-dev
| | | | * | | | Don't allow contact sharing by default for device not recognized as carkit.Sanket Padawe2015-11-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Don't allow contact sharing by default for devices not recognized as carkit at pair time. Bug: 23607427 Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a (cherry picked from commit 07533dbffff5551ad4c58852b5856f57d7da6801)
* | | | | | | | Merge "WindowDecorActionBar name change fix." into mnc-ub-devDeepanshu Gupta2015-11-171-3/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | WindowDecorActionBar name change fix.Deepanshu Gupta2015-11-161-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change id I7582e242c7564c32feeb044fc9eff6bfb5c56536, WindowDecorActionBar's package name was changed. This breaks layoutlib. Fix the issue by checking both package names when loading the class. Change-Id: I5723a97f0f164d61c56061fef6cff18e3cdafaee
* | | | | | | | | DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.Michael Kwan2015-11-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8d6630b87c -s ours * commit '8d6630b87c93f569bbf5fc5b426fe2a1c2ff2ceb': DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
| * | | | | | | | DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.Michael Kwan2015-11-161-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android currently forces USB into MTP mode if there was no modes specified. This causes issues on Clockwork devices as they do not support MTP. The hack stops this behaviour, and also sets MTP mode back to none. Bug: 25547826 Bug: 25582050 Bug: 25244201 Change-Id: I772e35d0a5db51b17e9d71c59e6a157dabb1d296
* | | | | | | | | Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759Eino-Ville Talvala2015-11-161-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 062c629e5c * commit '062c629e5c6270da232bbd2800966ab5dc6c615f': Camera: Minor documentation update
| * | | | | | | | Camera: Minor documentation update am: 0b6e1bfae8Eino-Ville Talvala2015-11-161-2/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0691d16759 * commit '0691d16759bf58a93209d4ab156e96f96fed7092': Camera: Minor documentation update
| | * | | | | | | Camera: Minor documentation updateEino-Ville Talvala2015-11-161-2/+2
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0b6e1bfae8 * commit '0b6e1bfae848b7b177bba9c8119ad44cdc05684a': Camera: Minor documentation update
| | | * | | | | | Camera: Minor documentation updateEino-Ville Talvala2015-11-131-2/+2
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Further clarify hardware.camera feature being only for the back camera Bug: 24540625 Change-Id: I7a698740475aa4932648c8f62aab81d5f9341030
* | | | | | | | Log errno when dup fd cannot be allocated BUG: 25165471Erik Wolsheimer2015-11-161-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 211abad3b9 * commit '211abad3b92b70dd094949c79f67e686c940fa0c': Log errno when dup fd cannot be allocated BUG: 25165471
| * | | | | | | Log errno when dup fd cannot be allocatedErik Wolsheimer2015-11-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 25165471 Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
* | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-160-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | am: 83d65fea01 -s ours * commit '83d65fea01c4233c80161acdd69b64fa559c3749': Import translations. DO NOT MERGE
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia050e5148fdf971a3beb18147fd6350fc0984e04 Auto-generated-cl: translation import
* | | | | | | Merge "DO NOT MERGE Ensure that the device is provisioned before showing ↵Winson Chung2015-11-130-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 am: 28fc76ecef * commit '28fc76ecef04061bfdbad2f5dc52bc1d5daf0e0d': DO NOT MERGE Ensure that the device is provisioned before showing Recents.
| * | | | | | Merge "DO NOT MERGE Ensure that the device is provisioned before showing ↵Winson Chung2015-11-130-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 * commit 'ef15ca85d7f847884e391e3283daabb019e44e10': DO NOT MERGE Ensure that the device is provisioned before showing Recents.
| | * | | | | Merge "DO NOT MERGE Ensure that the device is provisioned before showing ↵Winson Chung2015-11-130-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec * commit 'd45a18c8eca074f8c83a64ed465021a61becb49a': DO NOT MERGE Ensure that the device is provisioned before showing Recents.
| | | * | | | Merge "DO NOT MERGE Ensure that the device is provisioned before showing ↵Winson Chung2015-11-130-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours * commit '32265b9ea000b04ac62f3c114edb063246260401': DO NOT MERGE Ensure that the device is provisioned before showing Recents.
| | | | * \ \ \ Merge "DO NOT MERGE Ensure that the device is provisioned before showing ↵Winson Chung2015-11-131-0/+45
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 * commit 'b133b984a0644a78270d51007123e75ded24eb14': DO NOT MERGE Ensure that the device is provisioned before showing Recents.
| | | | | * \ \ \ Merge "DO NOT MERGE Ensure that the device is provisioned before showing ↵Winson Chung2015-11-131-0/+45
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents." into lmp-mr1-dev am: bb4da4efc3 * commit 'bb4da4efc320caee77f11bb316145b8e5f264e07': DO NOT MERGE Ensure that the device is provisioned before showing Recents.
| | | | | | * \ \ \ Merge "DO NOT MERGE Ensure that the device is provisioned before showing ↵Winson Chung2015-11-131-0/+45
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents." into lmp-mr1-dev
| | | | | | | * | | | DO NOT MERGE Ensure that the device is provisioned before showing Recents.Winson2015-11-111-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 25476219 Change-Id: I5bb9cca74790521de71c0037b4f2421c3d21b3f6
* | | | | | | | | | | Merge "DO NOT MERGE Ensure that the device is provisioned before showing ↵Winson Chung2015-11-131-0/+45
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 am: 1b29fd87a2 * commit '1b29fd87a26d6230c55c701d1411b34342614af0': DO NOT MERGE Ensure that the device is provisioned before showing Recents.
| * | | | | | | | | | Merge "DO NOT MERGE Ensure that the device is provisioned before showing ↵Winson Chung2015-11-131-0/+45
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 * commit '3e9f2b789414f34b5530107c362295c5a637bac1': DO NOT MERGE Ensure that the device is provisioned before showing Recents.
| | * | | | | | | | | Merge "DO NOT MERGE Ensure that the device is provisioned before showing ↵Winson Chung2015-11-131-0/+45
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents." into mnc-dev am: dce0f8040d * commit 'dce0f8040dcce494166832eb6c1e8a2d9638ddd4': DO NOT MERGE Ensure that the device is provisioned before showing Recents.
| | | * | | | | | | | Merge "DO NOT MERGE Ensure that the device is provisioned before showing ↵Winson Chung2015-11-131-0/+45
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents." into mnc-dev
| | | | * | | | | | | | DO NOT MERGE Ensure that the device is provisioned before showing Recents.Winson2015-11-111-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 25476219 Change-Id: Ibbe621748f7275f8c1ccded84612ca16292559eb
* | | | | | | | | | | | Merge "Initialize DisplayContent base info when object is constructed" into ↵Filip Gruszczynski2015-11-132-16/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cw-e-dev am: fe482e0bca * commit 'fe482e0bcabb98d983ecb4080b35490b9814c809': Initialize DisplayContent base info when object is constructed
| * | | | | | | | | | | Merge "Initialize DisplayContent base info when object is constructed" into ↵Filip Gruszczynski2015-11-132-16/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cw-e-dev
| | * | | | | | | | | | | Initialize DisplayContent base info when object is constructedWale Ogunwale2015-11-122-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible for an external process (e.g. sys-ui) to call into WM to get the bounds of a stack in between the construction of the DisplayContent object and SystemServer telling WM that the display is ready. Incorrect bounds would be returned to the caller in this case since the baseDisplayWidth/Height is only set when the displayReady call is made. We now initialize the base display information when the DisplayContent object is created so any call to get the logical display rect of the display will always return the right bounds. This should be okay as the display manager is initialized way before window manager. Bug: 22961090 Change-Id: Iebd688ad8f4c08556846fcebb543e58bd2c01414
* | | | | | | | | | | | | Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 ↵Shreyas Basarge2015-11-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 am: d80d24f5b1 * commit 'd80d24f5b13c16ce19369b1debb9137516f59e3f': Sync extras bundle comparison can throw NPE
| * | | | | | | | | | | | Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 ↵Shreyas Basarge2015-11-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 * commit 'c4a9c319e594fcc4b6772b6f61d0788e108fcb2c': Sync extras bundle comparison can throw NPE
| | * | | | | | | | | | Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 ↵Shreyas Basarge2015-11-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 * commit 'c9eb8b436715ba9b59382759cf0dcf991ed33594': Sync extras bundle comparison can throw NPE
| | | * | | | | | | | | Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 ↵Shreyas Basarge2015-11-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b * commit '64bdb9f06b7fc3e497088243a966dec95d1936e1': Sync extras bundle comparison can throw NPE
| | | | * | | | | | | | Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 ↵Shreyas Basarge2015-11-130-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d * commit '359ee7f47de2eee82951abed294e4db44405973c': Sync extras bundle comparison can throw NPE