OSDN Git Service
Tarandeep Singh [Thu, 31 Aug 2017 21:38:33 +0000 (21:38 +0000)]
Merge "Add multi-display support to FloatingToolbar." into oc-mr1-dev
am:
01b6ff0178
Change-Id: Ic3c317435ba408522b2b26f74c4df5a772871566
Mårten Kongstad [Thu, 31 Aug 2017 21:28:14 +0000 (21:28 +0000)]
Merge "OMS: fix listener callbacks triggered by changes to target package" am:
637dbcbb6c am:
c2351d1d40
am:
b361ec15e4
Change-Id: I91e248a169f9b7f1aa742dbca4fb24d98aef2a4f
Mårten Kongstad [Thu, 31 Aug 2017 21:14:06 +0000 (21:14 +0000)]
Merge "OMS: fix listener callbacks triggered by changes to target package" am:
637dbcbb6c
am:
c2351d1d40
Change-Id: I2222b2ed2479a748cf3124357f91701afe4bd04f
Julian Mancini [Thu, 31 Aug 2017 21:11:16 +0000 (21:11 +0000)]
Remove PDF Thumbnail functionality
am:
30175b958e
Change-Id: Id58212dce0b51eada2a31936f1614d773d89ecad
Mårten Kongstad [Thu, 31 Aug 2017 21:03:40 +0000 (21:03 +0000)]
Merge "OMS: fix listener callbacks triggered by changes to target package"
am:
637dbcbb6c
Change-Id: I14d16f460146ac49d89334e41409a90908f04671
Treehugger Robot [Thu, 31 Aug 2017 20:51:38 +0000 (20:51 +0000)]
Merge "OMS: fix listener callbacks triggered by changes to target package"
Tarandeep Singh [Thu, 31 Aug 2017 20:45:48 +0000 (20:45 +0000)]
Merge "Add multi-display support to FloatingToolbar." into oc-mr1-dev
Julian Mancini [Tue, 1 Aug 2017 20:23:08 +0000 (13:23 -0700)]
Remove PDF Thumbnail functionality
Bug:
64225798
Test: Removing Functionality
Change-Id: Id02f1b50d161c6f2779c9f65c579383c18028b65
lingjunl [Thu, 31 Aug 2017 20:20:44 +0000 (20:20 +0000)]
Merge "Whitelist free sms shortcode 76551 in Mexico for constlletion." am:
4bddd5c44b am:
2e1c643919
am:
bc198d8808
Change-Id: I1312a470243ac02feb6602f49005ebf5e0cecfa5
lingjunl [Thu, 31 Aug 2017 20:07:28 +0000 (20:07 +0000)]
Merge "Whitelist free sms shortcode 76551 in Mexico for constlletion." am:
4bddd5c44b
am:
2e1c643919
Change-Id: Iee6c3304bd4db32e05ab7a44ade5d152358bcb4f
Ruchi Kandoi [Thu, 31 Aug 2017 20:01:13 +0000 (20:01 +0000)]
Merge "Do not call setAlwaysButtonEnabled if the activity doesn't support defaults." into oc-mr1-dev
am:
c1235a1ff2
Change-Id: I109b96ae365e102428fbe6c7174ebd140145e293
lingjunl [Thu, 31 Aug 2017 19:57:19 +0000 (19:57 +0000)]
Merge "Whitelist free sms shortcode 76551 in Mexico for constlletion."
am:
4bddd5c44b
Change-Id: Ic2a1ae0ee1560870f01289925a978b9b11b860cc
Felipe Leme [Thu, 31 Aug 2017 19:54:07 +0000 (19:54 +0000)]
Merge "Fixed FillResponse.toString() to display list of datasets." into oc-mr1-dev
am:
ac2a765a18
Change-Id: Ic84ca582b444c145609d79a04232926da6deb118
TreeHugger Robot [Thu, 31 Aug 2017 19:47:42 +0000 (19:47 +0000)]
Merge "Do not call setAlwaysButtonEnabled if the activity doesn't support defaults." into oc-mr1-dev
lingjunl [Thu, 31 Aug 2017 19:46:39 +0000 (19:46 +0000)]
Merge "Whitelist free sms shortcode 76551 in Mexico for constlletion."
TreeHugger Robot [Thu, 31 Aug 2017 19:43:01 +0000 (19:43 +0000)]
Merge "Fixed FillResponse.toString() to display list of datasets." into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 18:59:28 +0000 (18:59 +0000)]
Merge "Wrap all exceptions/crashes while plugins are active" into oc-mr1-dev
am:
6bf3564040
Change-Id: Ide9a861d5db82dc8f83516ed0b340cf7468856e3
Jason Monk [Thu, 31 Aug 2017 18:50:13 +0000 (18:50 +0000)]
Merge "Wrap all exceptions/crashes while plugins are active" into oc-mr1-dev
Android Build Merger (Role) [Thu, 31 Aug 2017 18:20:23 +0000 (18:20 +0000)]
Merge changes from topic "am-
32df9c80b45e459abc307fb7f14e48f6" into oc-mr1-dev-plus-aosp
* changes:
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am:
1c0dba5014 am:
80a0f290f6 am:
e274cd7ae9 am:
a8441ebf84 am:
5087723199
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours am:
d877297ad4 -s ours am:
6f94a3740a -s ours am:
2a540e9970 -s ours am:
51c6928864 -s ours
Zheng Zhang [Thu, 31 Aug 2017 18:15:48 +0000 (18:15 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am:
1c0dba5014 am:
80a0f290f6 am:
e274cd7ae9 am:
a8441ebf84
am:
5087723199
Change-Id: I7e9564db5d427b10aac0bbb27a423ccd710e79ad
Zheng Zhang [Thu, 31 Aug 2017 18:14:38 +0000 (18:14 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours am:
d877297ad4 -s ours am:
6f94a3740a -s ours am:
2a540e9970 -s ours
am:
51c6928864 -s ours
Change-Id: Ica0c834783c27e393e6d555c9be0504482d91121
Zheng Zhang [Thu, 31 Aug 2017 18:09:50 +0000 (18:09 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am:
1c0dba5014 am:
80a0f290f6 am:
e274cd7ae9 am:
a8441ebf84
am:
604c1704de
Change-Id: I25788014e821c79d575616cdacb4f625a3d9288d
Zheng Zhang [Thu, 31 Aug 2017 18:08:44 +0000 (18:08 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours am:
d877297ad4 -s ours am:
6f94a3740a -s ours am:
2a540e9970 -s ours
am:
96c836846c -s ours
Change-Id: Iab1df610315f7384b7f731d176914b7350b759ad
Dianne Hackborn [Thu, 31 Aug 2017 17:58:08 +0000 (17:58 +0000)]
Merge "Fix issue #
65055576: VoiceInteractionManagerService sets..." into oc-mr1-dev
am:
9d484f015f
Change-Id: Ib88378916ae9ffbe41253ac0e6dc5e9c8229e700
Tarandeep Singh [Tue, 29 Aug 2017 21:39:22 +0000 (14:39 -0700)]
Add multi-display support to FloatingToolbar.
DecorView has no support for multi-display (bug
65172902).
Until that is done, the easy fix for displaying cut, copy, paste
on non-default display is to modify FloatingToolbar.
FloatingToolbar uses context of Default display. Changed it
to use context of the window (which makes it multi-display
compatible).
Fixes:
64837794
Test: Manual using AAe's KitchenSink test app
bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: I513f1aac1c0d22355c996247e3bf56c6d812348f
Zheng Zhang [Thu, 31 Aug 2017 17:48:47 +0000 (17:48 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am:
1c0dba5014 am:
80a0f290f6 am:
e274cd7ae9
am:
a8441ebf84
Change-Id: If62141ca2c08426492339356576bf9b821ba9fa6
Zheng Zhang [Thu, 31 Aug 2017 17:48:29 +0000 (17:48 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am:
1c0dba5014 am:
80a0f290f6 am:
e274cd7ae9
am:
a8441ebf84
Change-Id: I4af0cf2638717eb91d82e804dddb69e647e713f0
Zheng Zhang [Thu, 31 Aug 2017 17:47:22 +0000 (17:47 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours am:
d877297ad4 -s ours am:
6f94a3740a -s ours
am:
2a540e9970 -s ours
Change-Id: I3f2b00b74cb5e2bc12e4da1d8536dde13603bfd4
Zheng Zhang [Thu, 31 Aug 2017 17:47:16 +0000 (17:47 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours am:
d877297ad4 -s ours am:
6f94a3740a -s ours
am:
2a540e9970 -s ours
Change-Id: Iea7e5e533da23bc64fcafe03d59297ae8d5d87da
Daniel Nishi [Thu, 31 Aug 2017 17:45:51 +0000 (17:45 +0000)]
Merge "Update the work icon." into oc-mr1-dev
am:
f19edfdab0
Change-Id: Idcbecc8272cfd5fcc3a78f1a9e536cff55917bcf
Kevin Chyn [Thu, 31 Aug 2017 17:39:51 +0000 (17:39 +0000)]
Merge "Fix fingerprint error messages on Keyguard / AOD" into oc-mr1-dev
am:
db25b9fb3b
Change-Id: Id7b23cd947afaba4fbdf9bccaeaf355ef3ae1c1e
Zheng Zhang [Thu, 31 Aug 2017 17:37:44 +0000 (17:37 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am:
1c0dba5014 am:
80a0f290f6
am:
e274cd7ae9
Change-Id: Ibc2a01cbfbc33c1ee07486b5556a91b9ebeaa532
Zheng Zhang [Thu, 31 Aug 2017 17:36:50 +0000 (17:36 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours am:
d877297ad4 -s ours
am:
6f94a3740a -s ours
Change-Id: I12d33400af3e2f3c358839380ddee7fb8791e839
Android Build Merger (Role) [Thu, 31 Aug 2017 17:25:49 +0000 (17:25 +0000)]
Merge "Merge "Fix meteredness bugs in updateNetworkRulesNL()." into oc-mr1-dev am:
03a5cb51c8" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Thu, 31 Aug 2017 17:23:26 +0000 (17:23 +0000)]
Merge "Fix issue #
65055576: VoiceInteractionManagerService sets..." into oc-mr1-dev
Dianne Hackborn [Wed, 30 Aug 2017 23:21:28 +0000 (16:21 -0700)]
Fix issue #
65055576: VoiceInteractionManagerService sets...
...VOICE_RECOGNITION_SERVICE that is needed for SearchSpeechServices
System setup was incorrectly completely runing off
VoiceInteractionManagerService if the associated feature is not set,
but the service needs to always be running, and instead rely on
the existing logic of reducing functionality if it should not be
running full voice interaction services.
Test: manually booted and ran
Bug:
65055576
Change-Id: I9a83216d45689440c71d657ba2721faf0662b0ff
Jeff Sharkey [Thu, 31 Aug 2017 17:21:03 +0000 (17:21 +0000)]
Merge "Fix meteredness bugs in updateNetworkRulesNL()." into oc-mr1-dev
am:
03a5cb51c8
Change-Id: I87342ac5836c4aa698552be70f75e9d5f5ac114c
Android Build Merger (Role) [Thu, 31 Aug 2017 17:20:58 +0000 (17:20 +0000)]
Merge "Merge "Test: Drag on the divider line." am:
1fa3a60f05 am:
290bfff7d0 am:
8ad2dc3615" into oc-mr1-dev-plus-aosp
Daniel Nishi [Thu, 31 Aug 2017 17:20:14 +0000 (17:20 +0000)]
Merge "Update the work icon." into oc-mr1-dev
wuliang [Thu, 31 Aug 2017 17:16:28 +0000 (17:16 +0000)]
Merge "Test: Drag on the divider line." am:
1fa3a60f05 am:
290bfff7d0
am:
8ad2dc3615
Change-Id: Ibc0b05c150de915d15d1aff13959797a86b1b775
David Stevens [Thu, 31 Aug 2017 17:10:28 +0000 (17:10 +0000)]
Merge "Update DisplayContent tap exclude region on window resize" into oc-mr1-dev
am:
43bc0adc9d
Change-Id: Ifc88f5ea9a359fce64dd63b471488dd5cc4c9912
Jason Monk [Thu, 31 Aug 2017 17:04:47 +0000 (17:04 +0000)]
Merge "Add bt battery level to QS icons" into oc-mr1-dev
am:
984b76f62e
Change-Id: If156c3f183fa4efa489202ef90b75ce758ff5b16
wuliang [Thu, 31 Aug 2017 17:04:19 +0000 (17:04 +0000)]
Merge "Test: Drag on the divider line." am:
1fa3a60f05
am:
290bfff7d0
Change-Id: Ifcb2f065e5be1195e2bd899bd9b9052b2712631f
TreeHugger Robot [Thu, 31 Aug 2017 17:04:10 +0000 (17:04 +0000)]
Merge "Fix fingerprint error messages on Keyguard / AOD" into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 16:57:53 +0000 (16:57 +0000)]
Merge "Reduce paddings on 320dp screens, we don't have much space" into oc-mr1-dev
am:
04094078be
Change-Id: I9e538baa5f0e1f17860c6568fd4ed1af21c59387
wuliang [Thu, 31 Aug 2017 16:54:54 +0000 (16:54 +0000)]
Merge "Test: Drag on the divider line."
am:
1fa3a60f05
Change-Id: I8c33a5bddf76f70eec8c21fe850887b51fdfaa74
Jason Monk [Thu, 31 Aug 2017 16:48:04 +0000 (16:48 +0000)]
Merge "Don't auto-expand QS from detail panels" into oc-mr1-dev
am:
8b2d853bee
Change-Id: I0f743a26a38b999ed50df67cf12c4d855475b297
Jason Monk [Wed, 30 Aug 2017 23:39:09 +0000 (19:39 -0400)]
Wrap all exceptions/crashes while plugins are active
To help differentiate them from real crashes.
Test: install crashing plugin
Change-Id: I88d991ab8d86f71bcc7042012d4d84d8a9af19f3
Fixes:
64527191
Treehugger Robot [Thu, 31 Aug 2017 16:43:44 +0000 (16:43 +0000)]
Merge "Test: Drag on the divider line."
Jason Monk [Thu, 31 Aug 2017 16:41:34 +0000 (16:41 +0000)]
Merge "Fix carrier text rtl alignment" into oc-mr1-dev
am:
7578b3db2c
Change-Id: I9af801b1e6665c690d6df72313bb9b0a71064946
Jeff Sharkey [Thu, 31 Aug 2017 16:38:02 +0000 (16:38 +0000)]
Merge "Fix meteredness bugs in updateNetworkRulesNL()." into oc-mr1-dev
David Stevens [Thu, 31 Aug 2017 16:37:12 +0000 (16:37 +0000)]
Merge "Update DisplayContent tap exclude region on window resize" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 16:36:57 +0000 (16:36 +0000)]
Merge "Add bt battery level to QS icons" into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 16:35:37 +0000 (16:35 +0000)]
Merge "Reduce paddings on 320dp screens, we don't have much space" into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 16:31:26 +0000 (16:31 +0000)]
Merge "Don't auto-expand QS from detail panels" into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 16:31:10 +0000 (16:31 +0000)]
Merge "Fix carrier text rtl alignment" into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 15:53:18 +0000 (15:53 +0000)]
Merge "Fix multi user battery percentage" into oc-mr1-dev
am:
e603a67a62
Change-Id: Idb21e3af999e42d90e0f6fd453b13183bcdd8489
Pavel Grafov [Thu, 31 Aug 2017 15:48:18 +0000 (15:48 +0000)]
Merge "Unlock managed profile keystore when user is unlocked." into oc-mr1-dev
am:
060b87b068
Change-Id: Ib9b53f97f09dc31563ea53d760067027ac2dde67
Android Build Merger (Role) [Thu, 31 Aug 2017 15:42:40 +0000 (15:42 +0000)]
Merge "Merge "Fix tuner DND UI" into oc-mr1-dev am:
5285e053b3" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 31 Aug 2017 15:39:42 +0000 (15:39 +0000)]
Merge "Merge changes I49057737,I68e3096d am:
50cf621704 am:
f5dcc28b0c am:
30348a8abb" into oc-mr1-dev-plus-aosp
Jason Monk [Thu, 31 Aug 2017 15:39:42 +0000 (15:39 +0000)]
Merge "Fix tuner DND UI" into oc-mr1-dev
am:
5285e053b3
Change-Id: Ic82ecc1588f79d49a78df63998633464c3f6dabc
TreeHugger Robot [Thu, 31 Aug 2017 15:38:57 +0000 (15:38 +0000)]
Merge "Fix multi user battery percentage" into oc-mr1-dev
Andreas Gampe [Thu, 31 Aug 2017 15:35:58 +0000 (15:35 +0000)]
Merge changes I49057737,I68e3096d am:
50cf621704 am:
f5dcc28b0c
am:
30348a8abb
Change-Id: I9755772ab8c8d4c3708ee2a65cda0b0d3f39d30e
TreeHugger Robot [Thu, 31 Aug 2017 15:33:54 +0000 (15:33 +0000)]
Merge "Unlock managed profile keystore when user is unlocked." into oc-mr1-dev
Yohei Yukawa [Thu, 31 Aug 2017 15:32:59 +0000 (15:32 +0000)]
Merge "Fix wrong dump output of *Info#flags" into oc-mr1-dev
am:
c4a8b3625b
Change-Id: I43645394470ca01bd533da378ba9edc3abaa3a3b
TreeHugger Robot [Thu, 31 Aug 2017 15:28:56 +0000 (15:28 +0000)]
Merge "Fix tuner DND UI" into oc-mr1-dev
Andreas Gampe [Thu, 31 Aug 2017 15:27:52 +0000 (15:27 +0000)]
Merge changes I49057737,I68e3096d am:
50cf621704
am:
f5dcc28b0c
Change-Id: Id25418e3def0b63a8c52671546968017cf350d18
Yohei Yukawa [Thu, 31 Aug 2017 15:26:07 +0000 (15:26 +0000)]
Merge "Fix wrong dump output of *Info#flags" into oc-mr1-dev
Yohei Yukawa [Thu, 31 Aug 2017 07:26:01 +0000 (00:26 -0700)]
Fix wrong dump output of *Info#flags
This CL follows up to a previous CL [1] that introduced an ability to
control filtering level of
- ActivityInfo#dump()
- ApplicationInfo#dump()
- ComponentInfo#dump()
- ProviderInfo#dump()
- ResolveInfo#dump()
- ServiceInfo#dump()
but also masked following outputs as an unexpected side effect.
- ActivityInfo#flags
- ApplicationInfo#flags
- ProviderInfo#flags
- ServiceInfo#flags
With this CL, above *Info#flags are correctly dumped again.
[1]: I0d01565babb87e68b840c9756a2ea730d699efc7
6ac42aeed905181b484f97a53db57a17134ef7a8
Test: Manually tested as follows.
1. make -j SoftKeyboard
2. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
3. adb shell dumpsys input_method
-> Check 'com.example.android.softkeyboard' section
-> make sure ServiceInfo#flags=0x0
-> make sure ApplicationInfo#flags=0x38a8be44
FLAG_HAS_CODE (1<<2)
FLAG_ALLOW_CLEAR_USER_DATA (1<<6)
FLAG_SUPPORTS_SMALL_SCREENS (1<<9)
FLAG_SUPPORTS_NORMAL_SCREENS (1<<10)
FLAG_SUPPORTS_LARGE_SCREENS (1<<11)
FLAG_RESIZEABLE_FOR_SCREENS (1<<12)
FLAG_SUPPORTS_SCREEN_DENSITIES (1<<13)
FLAG_ALLOW_BACKUP (1<<15)
FLAG_SUPPORTS_XLARGE_SCREENS (1<<19)
FLAG_STOPPED (1<<21)
FLAG_SUPPORTS_RTL (1<<22)
FLAG_INSTALLED (1<<23)
FLAG_FULL_BACKUP_ONLY (1<<26)
FLAG_EXTRACT_NATIVE_LIBS (1<<28)
FLAG_HARDWARE_ACCELERATED (1<<29)
Fixes:
65057767
Change-Id: Icd1e18237e873844791ccdea7f424b6fe76137c0
Tyler Gunn [Thu, 31 Aug 2017 15:22:44 +0000 (15:22 +0000)]
Merge "De-couple data enabled from VT settings." into oc-mr1-dev
am:
e0f1f26d87
Change-Id: I424cd828a7616c2947367bdb4a82a62cf17847e7
Andreas Gampe [Thu, 31 Aug 2017 15:15:31 +0000 (15:15 +0000)]
Merge changes I49057737,I68e3096d
am:
50cf621704
Change-Id: Id66d91bc326461dc3cae4cbae03f3d060761ea7f
Tyler Gunn [Thu, 31 Aug 2017 15:13:08 +0000 (15:13 +0000)]
Merge "De-couple data enabled from VT settings." into oc-mr1-dev
Android Build Merger (Role) [Thu, 31 Aug 2017 15:02:30 +0000 (15:02 +0000)]
Merge "Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService"" am:
1d66352b40 am:
4c1b0ae343 am:
de68a0a1af" into oc-mr1-dev-plus-aosp
Treehugger Robot [Thu, 31 Aug 2017 15:01:37 +0000 (15:01 +0000)]
Merge changes I49057737,I68e3096d
* changes:
Frameworks: Clean up SystemProperties
Frameworks: Add warning to SystemProperties.get
Hugo Benichi [Thu, 31 Aug 2017 14:58:48 +0000 (14:58 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService"" am:
1d66352b40 am:
4c1b0ae343
am:
de68a0a1af
Change-Id: Icff7a1fa8888654914fceaf324219ed6af3c95ed
Bryce Lee [Thu, 31 Aug 2017 14:54:15 +0000 (14:54 +0000)]
Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev
am:
7e0e6e904c
Change-Id: I4d8c8ee58d8d1618ea39342dca0434e6a286fc1b
Hugo Benichi [Thu, 31 Aug 2017 14:48:46 +0000 (14:48 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService"" am:
1d66352b40
am:
4c1b0ae343
Change-Id: Ibb3a382ad45a708c63a3d7f4d3be0bf54881403a
Bryce Lee [Thu, 31 Aug 2017 14:43:02 +0000 (14:43 +0000)]
Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev
Hugo Benichi [Thu, 31 Aug 2017 14:39:18 +0000 (14:39 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService""
am:
1d66352b40
Change-Id: I691095ce56e30e2fada93bc5500453f13ac51403
Hugo Benichi [Thu, 31 Aug 2017 14:31:24 +0000 (14:31 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService""
Hugo Benichi [Thu, 31 Aug 2017 14:29:51 +0000 (14:29 +0000)]
Revert "Nat464Xlat: interface notification handler on ConnectivityService"
This reverts commit
771d5c2f0126ba692897c9716f4098ae6e3a870c due to b/
65225023.
Change-Id: I6ca3780afb8d47b77219d6b5a06760042f684c4b
Android Build Merger (Role) [Thu, 31 Aug 2017 13:15:54 +0000 (13:15 +0000)]
Merge "Update UnlockMethodCache when screen turns off am:
08ae664365 am:
0550bddc95" into oc-mr1-dev-plus-aosp
Kevin Chyn [Thu, 31 Aug 2017 13:11:34 +0000 (13:11 +0000)]
Update UnlockMethodCache when screen turns off am:
08ae664365
am:
83d0cd221f
Change-Id: I227539fdebcdebdaf8494c5ae2028752c0fb53f6
Kevin Chyn [Thu, 31 Aug 2017 13:11:33 +0000 (13:11 +0000)]
Update UnlockMethodCache when screen turns off am:
08ae664365
am:
0550bddc95
Change-Id: Ie22adb274db36add9172ab53366517121f7dc7e3
Kevin Chyn [Thu, 31 Aug 2017 12:59:00 +0000 (12:59 +0000)]
Update UnlockMethodCache when screen turns off
am:
08ae664365
Change-Id: I132358dc66f04cb2531e6d57ed8d2dd14947b62d
Kevin Chyn [Thu, 31 Aug 2017 12:59:00 +0000 (12:59 +0000)]
Update UnlockMethodCache when screen turns off
am:
08ae664365
Change-Id: I416497c2ffeca295b9620a6d1d6f9868935dd25a
Mårten Kongstad [Mon, 26 Jun 2017 13:26:32 +0000 (15:26 +0200)]
OMS: fix listener callbacks triggered by changes to target package
The OverlayManagerListener connected to the OverlayManagerServiceImpl
should be notified when and only when the overlay settings have been
modified. The pattern used to fulfill this contract as a result of a
change to a target package is as follows:
if (updateAllOverlaysForTarget(...)) {
mListener.onOverlaysChanged(...);
}
Fix two violations of this pattern:
- The listener was always notified
- The listener was never notified
Test: manual
Change-Id: Id24a439e2eaaf976e8c7d650af36d58632cfb4ba
Pavel Grafov [Wed, 23 Aug 2017 11:20:54 +0000 (12:20 +0100)]
Unlock managed profile keystore when user is unlocked.
With file based encryption when the user unlock the phone,
managed profile is already running (in a locked state). But
on full disk encryption devices, LSS attempts to unlock child
profile straight after unlocking user 0, which fails because
the profile is not yet running.
With this change once the profile gets unlocked (happens after
ActivityManagerService processes START_PROFILES_MSG message)
LSS will attempt to unlock its keystore.
Bug:
64722589
Test: manual, tried FDE and FBE devices with unified challenge.
Change-Id: Ic614cc3c6732a3db6aaf56fef1822e358d742510
Winson Chung [Thu, 31 Aug 2017 04:46:29 +0000 (04:46 +0000)]
Merge "Skip handling recents toggle if a task is locked." into oc-mr1-dev
am:
8d1a86ca0f
Change-Id: I6e240465679b5050fdbcb6030e6a281fd5c27719
TreeHugger Robot [Thu, 31 Aug 2017 04:34:43 +0000 (04:34 +0000)]
Merge "Skip handling recents toggle if a task is locked." into oc-mr1-dev
Kenichi Ishibashi [Thu, 31 Aug 2017 04:12:40 +0000 (04:12 +0000)]
Merge "Use isolated uid to set oom_score_adj" into oc-mr1-dev
am:
d60e2ede49
Change-Id: I5416ba83137d9983f4c76176c68abd8cf31f696d
Erik Kline [Thu, 31 Aug 2017 03:57:57 +0000 (03:57 +0000)]
Merge "Shutdown more reliably" am:
549c3d2e4f am:
7e5b415861
am:
024d6b8910
Change-Id: Ia05dcf01d2809a32c78b1a6a0826758f11555fa3
TreeHugger Robot [Thu, 31 Aug 2017 03:52:51 +0000 (03:52 +0000)]
Merge "Use isolated uid to set oom_score_adj" into oc-mr1-dev
Erik Kline [Thu, 31 Aug 2017 03:45:23 +0000 (03:45 +0000)]
Merge "Shutdown more reliably" am:
549c3d2e4f
am:
7e5b415861
Change-Id: Id2bd17e649d28cc484292e1f1ec5644c014bc395
Erik Kline [Thu, 31 Aug 2017 03:30:55 +0000 (03:30 +0000)]
Merge "Shutdown more reliably"
am:
549c3d2e4f
Change-Id: I9ff7e6ee49bb88f9a63b269d57d5e91ed6ddec31
Fan Zhang [Thu, 31 Aug 2017 03:24:29 +0000 (03:24 +0000)]
Merge "Update icons to have rounded corner" into oc-mr1-dev
am:
e61844e265
Change-Id: I310ca32a0c418a7631eeb4303221613ce25c74ed
Wonsik Kim [Thu, 31 Aug 2017 03:13:34 +0000 (03:13 +0000)]
Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev
am:
52700a9795
Change-Id: I1691d29774c95fc87c1230ec85fbcf78838e6e42
TreeHugger Robot [Thu, 31 Aug 2017 03:12:24 +0000 (03:12 +0000)]
Merge "Update icons to have rounded corner" into oc-mr1-dev
Treehugger Robot [Thu, 31 Aug 2017 03:11:51 +0000 (03:11 +0000)]
Merge "Shutdown more reliably"
TreeHugger Robot [Thu, 31 Aug 2017 02:50:04 +0000 (02:50 +0000)]
Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev