OSDN Git Service
Felipe Leme [Fri, 21 Sep 2018 23:37:53 +0000 (16:37 -0700)]
Synchronize access to sNotificationBundle.
Otherwise Shell can crash due to ConcurrentModificationException
Test: atest BugreportReceiverTest
Test: manual verification
Fixes:
116280360
Change-Id: I138acd43b313d2a7a9d945fb44a9d63e1ad798eb
Fabian Kozynski [Fri, 21 Sep 2018 18:13:40 +0000 (18:13 +0000)]
Merge "QSCustomizer updates transparent view height"
Makoto Onuki [Fri, 21 Sep 2018 16:41:43 +0000 (16:41 +0000)]
Merge "Add telephony commands about SMS apps"
Aaron Heuckroth [Fri, 21 Sep 2018 15:30:30 +0000 (15:30 +0000)]
Merge "Remove references to SwipeHelper from NotificationMenuRow."
Louis Chang [Fri, 21 Sep 2018 06:29:10 +0000 (06:29 +0000)]
Merge "Update the size of SurfaceControl after display changed"
TreeHugger Robot [Fri, 21 Sep 2018 04:57:19 +0000 (04:57 +0000)]
Merge "WM: Fix seamless rotation when multiple windows are drawn"
Tadashi G. Takaoka [Fri, 21 Sep 2018 04:48:12 +0000 (04:48 +0000)]
Merge "Move AM/WM unit tests out of FrameworksServicesTests to WmTests"
Kevin Chyn [Fri, 21 Sep 2018 04:34:59 +0000 (04:34 +0000)]
Merge changes from topic "face-dialog"
* changes:
3/n: Add FaceDialogView and "confirmation" plumbing
2/n: Refactor common code from FingerprintDialogView
1/n: Rename FingerprintDialogView to BiometricDialogView
Louis Chang [Mon, 20 Aug 2018 05:08:39 +0000 (13:08 +0800)]
Update the size of SurfaceControl after display changed
Bug:
112963441
Test: atest ActivityManagerMultiDisplayTests
atest DisplayContentTests
atest WindowContainerTests
Change-Id: I1b8f3fd48e8b9d642992b4f3a345672eb34e506b
Vishnu Nair [Fri, 21 Sep 2018 03:16:18 +0000 (20:16 -0700)]
WM: Fix seamless rotation when multiple windows are drawn
Currently seamless rotation applies a transformation to unrotate the
AppWindowToken surface to undo the device rotation. The transformation
is removed in a defered transaction tied to when the client draws the next
frame in the new orientation.
This breaks if the AppWindowToken has multiple sufaces drawing to it,
such as in the case of Camera with a visible PopupWindow. If the
PopupWindow draws first, it will remove the transform on the
AppWindowToken surface causing a flicker.
The fix applies the unrotate transformation to the WindowState surface
so each window will seamlessly rotate indepedently being carefult to
apply the transforms to the WindowState surface position as well.
Fixes:
115664709
Test: go/wm-smoke
Change-Id: I1dcdeea4554ef912d9dca885c480989c360b7032
Tadashi G. Takaoka [Fri, 7 Sep 2018 07:42:49 +0000 (16:42 +0900)]
Move AM/WM unit tests out of FrameworksServicesTests to WmTests
Test: All AM/WM presubmit and non-flaky test pass
146 com.android.server.am
188 com.android.server.wm
32 com.android.server.policy
$ tradefed.sh run commandAndExit WmTests \
--include-filter com.android.server.am. \
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
$ tradefed.sh run commandAndExit WmTests \
--include-filter com.android.server.wm. \
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
$ tradefed.sh run commandAndExit WmTests \
--include-filter com.android.server.policy. \
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Test: No AM/WM unit test in FrameworksServicesTests
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--include-filter com.android.server.am.
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--include-filter com.android.server.wm.
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--include-filter com.android.server.policy.
Bug:
113800711
Change-Id: I01ab256aabf7e1f1b513fe3b92140f6936c2d649
Chalard Jean [Fri, 21 Sep 2018 02:17:24 +0000 (19:17 -0700)]
Merge "Fix NullPointerException in CaptivePortalLogin" am:
d106aac67b am:
3d70baf5ff
am:
7365713421
Change-Id: I2973d6361b5e5dacb1de4016fd450324620f0c32
TreeHugger Robot [Fri, 21 Sep 2018 01:48:13 +0000 (01:48 +0000)]
Merge "Make IMM#peekInstance() thread-safe"
Chalard Jean [Fri, 21 Sep 2018 01:41:32 +0000 (18:41 -0700)]
Merge "Fix NullPointerException in CaptivePortalLogin" am:
d106aac67b
am:
3d70baf5ff
Change-Id: I88af0e651307b48421047098833d28b97f57dd54
Chalard Jean [Fri, 21 Sep 2018 01:09:35 +0000 (18:09 -0700)]
Merge "Fix NullPointerException in CaptivePortalLogin"
am:
d106aac67b
Change-Id: I6cbb44bd5b2a492b938f3d64a5f10c818df8cb22
TreeHugger Robot [Fri, 21 Sep 2018 01:04:22 +0000 (01:04 +0000)]
Merge "Adding install reason when installing an apk"
Derek Sollenberger [Fri, 21 Sep 2018 00:58:05 +0000 (00:58 +0000)]
Merge changes Ie9436715,Ib3054822
* changes:
Refactor RenderState and remove unused functionality.
Fix crash when EGLSurface is no longer valid.
Kevin Chyn [Wed, 19 Sep 2018 02:13:27 +0000 (19:13 -0700)]
3/n: Add FaceDialogView and "confirmation" plumbing
This change adds plumbing from <Biometric>Service to SystemUI for requiring
user confirmation (or not). This change also fixes some layout bugs
that were hard to notice.
Bug:
111461540
Fixes:
113130114
Fixes:
116135579
Test: With confirmation, crypto operation does not work until token
is added to Keystore
Test: Without confirmation, crypto operation works when biometric is
authenticated
Test: BiometricPromptDemo works, UI elements are all correct
Test: Talkback messages are correct
Change-Id: I2c05577699a29c09777cae4db6c7334c1e6bc179
TreeHugger Robot [Fri, 21 Sep 2018 00:27:11 +0000 (00:27 +0000)]
Merge "Remove frameworks/base/tests/ImfTest"
Lei Yu [Fri, 21 Sep 2018 00:12:55 +0000 (00:12 +0000)]
Merge "Always evict old scanResults(> 15s) in WifiTracker"
kopriva [Fri, 21 Sep 2018 00:12:29 +0000 (17:12 -0700)]
Merge "docs: fixing several minor documentation bugs" into pi-dev am:
82b0d17b39
am:
f6b27fbff0
Change-Id: I14f98e023001c75719ab8b891db6abf3f0fd4564
Pengquan Meng [Fri, 21 Sep 2018 00:03:48 +0000 (00:03 +0000)]
Merge "Update network selection API"
Makoto Onuki [Tue, 18 Sep 2018 23:14:12 +0000 (16:14 -0700)]
Add telephony commands about SMS apps
See the other CL on the same topic for the details
Bug:
109809543
Test: See the other CL
Change-Id: I9f750a72edfc282c80f7547647bcddaf2da51d9b
kopriva [Thu, 20 Sep 2018 23:55:47 +0000 (16:55 -0700)]
Merge "docs: fixing several minor documentation bugs" into pi-dev
am:
82b0d17b39
Change-Id: Ieb1447c0d7cda629338de8d6e03f46670d8ed0b0
TreeHugger Robot [Thu, 20 Sep 2018 23:15:51 +0000 (23:15 +0000)]
Merge "Remove unused SkDither include"
TreeHugger Robot [Thu, 20 Sep 2018 23:02:37 +0000 (23:02 +0000)]
Merge "Adding support for install-reason argument in adb-install command"
Yohei Yukawa [Thu, 20 Sep 2018 22:50:35 +0000 (15:50 -0700)]
Make IMM#peekInstance() thread-safe
Somehow InputMethodManager#peekInstance() has not been thread-safe.
Although we basically do not care this deprecated method, but let's
just update it for consistency.
Bug:
115891476
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: I56bf05f76a7939f004efefdd956776e533bae058
TreeHugger Robot [Thu, 20 Sep 2018 22:42:48 +0000 (22:42 +0000)]
Merge "docs: fixing several minor documentation bugs" into pi-dev
Beverly Tai [Thu, 20 Sep 2018 22:37:59 +0000 (22:37 +0000)]
Merge "Load default zen rules from xml"
TreeHugger Robot [Thu, 20 Sep 2018 22:26:00 +0000 (22:26 +0000)]
Merge "Make auto-dark a bit better"
jackqdyulei [Thu, 20 Sep 2018 00:28:27 +0000 (17:28 -0700)]
Always evict old scanResults(> 15s) in WifiTracker
When fragment is created, it will force display all the APs
from mWifiManager.getScanResults, where it may have obsolete APs.
This CL will evict old scanResults even in this force display, so
it won't show obsolete APs anymore.
Also change the buffer size from 25s to 15s so it only display APs
scanned in last 15s.
Bug:
111738605
Test: SettingsUnitTests
Change-Id: I9413bcba81dba55c6b13cfdca2785069d4d7d105
TreeHugger Robot [Thu, 20 Sep 2018 21:42:53 +0000 (21:42 +0000)]
Merge "Support atoms subscription via shell cmd."
Amy Zhang [Thu, 20 Sep 2018 21:39:52 +0000 (21:39 +0000)]
Merge "Fix SystemAudioInitiationActionFromAvr state switching."
Wale Ogunwale [Thu, 20 Sep 2018 21:23:15 +0000 (21:23 +0000)]
Merge "Moved more stuff from ActivityManagerService to ActivityTaskManagerService (15/n)"
Android Build Merger (Role) [Thu, 20 Sep 2018 21:03:21 +0000 (21:03 +0000)]
Merge "Merge "WebView: fix TracingController example usage" into pi-dev am:
679e58a8d3 am:
fc5c86fda8"
Nate Fischer [Thu, 20 Sep 2018 21:02:58 +0000 (14:02 -0700)]
Merge "WebView: fix TracingController example usage" into pi-dev am:
679e58a8d3
am:
fc5c86fda8
Change-Id: Ib44310caef4c52c697307f345dbbf95d30647b0f
Aurimas Liutikas [Thu, 20 Sep 2018 21:01:15 +0000 (21:01 +0000)]
Merge "Add basic details on aapt2 development."
Pengquan Meng [Thu, 20 Sep 2018 20:47:43 +0000 (13:47 -0700)]
Update network selection API
Change the manual network selection api in TelephonyManager to support
the OperatorInfo.
Bug:
115401728
Test: manual test
Change-Id: I43dee55ce117873b699cb98c6eb6d41f5dee24ea
John Reck [Thu, 20 Sep 2018 20:00:04 +0000 (13:00 -0700)]
Make auto-dark a bit better
Handles transform of basic bitmaps
Tweak to always treat text as foreground
Test: builds, poked around with force_dark
Change-Id: I733d39e05067438335da5a7eac06111f66f1228d
Nate Fischer [Thu, 20 Sep 2018 20:30:49 +0000 (13:30 -0700)]
Merge "WebView: fix TracingController example usage" into pi-dev
am:
679e58a8d3
Change-Id: I72c29fdc11925668a781bbff355fc1c429c2a888
Shuo Qian [Thu, 20 Sep 2018 20:24:01 +0000 (20:24 +0000)]
Merge "Make SubscriptionManager.getSlotIndex public"
Kevin Chyn [Wed, 19 Sep 2018 01:15:16 +0000 (18:15 -0700)]
2/n: Refactor common code from FingerprintDialogView
Bug:
111461540
Test: BiometricPromptDemo works
Change-Id: I7077b062f1da0e084a38d5d53248123a82456a48
Kevin Chyn [Wed, 19 Sep 2018 01:23:22 +0000 (18:23 -0700)]
1/n: Rename FingerprintDialogView to BiometricDialogView
This is to preserve git history, see other changes in the topic :)
Bug:
111461540
Test: BiometricPromptDemo works
Change-Id: I5c7b45024743bf5c5ccf0ccb7e30b97ab24ca2bc
Aaron Heuckroth [Fri, 7 Sep 2018 18:52:04 +0000 (14:52 -0400)]
Remove references to SwipeHelper from NotificationMenuRow.
The intent here is to move gesture processing out of NotificationMenuRow and into NotificationSwipeHelper.
Test: Automated tests should pass, and manual experimentation with dismissing/tapping/replying to notifications should work as expected.
Change-Id: Icd32f14769f1b494ecc1dedb2cc37ee129ed21f7
Marcin Oczeretko [Thu, 20 Sep 2018 19:43:07 +0000 (19:43 +0000)]
Merge changes If217a9a8,I35af3a9c
* changes:
LooperStats - don't create entries for unsampled sessions
Add work source uid collection to LooperStats
Chavi Weingarten [Thu, 20 Sep 2018 19:03:42 +0000 (19:03 +0000)]
Merge "Remove minLayer and maxLayer from display screenshot."
Yohei Yukawa [Thu, 20 Sep 2018 19:00:29 +0000 (12:00 -0700)]
Remove frameworks/base/tests/ImfTest
This test is no longer used.
Automated end-to-end IME testing is already covered in CTS.
Fix:
116233680
Test: make -j checkbuild
Change-Id: I2d44f513f620a823c079dfe900f9ca4a963ba6fc
TreeHugger Robot [Thu, 20 Sep 2018 18:57:55 +0000 (18:57 +0000)]
Merge "WebView: fix TracingController example usage" into pi-dev
Brian Osman [Thu, 20 Sep 2018 18:52:57 +0000 (14:52 -0400)]
Remove unused SkDither include
This header is being removed from Skia.
Test: Code still compiles.
Change-Id: I439e46eff48e0853fa5037f7f660e74e7026d87c
Jeff Chang [Thu, 20 Sep 2018 18:50:59 +0000 (18:50 +0000)]
Merge "Enable the WM shell command to support the secondary display"
Derek Sollenberger [Thu, 20 Sep 2018 17:37:24 +0000 (13:37 -0400)]
Refactor RenderState and remove unused functionality.
Test: hwui_unit_tests still pass
Change-Id: Ie943671535ab8c5da1bac05985e815e0cb842dc1
TreeHugger Robot [Thu, 20 Sep 2018 18:29:44 +0000 (18:29 +0000)]
Merge "Refactor: break fs-verity data gen into 2 parts"
kopriva [Thu, 20 Sep 2018 18:20:27 +0000 (11:20 -0700)]
docs: fixing several minor documentation bugs
Test: make ds-docs
Bug:
36949243
Bug:
116169695
Bug:
37001248
Bug:
37044885
Bug:
37053166
Change-Id: I844a8978518cd7214bf9d068d602902dfa7e8246
Exempt-From-Owner-Approval: Docs-only change
Nate Fischer [Fri, 14 Sep 2018 19:53:51 +0000 (12:53 -0700)]
WebView: fix TracingController example usage
This fixes a minor mistake in the TracingController class usage. The
example previously used a bare `CATEGORIES_WEB_DEVELOPER` instead of
`TracingConfig.CATEGORIES_WEB_DEVELOPER`.
Bug:
116227333
Test: make docs
Change-Id: I648dd0d5e61666e61adb27303c185013bd80b0ea
TreeHugger Robot [Thu, 20 Sep 2018 18:06:28 +0000 (18:06 +0000)]
Merge "Suppress suppressing work profile removed notification if reason is null"
TreeHugger Robot [Thu, 20 Sep 2018 17:42:46 +0000 (17:42 +0000)]
Merge "Split ambient pulse notif logic from heads up."
Derek Sollenberger [Wed, 19 Sep 2018 17:52:13 +0000 (13:52 -0400)]
Fix crash when EGLSurface is no longer valid.
The EGLSurface stored in the pipeline can become obsolete if the
EglManager/RenderThread has to destroy the context. This CL enables the
RenderThread to notify all active pipelines that their surface is invalid.
Bug:
115290937
Test: hwui_unit_tests
Change-Id: Ib3054822273bc35406630b7442229a81b39a2c91
TreeHugger Robot [Thu, 20 Sep 2018 17:27:53 +0000 (17:27 +0000)]
Merge "Let IMMS be responsible for IInputMethodClient lifecycle"
Chavi Weingarten [Thu, 20 Sep 2018 17:26:48 +0000 (17:26 +0000)]
Merge "Removed global windowFrames from PWM"
Wale Ogunwale [Sun, 16 Sep 2018 17:21:51 +0000 (10:21 -0700)]
Moved more stuff from ActivityManagerService to ActivityTaskManagerService (15/n)
- Moved CompatModePackages to ActivityTaskManagerService since it is mostly used for activity stuff.
- Moved mHeavyWeightProcess to ActivityTaskManagerService since it is set for activities.
- Set AMS.mBooting and AMS.mBooted as volatile to allow setting from both AM and WM side with hold locks.
- Allow updating of cpu stats, usage stats, and foreground time from WM side.
Bug:
80414790
Test: Existing tests pass.
Change-Id: I48ab55bdd5aacc864cb6a82d19d1a24b7605a5b0
Lucas Dupin [Thu, 20 Sep 2018 17:17:38 +0000 (10:17 -0700)]
Merge "Clarify that UiModeManager sets global night mode" into pi-dev am:
562f5485d3
am:
f255935dc8
Change-Id: Ib94e5ed781ff7b5499fd3380f16ae5e6bfefdaf7
Lucas Dupin [Thu, 20 Sep 2018 17:01:22 +0000 (10:01 -0700)]
Merge "Clarify that UiModeManager sets global night mode" into pi-dev
am:
562f5485d3
Change-Id: Ia757aeb7dbe97b1b33ababf50af5c96da8d7e963
Andrii Kulian [Thu, 20 Sep 2018 16:51:29 +0000 (16:51 +0000)]
Merge "Make sure to add default display before others"
Andrii Kulian [Thu, 20 Sep 2018 02:02:20 +0000 (19:02 -0700)]
Make sure to add default display before others
Some parts of WM init assume that display with id 0 will be added
before all other displays. This CL traverses the displays from DM
from the beginning of the list, which will provide increasing
display ids.
Bug:
74446287
Test: Boot bat_land with 2 displays attached
Change-Id: Ie46954cc9f20a29f30c5f45fb6aabf46eba63fa8
Lucas Dupin [Thu, 20 Sep 2018 16:39:49 +0000 (16:39 +0000)]
Merge "Clarify that UiModeManager sets global night mode" into pi-dev
TreeHugger Robot [Thu, 20 Sep 2018 16:35:26 +0000 (16:35 +0000)]
Merge "Always use Context.getSystemService() to get IMM in SysUI"
Lucas Dupin [Thu, 20 Sep 2018 16:30:48 +0000 (16:30 +0000)]
Merge "What a horrible fix"
Lucas Dupin [Thu, 20 Sep 2018 16:15:52 +0000 (16:15 +0000)]
Merge "Hide bouncer after unlocking SIM card"
Fabian Kozynski [Thu, 20 Sep 2018 14:33:55 +0000 (14:33 +0000)]
Merge "Refactor PagedTileLayout to not overflow screen"
TreeHugger Robot [Thu, 20 Sep 2018 13:36:04 +0000 (13:36 +0000)]
Merge "Use String.equals when comparing conflicting providers"
TreeHugger Robot [Thu, 20 Sep 2018 13:15:27 +0000 (13:15 +0000)]
Merge "Fix caller log on appIsRunningAndEligibleForBackupWithTransport"
Fabian Kozynski [Wed, 12 Sep 2018 13:11:16 +0000 (09:11 -0400)]
Refactor PagedTileLayout to not overflow screen
PagedTileLayout respects MeasureSpec mode for height to decide on how many
rows to show. TilePage and PagedTileLayout only show as many rows as
they can up to the height of the screen. TileLayout can calculate the
maximum number of rows given a height limit.
Fixes:
113082314
Test: Visual, atest
Change-Id: I2860d71c9aeb2a8ac62fcdbc71a3041a91605bcb
Fabian Kozynski [Tue, 18 Sep 2018 18:49:37 +0000 (14:49 -0400)]
QSCustomizer updates transparent view height
Updates the height of the transparent view that overlays the status bar
when the QS Customizer panel is expanded whenever the configuration
changes.
Change-Id: Ic0dd4d07f8149ac8434495d2d0c5373329e034a6
Fixes:
115999397
Test: Visual & atest
Jeff Chang [Thu, 6 Sep 2018 08:34:10 +0000 (16:34 +0800)]
Enable the WM shell command to support the secondary display
Modify the the shell command with display id
Bug:
112338741
Test: adb shell wm command [-d display_id]
Change-Id: Ib628d082f44010cba99c9ee1c109c0512cba4b56
Bernardo Rufino [Thu, 20 Sep 2018 10:59:10 +0000 (11:59 +0100)]
Fix caller log on appIsRunningAndEligibleForBackupWithTransport
Test: atest FrameworksServicesRoboTests
Test: adb shell bmgr backupnow --all
Change-Id: I577db6fb92880916a231ffa36a468bd64d8cae09
TreeHugger Robot [Thu, 20 Sep 2018 10:51:19 +0000 (10:51 +0000)]
Merge "SecurityControllorImpl: Log whole exception"
Marcin Oczeretko [Thu, 13 Sep 2018 17:20:21 +0000 (18:20 +0100)]
LooperStats - don't create entries for unsampled sessions
This should reduce the size of the data, because we will
not track the very rare calls unless we are collecting
a detailed sample.
Test: Manual and UTs
Change-Id: If217a9a848935878a6efcdfac9df723c6ce54361
Marcin Oczeretko [Wed, 12 Sep 2018 11:53:47 +0000 (12:53 +0100)]
Add work source uid collection to LooperStats
Add ThreadLocalWorkSourceUid and Message.workSourceUid
which will store the UID which caused, directly or
indirectly, the Message to be enqueued.
This was needed because using Binder.getCallingUid() does
not give us enough data since quite a few Binder services
call Binder.clearCallingIdentity() when processing the
call.
Test: UT and manual
Change-Id: I35af3a9ca5193477070990b41ff5d9c52f420069
Chalard Jean [Thu, 20 Sep 2018 09:45:56 +0000 (09:45 +0000)]
Merge "Fix NullPointerException in CaptivePortalLogin"
Tadashi G. Takaoka [Thu, 20 Sep 2018 08:20:50 +0000 (08:20 +0000)]
Merge "Add TEST_MAPPING and dummy tests to com.android.server.policy."
TreeHugger Robot [Thu, 20 Sep 2018 06:35:44 +0000 (06:35 +0000)]
Merge "Support non-resizeable activities on secondary displays"
Tadashi G. Takaoka [Thu, 20 Sep 2018 02:43:30 +0000 (11:43 +0900)]
Add TEST_MAPPING and dummy tests to com.android.server.policy.
Bug:
113800711
Bug:
111302567
Test: tradefed.sh run commandAndExit WmTests \
--include-filter com.android.server.policy. \
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Change-Id: I723c9da0c7c5284b3ab57cfd096f4a8428c17305
TreeHugger Robot [Thu, 20 Sep 2018 03:22:34 +0000 (03:22 +0000)]
Merge "Fix FlakyTest filter in wm/TEST_MAPPING"
daqi [Thu, 20 Sep 2018 03:00:44 +0000 (20:00 -0700)]
Merge "Merge "Set InputMethoMananger#mCurRootView to null when window dismissed" am:
7bd18423f6 am:
9c5a6e2c6c" into pi-dev-plus-aosp
am:
205f5bd249
Change-Id: I69f543dc6be8383b289e61aabb5de4bd1f8f09c1
Felipe Leme [Thu, 20 Sep 2018 02:46:51 +0000 (19:46 -0700)]
Merge "Clarified FillCallback and SaveCallback behaviors." into pi-dev am:
971ad7aa5e
am:
5529a99f42
Change-Id: Ibdee3ee359415f684b1e30223f89b7a2dfb0ca4b
Android Build Merger (Role) [Thu, 20 Sep 2018 02:35:47 +0000 (02:35 +0000)]
Merge "Merge "Set InputMethoMananger#mCurRootView to null when window dismissed" am:
7bd18423f6 am:
9c5a6e2c6c" into pi-dev-plus-aosp
daqi [Thu, 20 Sep 2018 02:35:27 +0000 (19:35 -0700)]
Merge "Set InputMethoMananger#mCurRootView to null when window dismissed" am:
7bd18423f6
am:
9c5a6e2c6c
Change-Id: I6198c9d52c19e48f61bb4d488018c067d4b80108
Felipe Leme [Thu, 20 Sep 2018 02:33:39 +0000 (19:33 -0700)]
Merge "Clarified FillCallback and SaveCallback behaviors." into pi-dev
am:
971ad7aa5e
Change-Id: I3dda44262a318c277aa226321b0ed1e1dc34e6a1
daqi [Thu, 20 Sep 2018 02:22:12 +0000 (19:22 -0700)]
Merge "Set InputMethoMananger#mCurRootView to null when window dismissed"
am:
7bd18423f6
Change-Id: Ie0127bd83b714c540bcf387a3fc74d01bd60eb13
Yohei Yukawa [Thu, 20 Sep 2018 02:21:24 +0000 (19:21 -0700)]
Let IMMS be responsible for IInputMethodClient lifecycle
This is the last step to remove the dependency on IInputMethodClient
from WindowManagerService.
With my previous CL [1], now WindowManagerService (WMS) depends on
IInputMethodClient just because it implements lifecycle management of
IInputMethodClient on behalf of InputMethodManagerService (IMMS).
This CL mechanically moves that responsibility from WMS to IMMS for
better separation of concerns. It is a bit ironic that this CL is
partly undoing my previous CLs [2][3] that removed
IInputMethodManager.addClient() though.
This CL aims to preserve the current observable behavior (e.g. when
InputMethodManager instance is being created) as much as possible.
Most likely there would be no observable behavior difference when seen
from other components.
[1]: I444077b1e4af4033f67ab72c181fac85b601e08a
41f89c3bccd0613a29a46b132891ba16032990d9
[2]: I453200fd5847e9a78876affb6a1caec221525e1d
e24ed79edb937c743b96b3f9baddc689fb694be1
[3]: Id91dd600120e4981aa1d9005ce644728968430c9
fffc0e53c62614c288e9e702d69e517db17dccd7
Fix:
115993358
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: I7726c70613ea72d6e78fa5754e9fc840f0a40f11
TreeHugger Robot [Thu, 20 Sep 2018 02:12:57 +0000 (02:12 +0000)]
Merge "Clarified FillCallback and SaveCallback behaviors." into pi-dev
Yohei Yukawa [Thu, 20 Sep 2018 02:12:02 +0000 (19:12 -0700)]
Always use Context.getSystemService() to get IMM in SysUI
This is a mechanical refactoring, which should have no observable
behavior difference at this moment.
We need this refactoring because InputMethodManager#getInstance() does
not work well on multi-display scenarios.
Bug:
115891476
Test: Manually made sure that IME still works on inline-reply
Change-Id: I266c17187c7faab4d436e19a4db7595cab4244ac
John Reck [Thu, 20 Sep 2018 01:44:23 +0000 (18:44 -0700)]
Merge "Don't run comparisons on non-jank frames" am:
903dad812e am:
4007dd103f
am:
21013eebd7
Change-Id: Idf00d170ac8f1ab7a9c378c281b02ab5aa767ee1
John Reck [Thu, 20 Sep 2018 01:34:59 +0000 (18:34 -0700)]
Merge "Don't run comparisons on non-jank frames" am:
903dad812e
am:
4007dd103f
Change-Id: I175e245bd2ced35505a2295f4037c6d9c932f056
John Reck [Thu, 20 Sep 2018 01:21:47 +0000 (18:21 -0700)]
Merge "Don't run comparisons on non-jank frames"
am:
903dad812e
Change-Id: I7cbca9acb9f14149868f18af8970d5324d51e260
Amy [Mon, 13 Aug 2018 19:40:19 +0000 (12:40 -0700)]
Fix SystemAudioInitiationActionFromAvr state switching.
Test: local test.
Change-Id: I8772399e409ae2b1762921957638958c437746f2
(cherry picked from commit
e888cdbf399b3a8554d9e65c9b55e4bbd7089b17)
Android Build Merger (Role) [Thu, 20 Sep 2018 01:05:33 +0000 (01:05 +0000)]
Merge "Merge "Added mapping files for DualShock3 and DualShock4" am:
85aadab7e4 am:
d050a2edd6 am:
1f6af2e769"
Kim Low [Thu, 20 Sep 2018 01:05:08 +0000 (18:05 -0700)]
Merge "Added mapping files for DualShock3 and DualShock4" am:
85aadab7e4 am:
d050a2edd6
am:
1f6af2e769
Change-Id: I239e8e9aff10e7472fb841261df7e23466202dd2
Yuzhou Jia [Thu, 20 Sep 2018 01:02:44 +0000 (01:02 +0000)]
Merge "Make Changes to VoiceInteraction API for supporting System checking an assistant voice action availability on AAE."
Tadashi G. Takaoka [Thu, 20 Sep 2018 00:48:27 +0000 (09:48 +0900)]
Fix FlakyTest filter in wm/TEST_MAPPING
This is a follow up of I2d9641c68148
Bug:
113800711
Test: tradefed.sh run commandAndExit FrameworksServicesTests \
--include-filter com.android.server.wm \
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Change-Id: I7fa4d2cb70594431574d44d886352a2e81d8e51e