John Reck
65182ccffc
Fix tests
...
Disable FrameBuilder.clippedMerging as it relies on
merged bitmap ops which was disabled in b/26793764
Fix Buffer to correctly initialize mRefs count
Change-Id: I87d2fcc690a2ae14eaf751f650f522be5b622edf
2016-01-26 10:50:10 -08:00
John Reck
14de0415bb
Temporarily workaround merged bitmap bug
...
Bug: 26569206
Merged bitmap ops are buggy, just turn them off for
now to unblock testing
Change-Id: Ic0151bb3f23b1843107806659a64b26fd6d6e19e
2016-01-26 09:01:30 -08:00
John Reck
c52ac0b9e2
Merge "Add fine-grained debug layer"
2016-01-26 15:21:07 +00:00
Jason Monk
37e65a409f
Merge "Only show settings drawer on top level items"
2016-01-26 14:46:02 +00:00
Sudheer Shanka
1b92aefaae
Merge "Add support for adding preference summary when disabled by admin."
2016-01-26 14:42:04 +00:00
Sudheer Shanka
2d4e09750d
Merge "Check for null condition in case there is no DPM support."
2016-01-26 14:29:29 +00:00
Sudheer Shanka
c61087106e
Check for null condition in case there is no DPM support.
...
Change-Id: Ie7c70737d0c36ae9efd1920498d9f07b8a7016b1
2016-01-26 14:00:16 +00:00
Przemyslaw Szczepaniak
6cfdf6b67a
Merge "Fix incorrect @hide usage in libcore" am: 1f3aaf82cb
...
am: 04785955b5
2016-01-26 10:52:08 +00:00
Przemyslaw Szczepaniak
04785955b5
Merge "Fix incorrect @hide usage in libcore"
...
am: 1f3aaf82cb
2016-01-26 10:47:44 +00:00
Victor Chang
697815eddb
Merge "Launch managed quick contacts without contact id"
2016-01-26 10:37:55 +00:00
Przemyslaw Szczepaniak
1f3aaf82cb
Merge "Fix incorrect @hide usage in libcore"
2016-01-26 10:37:47 +00:00
Przemyslaw Szczepaniak
02027ff589
Fix incorrect @hide usage in libcore
...
@hide annotation is only effective in Javadoc.
Bug: 26689841
Change-Id: I6e924b7452423b25d7258bb174e5b1601302c907
(cherry picked from commit a0dda9ca9d
2016-01-26 10:35:22 +00:00
Narayan Kamath
d307a704f8
Revert "Update test-current.txt to fix build break."
...
This reverts commit 7123cbd737
2016-01-26 10:04:12 +00:00
Alan Treadway
44a1808154
Merge "Add explicit and persistent user provisioning state."
2016-01-26 09:59:40 +00:00
Benjamin Franz
6563025006
Merge "Add SmallTest annotation to DevicePolicyManagerTest"
2016-01-26 09:52:56 +00:00
Benjamin Franz
6d00903727
Add SmallTest annotation to DevicePolicyManagerTest
...
Adding this annotation makes sure that the tests get picked up by
continuous integration tests.
Change-Id: Ia9166898803dd0037f6bb20cb6a12333ed347fd3
2016-01-26 09:49:51 +00:00
Narayan Kamath
ac044909f5
Merge "Revert "Cellinfo: Update to version 12"" into mm-wireless-dev
...
am: c980eca638
2016-01-26 09:49:20 +00:00
Narayan Kamath
c980eca638
Merge "Revert "Cellinfo: Update to version 12"" into mm-wireless-dev
2016-01-26 09:46:14 +00:00
Narayan Kamath
d44d16f700
Revert "Cellinfo: Update to version 12"
...
This reverts commit aa2be45a56
2016-01-26 09:44:54 +00:00
Tomasz Mikolajewski
165e2849ff
Unhide DocumentsContract.copyDocument and moveDocument.
...
Change-Id: I304e4219ac679b9da88d785529f946dac058bbff
2016-01-26 08:06:46 +00:00
Tomasz Mikolajewski
5eb8f9cc70
Merge "Add support for multi-parents to DocumentsProvider::moveDocument."
2016-01-26 08:03:19 +00:00
Tomasz Mikolajewski
d46ecbcc53
Add support for multi-parents to DocumentsProvider::moveDocument.
...
Bug: 26481380
Change-Id: I96290268fd49072a334bde9c04c5313de8540f56
2016-01-26 17:02:22 +09:00
Daichi Hirono
a4d207cf64
Merge "Fix bugs that prevent from using AppFuse."
2016-01-26 07:51:49 +00:00
Daichi Hirono
b36b15586a
Fix bugs that prevent from using AppFuse.
...
* Allow buffer size that is greater than requested read size in JNI,
because we reuse fixed-size buffer among multiple requests.
* Fix condition to check if the file size is greater than 4GB or
not. We need to use 0xffffffffl instead of 0xffffffff because
0xffffffff is int and its value is -1.
BUG=None
Change-Id: I155916e139353b15dc1ab535234faf50d942996d
2016-01-26 16:30:08 +09:00
Adam Lesinski
a68cf3c4a7
Merge "AAPT2: Add -x and -z flags to minimize changes in build scripts"
2016-01-26 06:51:42 +00:00
Adam Lesinski
8900aa8b44
AAPT2: Add -x and -z flags to minimize changes in build scripts
...
The -z flag will be supported soon anyway and -x is legacy.
Change-Id: I710467d35066d267dea8dfe7c521737fc768ede9
2016-01-25 22:48:15 -08:00
Tomasz Mikolajewski
b7cf50cb95
Merge "Remove retry logic from DocumentsUI."
2016-01-26 04:52:59 +00:00
Tomasz Mikolajewski
ec7e7a9949
Merge "Enabled content validation in file ops tests."
2016-01-26 04:51:31 +00:00
Jae Seo
533b345682
TIF: Make TvInputService.onCreateRecordingSession a non-abstract method
...
Change-Id: I1ecf5d2f66825fa9e87fd743d9d293d8bd395fce
2016-01-25 20:34:12 -08:00
Jeremy Klein
15f3d21599
Implement ui-based provisioning for the new tether api.
...
This is dependent on ag/850648 and the Settings changes under the
uiprovisioning topic id.
BUG: 26247383
Change-Id: Ib151d56a1ece5ca3a55219abed965286eac5dd60
2016-01-25 20:02:48 -08:00
Jeremy Klein
0301cd9523
Merge "Expose a simple tethering API which includes provision checks."
2016-01-26 03:59:51 +00:00
Jorim Jaggi
50cd6361d7
Refine divider behavior
...
- Switch earlier to the dismissing/fullscreen layout, so
we minimize holes.
- For the bottom/right one, switch also earlier to the larger size to
minimize holes. We can't do this for the upper one because it will be
confusing there if the layout bounds doesn't equal the bounds while
snapping.
Change-Id: I8f065514f7aaa15ae76af648794ab8b23302e534
2016-01-26 03:19:15 +00:00
Wei Liu
8ab7759567
Add a null check before reference networkInfo. am: b8eaf45e1d am: dca8f10031 am: a12d383117
...
am: 21e0927b47
2016-01-26 03:16:28 +00:00
Ian Pedowitz
2260a61842
Fix build and reorder methods to match ec6a447c86
...
Change-Id: I39ee2864eda489bf0e485ea96d30e56b29500865
2016-01-25 19:09:42 -08:00
Wei Liu
21e0927b47
Add a null check before reference networkInfo. am: b8eaf45e1d am: dca8f10031
...
am: a12d383117
2016-01-26 03:06:09 +00:00
Steve McKay
2ed9f813b0
Enabled content validation in file ops tests.
...
Authority isn't set by default. Wrapped in RootCursorWrapper.
Bug: 26687509
Change-Id: Ie99dbd799914f03bf7beac540b64df67c1e637a6
2016-01-25 19:01:38 -08:00
Filip Gruszczynski
3236fef5d7
Merge "Fix build."
2016-01-26 02:30:51 +00:00
Filip Gruszczynski
0a66b6bc92
Fix build.
...
Change-Id: I68d6fade1b2a44a3542182914e0cd5853f4f0a81
2016-01-25 18:25:28 -08:00
Wei Liu
a12d383117
Add a null check before reference networkInfo. am: b8eaf45e1d
...
am: dca8f10031
2016-01-26 01:57:31 +00:00
Wei Liu
dca8f10031
Add a null check before reference networkInfo.
...
am: b8eaf45e1d
2016-01-26 01:52:12 +00:00
Vladislav Kaznacheev
767c118a64
Merge "Add xhdpi resources for large mouse pointers"
2016-01-26 01:51:38 +00:00
Keisuke Kuroyanagi
0837daa464
Merge "Make scroll bar mouse draggable."
2016-01-26 01:46:53 +00:00
Vladislav Kaznacheev
2cd0e8e070
Add xhdpi resources for large mouse pointers
...
Bug: 25778857
Change-Id: I4009bb63afd6269f93b2e06982106d2011228210
2016-01-25 17:41:59 -08:00
Jae Seo
9df90a5ab6
Merge "TIF: Recording API"
2016-01-26 01:39:05 +00:00
Stephen Hines
446438299a
Merge "Update test-current.txt to fix build break."
2016-01-26 01:29:13 +00:00
Miao Wang
a11c28589e
Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer" am: ed50f333fb
...
am: 5f210ae042
2016-01-26 01:27:30 +00:00
Keisuke Kuroyanagi
dfea1a3336
Merge "TextView: start drag and drop when dragging selection by mouse."
2016-01-26 01:26:06 +00:00
Keisuke Kuroyanagi
a2756f6018
Merge "TextView tests: drag and drop."
2016-01-26 01:26:06 +00:00
Stephen Hines
7123cbd737
Update test-current.txt to fix build break.
...
Change-Id: Ie61fae56ac22f1d028b0de3f8688f626eb2ddacc
2016-01-25 17:25:55 -08:00
Miao Wang
5f210ae042
Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer"
...
am: ed50f333fb
2016-01-26 01:21:51 +00:00
