OSDN Git Service
Mitchell Wills [Wed, 4 Nov 2015 00:58:16 +0000 (00:58 +0000)]
Merge "Don't cache ScanResults in WifiTracker if there is no SSID"
Rob Carr [Wed, 4 Nov 2015 00:51:26 +0000 (00:51 +0000)]
Merge "Deliver exceptions to sources of PALs."
Daniel Koulomzin [Wed, 4 Nov 2015 00:36:11 +0000 (00:36 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE am:
7e19e286cc -s ours am:
6e0a83bcd9 am:
d90c2da23c
am:
6393887063 -s ours
* commit '
6393887063aabecd1eaefc95db09087bc142658d':
ActivityView gets its own thread pool. DO NOT MERGE
Adam Lesinski [Wed, 4 Nov 2015 00:17:30 +0000 (00:17 +0000)]
Merge "AAPT2: Add round qualifer support"
Adam Lesinski [Wed, 4 Nov 2015 00:17:08 +0000 (00:17 +0000)]
Merge "AAPT2: Verify positional Java String format arguments in strings"
Adam Lesinski [Wed, 4 Nov 2015 00:16:17 +0000 (16:16 -0800)]
AAPT2: Add round qualifer support
Change-Id: Id5a1331198e01be7ca4d87b8833900e51f82ece5
Daniel Koulomzin [Wed, 4 Nov 2015 00:11:13 +0000 (00:11 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE am:
7e19e286cc -s ours am:
6e0a83bcd9
am:
d90c2da23c
* commit '
d90c2da23c8ad22819d400d4803ed63c7f856d63':
ActivityView gets its own thread pool. DO NOT MERGE
Daniel Koulomzin [Wed, 4 Nov 2015 00:02:32 +0000 (00:02 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE am:
7e19e286cc -s ours
am:
6e0a83bcd9
* commit '
6e0a83bcd97574451e83d58ac646af9daf3216be':
ActivityView gets its own thread pool. DO NOT MERGE
Daniel Koulomzin [Tue, 3 Nov 2015 23:51:39 +0000 (23:51 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE
am:
7e19e286cc -s ours
* commit '
7e19e286cc990daaafe934ed82ddfa00762907d6':
ActivityView gets its own thread pool. DO NOT MERGE
Bill Yi [Tue, 3 Nov 2015 23:46:38 +0000 (23:46 +0000)]
Wale Ogunwale [Tue, 3 Nov 2015 23:39:11 +0000 (23:39 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am:
7810aed854 am:
d89b76a58d
am:
8401a8d0c5
* commit '
8401a8d0c5bad075a7d46a68a30cd9af4c0d4413':
[ActivityManager] Fix NullPointerException in startNextMatchingActivity.
Glenn Kasten [Tue, 3 Nov 2015 23:37:48 +0000 (23:37 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik" am:
6079b990f1 am:
613c63c742
am:
a10d826b1b
* commit '
a10d826b1bfcd3b919193e85476df0336d03c622':
BluetoothMidiDevice: change write type to support JamStik
Glenn Kasten [Tue, 3 Nov 2015 23:36:27 +0000 (23:36 +0000)]
Merge "BLE-MIDI: change binding for BluetoothMidiService" am:
5831944a6e am:
bd32753700
am:
ff4e4425b7
* commit '
ff4e4425b7e032feba1afc81ddeec7ad17e8a7ea':
BLE-MIDI: change binding for BluetoothMidiService
Ian Pedowitz [Tue, 3 Nov 2015 23:34:54 +0000 (23:34 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am:
966d6040c6 am:
95fc53b029 am:
d6f3e38738
am:
87455c7397
* commit '
87455c7397605fba4bf3ad04af8df3c599a7a6ba':
Limit persistent ashmem backed fds to a minimum of 128kB.
Bill Yi [Tue, 3 Nov 2015 23:33:07 +0000 (23:33 +0000)]
Wale Ogunwale [Tue, 3 Nov 2015 23:29:47 +0000 (23:29 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am:
7810aed854
am:
d89b76a58d
* commit '
d89b76a58dcffa7dbc5974d14c7914f44233bef3':
[ActivityManager] Fix NullPointerException in startNextMatchingActivity.
Glenn Kasten [Tue, 3 Nov 2015 23:28:10 +0000 (23:28 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik" am:
6079b990f1
am:
613c63c742
* commit '
613c63c742f1609297156fffe6169ee17db895f4':
BluetoothMidiDevice: change write type to support JamStik
Glenn Kasten [Tue, 3 Nov 2015 23:26:41 +0000 (23:26 +0000)]
Merge "BLE-MIDI: change binding for BluetoothMidiService" am:
5831944a6e
am:
bd32753700
* commit '
bd3275370000d657ea86e3a42f1bd76343b2e6a5':
BLE-MIDI: change binding for BluetoothMidiService
Winson Chung [Tue, 3 Nov 2015 23:16:03 +0000 (23:16 +0000)]
Merge "Updating freeform layout to be static at the top of recents."
Glenn Kasten [Tue, 3 Nov 2015 23:08:12 +0000 (15:08 -0800)]
Merge commit '
ca2daddfea' into temp
Change-Id: I4efdb25d63be2c805059b1035cfccae2885a96fd
Daniel Koulomzin [Thu, 24 Sep 2015 18:38:17 +0000 (14:38 -0400)]
ActivityView gets its own thread pool. DO NOT MERGE
Bug:
24316798
Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
Steve McKay [Tue, 3 Nov 2015 22:52:09 +0000 (22:52 +0000)]
Merge "Show only selection count in ActionBar."
Steve McKay [Tue, 3 Nov 2015 22:50:05 +0000 (22:50 +0000)]
Merge "Don't show advanced menu in downloads ui."
Jeff Sharkey [Tue, 3 Nov 2015 22:48:08 +0000 (22:48 +0000)]
Merge "Yell when calling installd with PM lock held."
Steve McKay [Tue, 3 Nov 2015 19:56:44 +0000 (11:56 -0800)]
Don't show advanced menu in downloads ui.
Also, don't show search, and file size....and maybe others.
Bug:
25383741
Change-Id: I4bc867254b89011786fdf087b371974ee80d09da
Jeff Sharkey [Tue, 3 Nov 2015 20:33:54 +0000 (12:33 -0800)]
Yell when calling installd with PM lock held.
As a matter of policy, we should never be holding the mPackages lock
while calling down into installd. This little bit of logic helps us
catch accidental cases where this happens.
Change-Id: I676c81df43ef936ffd36290d45a79429630c1b4b
Steve McKay [Tue, 3 Nov 2015 22:42:20 +0000 (22:42 +0000)]
Merge "Handle SpacerItem on click correctly."
Bill Yi [Tue, 3 Nov 2015 22:29:59 +0000 (14:29 -0800)]
Ching Tzung Lin [Tue, 3 Nov 2015 22:28:49 +0000 (22:28 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am:
7f54aa1e81 am:
9c7f6a409b
am:
7078a44687
* commit '
7078a446874bdb2a51b9eae8b41f9d1ec0bce86a':
Remove circular_display_mask_offset symbol and default
Nicolas Capens [Tue, 3 Nov 2015 22:26:21 +0000 (22:26 +0000)]
Merge "Assume OpenGL ES 2.0 support for qemu.gles > 0"
Ian Pedowitz [Tue, 3 Nov 2015 22:21:48 +0000 (22:21 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am:
966d6040c6 am:
95fc53b029
am:
d6f3e38738
* commit '
d6f3e38738c88821b28b2571d034fc1b189a35de':
Limit persistent ashmem backed fds to a minimum of 128kB.
Nicolas Capens [Tue, 3 Nov 2015 22:18:35 +0000 (17:18 -0500)]
Assume OpenGL ES 2.0 support for qemu.gles > 0
Bug
25435727
Change-Id: I1d11c2f03849f1244bdd83e47aa53776acfba6fd
Winson [Tue, 3 Nov 2015 01:17:20 +0000 (17:17 -0800)]
Updating freeform layout to be static at the top of recents.
Change-Id: I5118d03c115080e05447d325097419b9a1c6f8b4
Chet Haase [Tue, 3 Nov 2015 22:16:14 +0000 (22:16 +0000)]
Merge "Un-hide FloatProperty and IntProperty"
Ian Pedowitz [Tue, 3 Nov 2015 22:13:54 +0000 (22:13 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am:
966d6040c6
am:
95fc53b029
* commit '
95fc53b0293a6361c7ff8a412897a869f07664c6':
Limit persistent ashmem backed fds to a minimum of 128kB.
Ian Pedowitz [Tue, 3 Nov 2015 22:05:23 +0000 (22:05 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
am:
966d6040c6
* commit '
966d6040c6b171c75e9fb0ca942e84f9cf4d0dff':
Limit persistent ashmem backed fds to a minimum of 128kB.
Steve McKay [Tue, 3 Nov 2015 22:00:45 +0000 (14:00 -0800)]
Handle SpacerItem on click correctly.
Bug:
13319202
Change-Id: I22f556f512f55cc09eead462a4eb8cea99dc5e64
Ian Pedowitz [Tue, 3 Nov 2015 21:58:30 +0000 (21:58 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
Dianne Hackborn [Tue, 3 Nov 2015 21:51:07 +0000 (21:51 +0000)]
Merge "resolve merge conflicts of
3aee38c86e to "
Alan Viverette [Tue, 3 Nov 2015 21:43:46 +0000 (21:43 +0000)]
Merge "If LayerDrawable child doesn't have constant state, use shallow copy"
Chet Haase [Fri, 30 Oct 2015 14:10:04 +0000 (14:10 +0000)]
Un-hide FloatProperty and IntProperty
These simple utility classes (used internally since Property was first introduced
way back in Jellybean) are the best way to avoid autoboxing when using the Property
approach to ObjectAnimator. But since their hidden, developers have to use the
autoboxing version (Property, the superclass) or know to come up with their own
primitive-optimized property subclasses.
This CL simply un-hides these two classes to make them usable outside of the framework.
Issue #
21722783 Make [Int|Float]Property public
Change-Id: I7f3a456d108bf48587d711255d3577cce3ac5e24
Steve McKay [Tue, 3 Nov 2015 21:34:14 +0000 (21:34 +0000)]
Merge "Use StubProvider for functional tests."
Steve McKay [Tue, 27 Oct 2015 00:03:55 +0000 (17:03 -0700)]
Use StubProvider for functional tests.
Add a "UiBot" class for driving the UI from tests.
Add a "DocumentsProviderHelper" class for convenient test doc setup.
Update FilesActivityUiTest to use "TargetContext" which is
necessary in order to perform ContentProvider
operations.
Fix a bug where CopyTest relied on implicit order of roots.
Don't include guava in tests...since it breaks functional tests (incompatible class def).
Add test coverage for:
- basic roots list.
- basic files list.
- Live updates to files list.
- basic delete operations.
Bug:
24988170
Change-Id: I2ec01a5e1a474314cb33efb6e92df0f61dfcc1da
NOTE: This is currently broken at the point I try to init files in the stub roots.
Adam Lesinski [Tue, 3 Nov 2015 21:02:36 +0000 (21:02 +0000)]
Merge "AAPT2: Add Manifest fixing/validation"
Adam Lesinski [Tue, 3 Nov 2015 21:01:41 +0000 (21:01 +0000)]
Merge "AAPT2: Add support for comments in R.java"
Glenn Kasten [Tue, 3 Nov 2015 20:59:07 +0000 (12:59 -0800)]
Merge commit '
d8a8500429' into new
Change-Id: I13e6c1d3a63e298ddebcc83a229fa497dd5eb129
Adam Lesinski [Tue, 3 Nov 2015 20:24:17 +0000 (12:24 -0800)]
AAPT2: Verify positional Java String format arguments in strings
Change-Id: Id415969035a0d5712857c0e11e140155566a960c
Dianne Hackborn [Tue, 3 Nov 2015 20:47:12 +0000 (12:47 -0800)]
resolve merge conflicts of
3aee38c86e to master.
Change-Id: I9ff3f92b37e24f5f0527a0034b159920f6d7ffe1
John Reck [Tue, 3 Nov 2015 20:40:42 +0000 (20:40 +0000)]
Merge "Revert "Check GLES2 support using EGL instead of qemu.gles""
John Reck [Tue, 3 Nov 2015 20:39:51 +0000 (20:39 +0000)]
Revert "Check GLES2 support using EGL instead of qemu.gles"
This reverts commit
0f897d2fea84c1632377b84f6241d54a8d85f7a3.
Change-Id: Iaf5b22b6b1a5bdb16dd0aaf674d90c09d1bc24a7
Alan Viverette [Tue, 3 Nov 2015 20:39:15 +0000 (15:39 -0500)]
If LayerDrawable child doesn't have constant state, use shallow copy
Avoid NPE if mutate() is called on a LayerDrawable with a child that
doesn't support constant state.
Bug:
25438651
Change-Id: I6bf5a90484fda44a7b5fd10ce7b798eaa799b68e
Fyodor Kupolov [Tue, 3 Nov 2015 20:23:24 +0000 (20:23 +0000)]
Merge "UserController refactoring"
Fyodor Kupolov [Tue, 3 Nov 2015 20:06:25 +0000 (20:06 +0000)]
Merge "Introduced short-term lock for UMS internal state"
Ben Kwa [Tue, 3 Nov 2015 20:00:40 +0000 (20:00 +0000)]
Merge "Fix focus issues on animated items."
Ben Kwa [Tue, 20 Oct 2015 22:02:33 +0000 (15:02 -0700)]
Fix focus issues on animated items.
Implement a custom ItemAnimator to enable focus to persist across change
animations in the DirectoryFragment's RecyclerView.
Note that this is a temporary stop-gap - a better fix would be to have
the RecyclerView restore focus to the appropriate item after a change
animation.
BUG=
24802917
Change-Id: I4e4e6f758a2ea87e6235533860863c822d71a27a
Fyodor Kupolov [Wed, 28 Oct 2015 21:54:51 +0000 (14:54 -0700)]
Introduced short-term lock for UMS internal state
Added mUsersLock - short-term lock for internal state, when interaction and
synchronization with PM is not required. Modifications to mUsers and
mRemovingUserIds must be guarded by 3 locks: mInstallLock, mPackagesLock and
mUsersLock. While reads can use mUsersLock.
Testing revealed that the following methods in UMS often cause contention:
- exists
- getUserInfo
- getProfileParent
They all now use a short-term lock mUsersLock for reads.
Bug:
24979571
Change-Id: Ie3a22ea7cbb450c7969800fe2a4a2b2516165e5b
Tenghui Zhu [Tue, 3 Nov 2015 19:55:52 +0000 (19:55 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev am:
61c93eb16d am:
a66dc6e159
am:
a32f221db0
* commit '
a32f221db0361c9047fd61373fbf815c37d958f8':
Use clang for libhwui
Jeff Sharkey [Tue, 3 Nov 2015 19:50:54 +0000 (19:50 +0000)]
Merge "Yell if NDC callers are holding bad locks."
Tenghui Zhu [Tue, 3 Nov 2015 19:49:20 +0000 (19:49 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev am:
61c93eb16d
am:
a66dc6e159
* commit '
a66dc6e159bd8f4997a9253d5590807c02358d84':
Use clang for libhwui
Ching Tzung Lin [Tue, 3 Nov 2015 19:43:02 +0000 (19:43 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am:
7f54aa1e81
am:
9c7f6a409b
* commit '
9c7f6a409b516328378aa9b882de16c4700c76c4':
Remove circular_display_mask_offset symbol and default
Dianne Hackborn [Tue, 3 Nov 2015 19:40:43 +0000 (19:40 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am:
71e4984505 am:
9a13cc6992
am:
a09ac2d998
* commit '
a09ac2d998fdc901fb65b57a061cc445922e081f':
Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot
Tenghui Zhu [Tue, 3 Nov 2015 19:40:29 +0000 (19:40 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev
am:
61c93eb16d
* commit '
61c93eb16d91bd210948af6e812517e3c03535b4':
Use clang for libhwui
Fyodor Kupolov [Wed, 28 Oct 2015 01:08:56 +0000 (18:08 -0700)]
UserController refactoring
Addressed comments from the previous cl. Added getters for UserController
fields, direct access is no longer allowed. Moved the following methods:
- getUserManagerLocked. Became getUserManager() - because locking is not
necessary, double checked locking will suffice.
- startUserInForeground /showUserSwitchDialog/sendUserSwitchBroadcastsLocked
- handleIncomingUser/unsafeConvertIncomingUserLocked/isUserRunningLocked/
getUsers/getProfileIds
Bug:
24745840
Change-Id: Id5a5cfb9604e08add29bd9a03c8fe5200bc51fef
Tenghui Zhu [Tue, 3 Nov 2015 19:25:43 +0000 (19:25 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev
Ching Tzung Lin [Tue, 3 Nov 2015 19:03:48 +0000 (19:03 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
am:
7f54aa1e81
* commit '
7f54aa1e814527371d54864bcbf9387553822ea7':
Remove circular_display_mask_offset symbol and default
Jeff Sharkey [Tue, 3 Nov 2015 18:39:42 +0000 (10:39 -0800)]
Yell if NDC callers are holding bad locks.
The current MountService design heavily depends on down-callers not
holding any locks, since the vast majority of events are unsolicited
and bubble up to the framework.
This simple API gives us an easy way to track down people calling
while holding a lock they shouldn't be.
Bug:
25443096
Change-Id: Ifcbda95f00d5be8c1b88d58ca67927e76c713c3e
Ching Tzung Lin [Tue, 3 Nov 2015 18:39:40 +0000 (18:39 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
Chad Brubaker [Tue, 3 Nov 2015 18:38:37 +0000 (18:38 +0000)]
Merge "Add stub isSameTrustConfiguration API"
Chris Craik [Tue, 3 Nov 2015 18:33:34 +0000 (10:33 -0800)]
Use clang for libhwui
bug:
25417885
Change-Id: I0ef8034d79ba3682925e3c2a4b7ccd833fd4f156
Dianne Hackborn [Tue, 3 Nov 2015 18:33:57 +0000 (18:33 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am:
71e4984505
am:
9a13cc6992
* commit '
9a13cc69926c90fe75b624a9a781dc56706a6091':
Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot
Dianne Hackborn [Tue, 3 Nov 2015 18:27:18 +0000 (18:27 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
am:
71e4984505
* commit '
71e49845054a3a7dacc51efc4fe658818caec048':
Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot
Dianne Hackborn [Tue, 3 Nov 2015 18:21:23 +0000 (18:21 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
Jeff Sharkey [Tue, 3 Nov 2015 18:19:24 +0000 (18:19 +0000)]
Merge "Fix deadlock when calling down to vold."
John Reck [Tue, 3 Nov 2015 18:19:15 +0000 (18:19 +0000)]
Merge "Remove almost-all android::Singleton users"
Jeff Sharkey [Tue, 3 Nov 2015 18:15:57 +0000 (10:15 -0800)]
Fix deadlock when calling down to vold.
Gotta put down the lock before you can play the saxophone.
Bug:
25443096
Change-Id: I008c3a8530a2181aad20985e157c6f63208444ee
John Reck [Tue, 3 Nov 2015 18:09:59 +0000 (10:09 -0800)]
Remove almost-all android::Singleton users
Bug:
25426213
Change-Id: I88e6206e8915cce95c3a8a8a82a4bb8fbf668141
Felipe Leme [Tue, 3 Nov 2015 18:02:48 +0000 (18:02 +0000)]
Merge "Added serial number in the bugreport message body."
Gustav Sennton [Tue, 3 Nov 2015 17:50:07 +0000 (17:50 +0000)]
Merge "Load WebView from one out of a list of packages, reland."
Riley Andrews [Mon, 2 Nov 2015 07:36:04 +0000 (23:36 -0800)]
Limit persistent ashmem backed fds to a minimum of 128kB.
Bug
25256717
Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com>
Chris Craik [Tue, 3 Nov 2015 17:26:34 +0000 (17:26 +0000)]
Merge "Add unit test failure messages to recordingcanvas/reorderer"
Nicolas Capens [Tue, 3 Nov 2015 17:23:19 +0000 (17:23 +0000)]
Merge "Check GLES2 support using EGL instead of qemu.gles"
Felipe Leme [Fri, 30 Oct 2015 18:59:40 +0000 (11:59 -0700)]
Added serial number in the bugreport message body.
Also labeled information contained in the body (i.e., Build Info: and Serial Number:).
BUG:
21454488
Change-Id: I5f2a62147ca3e1989aebfbd465f3e42b96b655df
Winson Chung [Tue, 3 Nov 2015 16:45:07 +0000 (16:45 +0000)]
Merge "Adding recents experiment override."
Abodunrinwa Toki [Tue, 3 Nov 2015 16:06:38 +0000 (16:06 +0000)]
Merge "Fix failing TextActivityTest."
Wale Ogunwale [Tue, 3 Nov 2015 15:13:24 +0000 (15:13 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."
am:
7810aed854
* commit '
7810aed85408bddc4cc0c65e5be8d082c638d995':
[ActivityManager] Fix NullPointerException in startNextMatchingActivity.
Wale Ogunwale [Tue, 3 Nov 2015 15:09:32 +0000 (15:09 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."
Abodunrinwa Toki [Tue, 3 Nov 2015 14:08:03 +0000 (14:08 +0000)]
Fix failing TextActivityTest.
It seems like setOrientation(...) is not working.
Instead, fix the orientation of TextViewActivity to portrait.
See: I2f9372997f8301d800109981c6e1a6d4419b641d
Bug:
24495166
Change-Id: I0c5480b7ce6ba1fb8e4e4e3daabe94ebccca4dfd
Thierry Strudel [Tue, 3 Nov 2015 06:57:24 +0000 (06:57 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am:
1942be506e am:
b1fe11fde4 am:
6efac0595f
am:
271dd1da81
* commit '
271dd1da81735a3cb0856db0dbb8634a6c4cc831':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Tue, 3 Nov 2015 06:51:38 +0000 (06:51 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am:
1942be506e am:
b1fe11fde4
am:
6efac0595f
* commit '
6efac0595f4da7f8009aa5da26a5ca024bbb0e4f':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Tue, 3 Nov 2015 06:45:12 +0000 (06:45 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am:
1942be506e
am:
b1fe11fde4
* commit '
b1fe11fde44b4ac56c48f91cd27ced7ac4b0469f':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Brian Carlstrom [Tue, 3 Nov 2015 06:38:38 +0000 (22:38 -0800)]
Fix layoutlib-tests build by adding dummy implementation of IWindowSession.repositionChild to BridgeWindowSession
Change-Id: I9c3a609c76716b35595b82a33f32883d4f46c517
Thierry Strudel [Tue, 3 Nov 2015 06:39:58 +0000 (06:39 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
am:
1942be506e
* commit '
1942be506eb16589e3059fa62ea7b718440fb386':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Tue, 3 Nov 2015 06:35:59 +0000 (06:35 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
Nicolas Capens [Tue, 3 Nov 2015 05:28:59 +0000 (00:28 -0500)]
Check GLES2 support using EGL instead of qemu.gles
Bug
25435727
Change-Id: I9b8816cc8bfc2567ac475888cd57f2b9e62dad4f
Tyler Gunn [Tue, 3 Nov 2015 05:04:36 +0000 (05:04 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am:
8b86c76296 am:
48a0c3ae8d am:
e0eaa03307
am:
6ebf6a27a7
* commit '
6ebf6a27a772f3a21b575aaa88df46f773934214':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:59:44 +0000 (04:59 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am:
8b86c76296 am:
48a0c3ae8d
am:
e0eaa03307
* commit '
e0eaa03307f2327080becffab3245e33d674a1fe':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:54:47 +0000 (04:54 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am:
8b86c76296
am:
48a0c3ae8d
* commit '
48a0c3ae8dd0d3944a3cffa2bafec47f9bc346d6':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:49:33 +0000 (04:49 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
am:
8b86c76296
* commit '
8b86c7629676eeea490531b2a412873e0196eb6f':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:44:53 +0000 (04:44 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
Jeff Sharkey [Tue, 3 Nov 2015 03:52:11 +0000 (03:52 +0000)]
Merge "Let's sprinkle some FastJNI into Resources."