OSDN Git Service
Clara Bayarri [Thu, 22 Oct 2015 15:09:52 +0000 (16:09 +0100)]
Intercept activity start with ConfirmCredentials
When the calling user is a work profile and the device has
file based encryption enabled, show the work challenge via the
Confirm Credentials APIs before launching the requested activity.
A companion CL in Settings will add support to the Confirm
Credentials flow to read the given intent extra and fire it when
the authorization succeeds.
This is part of the Separate Work Challenge feature.
Note nobody will see this yet as the feature is conditioned by
file based encryption.
Change-Id: I303890095936b1fd1f6a99d645724dffba144345
Clara Bayarri [Wed, 4 Nov 2015 16:35:51 +0000 (16:35 +0000)]
Merge "Create a File Based Encryption check API"
Glenn Kasten [Wed, 4 Nov 2015 16:27:58 +0000 (16:27 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected" am:
ebbdabdb82 am:
1104180301
am:
d1323e9b70
* commit '
d1323e9b70f94796491cad4132982fd4664395b0':
Built-in mic is not used when USB mic is disconnected
Glenn Kasten [Wed, 4 Nov 2015 16:19:36 +0000 (16:19 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected" am:
ebbdabdb82
am:
1104180301
* commit '
110418030167702f29fa686616d68fc62f9c0995':
Built-in mic is not used when USB mic is disconnected
Glenn Kasten [Wed, 4 Nov 2015 16:10:44 +0000 (16:10 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
am:
ebbdabdb82
* commit '
ebbdabdb826c083769e7d7bc102a59a04c9e0329':
Built-in mic is not used when USB mic is disconnected
Glenn Kasten [Wed, 4 Nov 2015 16:03:41 +0000 (16:03 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
Alejandro Ochoa [Sat, 31 Oct 2015 02:05:00 +0000 (20:05 -0600)]
Built-in mic is not used when USB mic is disconnected
In some cases when the USB microphone is disconnected,
audio stack does not switch to the built-in microphone.
It gets stuck in a state where it still recognizes the
USB mic is still connected. Current device removal
implementation only considers USB output devices such
as headset. The same process should be used for input
USB devices (microphone).
Bug:
24932354
Change-Id: Ic2089ef5a9a318cb47336ade405f79eccd7129f8
Signed-off-by: Alejandro Ochoa <alejandro.ochoa@intel.com>
Alan Viverette [Wed, 4 Nov 2015 15:22:58 +0000 (15:22 +0000)]
Merge "Reduce CascadingMenuPopup's reliance on internal ListView state"
Alan Viverette [Wed, 4 Nov 2015 15:09:27 +0000 (15:09 +0000)]
Merge "Always call legacy performLongClick()"
Geoff Mendal [Wed, 4 Nov 2015 15:03:47 +0000 (15:03 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Nov 2015 14:56:32 +0000 (06:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8adfd4484cde6c32adab9b939cb7698370e2ec6f
Auto-generated-cl: translation import
Diego Perez [Wed, 4 Nov 2015 14:44:20 +0000 (14:44 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev am:
1c442aca0a
am:
7cdbfaf459
* commit '
7cdbfaf459ede7ede430188ed4b1a990ba762144':
Remove auto-boxing during the inflate
Diego Perez [Wed, 4 Nov 2015 14:42:58 +0000 (14:42 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev am:
7dda46e740
am:
724af9ce6f
* commit '
724af9ce6fceb9ddf2ef4536d0da41a520928d5e':
Update StaticLayout_Delegate to use new nLoadHyphenator
Diego Perez [Wed, 4 Nov 2015 14:35:39 +0000 (14:35 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
am:
1c442aca0a
* commit '
1c442aca0a1b054e3aa0a40ba89c08b39099be2f':
Remove auto-boxing during the inflate
Geoff Mendal [Wed, 4 Nov 2015 14:35:29 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
931082b728 -s ours am:
b67481b336 -s ours
am:
9a4b6b9094 -s ours
* commit '
9a4b6b909487b61120fb085864533b70a9dabeb8':
Import translations. DO NOT MERGE
Diego Perez [Wed, 4 Nov 2015 14:34:19 +0000 (14:34 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
am:
7dda46e740
* commit '
7dda46e740250d753bb9d01e129e91695ab8cfe2':
Update StaticLayout_Delegate to use new nLoadHyphenator
Geoff Mendal [Wed, 4 Nov 2015 14:34:12 +0000 (14:34 +0000)]
Import translations. DO NOT MERGE am:
f44adbba69 -s ours am:
5bf5deb84c -s ours
am:
f587cfec79 -s ours
* commit '
f587cfec79cd6eaab2b83b902ab5663b6adbfb86':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:27:19 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
931082b728 -s ours
am:
b67481b336 -s ours
* commit '
b67481b336d211c6d96e2110e865b55f615fd9df':
Import translations. DO NOT MERGE
Diego Perez [Wed, 4 Nov 2015 14:26:15 +0000 (14:26 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
Diego Perez [Wed, 4 Nov 2015 14:25:58 +0000 (14:25 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
Geoff Mendal [Wed, 4 Nov 2015 14:25:55 +0000 (14:25 +0000)]
Import translations. DO NOT MERGE am:
f44adbba69 -s ours
am:
5bf5deb84c -s ours
* commit '
5bf5deb84cdc61aa27ea12695ee20cc308e45184':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:14:25 +0000 (14:14 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Nov 2015 14:09:51 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
931082b728 -s ours
* commit '
931082b728a42e0b22b163721d7d48faf23d45a4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:08:19 +0000 (14:08 +0000)]
Import translations. DO NOT MERGE
am:
f44adbba69 -s ours
* commit '
f44adbba69c22e4c9cd681bbb3cab70097eae118':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:03:56 +0000 (14:03 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Nov 2015 13:57:12 +0000 (05:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id927a7b437f398a9e468e1fa105bce3c7bb4b356
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 13:40:02 +0000 (05:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8b90890aff385da901c6a66ac485ddb2560f1cbc
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 13:38:21 +0000 (13:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 4 Nov 2015 13:23:43 +0000 (05:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I06b7fdd459fbb74d91376bc93ae8d035145d2234
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 13:20:46 +0000 (07:20 -0600)]
Import translations. DO NOT MERGE
Change-Id: I7c47fb535cfa65f435efe21fd59118039b6359f5
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 13:09:10 +0000 (05:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I52024255e1324f3757497603d692def1fec6e75f
Auto-generated-cl: translation import
Clara Bayarri [Wed, 28 Oct 2015 17:53:53 +0000 (17:53 +0000)]
Create a File Based Encryption check API
Change-Id: Ibf41f98818ea801b9f690200c340be80c3b9bf31
Diego Perez [Wed, 4 Nov 2015 11:35:34 +0000 (11:35 +0000)]
Update StaticLayout_Delegate to use new nLoadHyphenator
Small fix to update call parameters
Change-Id: I4322aa212493ec2970ae17ec1918b9b7e2f8e93a
Daichi Hirono [Wed, 4 Nov 2015 05:45:24 +0000 (05:45 +0000)]
Merge "Extends MtpDatabase so that it can handle child documents."
Daichi Hirono [Mon, 26 Oct 2015 07:39:54 +0000 (16:39 +0900)]
Extends MtpDatabase so that it can handle child documents.
The CL extracts common routines for root documents and child documents,
adds new methods for child documents, and let the common routines from
the new methods.
BUG=
25162822
Change-Id: Ie6f0092e584ae12c89d43593701debeb76f6f3cb
Chong Zhang [Wed, 4 Nov 2015 02:35:33 +0000 (02:35 +0000)]
Merge "Save window when an app died while it's visible"
Chong Zhang [Mon, 2 Nov 2015 19:17:00 +0000 (11:17 -0800)]
Save window when an app died while it's visible
- If an app died visible, keep the dead window and leave it on screen.
- Apply 50% dim over the dead window to indicate it's no longer active.
- Monitor touch inputs on the dead window and restart the app on tap.
bug:
24913379
Change-Id: I911da4e6135f2bffaf3b1bbe6f911ff689a278ff
Adrian Roos [Wed, 4 Nov 2015 01:45:26 +0000 (01:45 +0000)]
Merge "Ok Droid, enable inline reply"
Adrian Roos [Wed, 4 Nov 2015 01:43:01 +0000 (17:43 -0800)]
Ok Droid, enable inline reply
Bug:
22452379
Change-Id: I74a875495abe010a2f00d1ac598ad95eaa87479d
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