* commit '07b9b3ad3b4d942b4ed920cfa8f68bce71686972':
Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
* commit '93e5dc65811b146612d383cec502b6ba04a0e3d5':
Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later.
* commit 'b45b39a2630e58d2c546d971cc0ff8f903057329':
Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
* commit 'cdf3455c502891683eaa242a14e413ff947dabe3':
Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
* commit '6dd38cc5343106251c8d66ab11bb93550082e594':
Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
Submitted the original revert too soon.
This reverts commit ebcee19783c4fe5ba776353e95974383850a4685.
Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4
* commit 'fefff422556b6ce552431f368182c4833bcd201a':
Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later.
* commit '7466b998e6091b4857372611c66b6eca2b9324fb':
Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later.
* commit 'ebcee19783c4fe5ba776353e95974383850a4685':
Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later.
revert to fix conflicts, i'll fix it all later.
This reverts commit 385bb2eb5184686c2d953fe4757522e61acb3392.
Change-Id: Ie0a995b185c3354ff369fce87f73810c1027a0b2
for safer refcounting. Previously jclass objects were not DeleteLocalRef'ed
at all, leading us to exhaust the local ref pool quickly in certain
circumstances.
This change also makes sure we properly serialize int64_t entries when
converting from AMessage to HashMap and boosts thread priority for
java-instantiated MediaCodecs slightly from NORMAL to FOREGROUND.
Change-Id: I4ebdd8a5ca6b3442698c9f86fcc31af8c199aaf5
Cherry pick of master I210dbab01c8b8d1eeff316a23c5d011e2e6c2a74
This exposes the super_onDrawVerticalScrollBar method which will
be called by the WebViewChromium implementation.
Change-Id: I3fe348633c163514e67b7712f1e9a086dee3d338
This reverts commit c05b5cf71bb9835c049135823895291adb53a537 as it's a
fix for 96ca46cf8726abbad46857a8af5eb83b2c04ec21 which has also been
reverted.
Conflicts:
core/java/android/content/SyncRequest.java
Change-Id: If09fd255b4fd2640cd89feb46b2ac35f53611643
This reverts commit 96ca46cf8726abbad46857a8af5eb83b2c04ec21 which broke building tests on master.
Change-Id: I7e712d03b42cd25e22c0a8e72cf4e4526cd412e1
Now that granted Uri permissions can be persisted across reboots,
offer APIs to discover them. Returns incoming or outgoing grants
matching the requested flags and mask. Add helper method to discover
"open" documents using this new API and filtering for non-documents.
Require that callers own at least of the filtering packages to avoid
exposing all grants. Switch internal grant tracking to use ArrayMap.
Change-Id: I0a755f221d0d160b411f8d3cfc48279b64345733
Provide developer APIs to discover application-specific paths on
secondary external storage devices. Covers files, cache, and OBB
directories. Apps will not have write access outside their package-
specific directories on secondary devices, so only primary storage is
exposed through Environment.
Creation of .nomedia files will be handled by FUSE daemon in future
change.
Change-Id: Ifcce6201a686d80269d7285adb597c008cf8fa7c
