OSDN Git Service
Hall Liu [Tue, 3 Apr 2018 01:46:50 +0000 (18:46 -0700)]
Merge "Change signature of requestBluetoothAudio" am:
545e20389d
am:
442575f4f1
Change-Id: Ic10b762e04d74635663fa97f5879072ebe00eca9
Hall Liu [Tue, 3 Apr 2018 01:30:51 +0000 (18:30 -0700)]
Merge "Change signature of requestBluetoothAudio"
am:
545e20389d
Change-Id: I9fc7399bf01bbe0c1def43cc9cf543c0000b827c
Brian C. Young [Tue, 3 Apr 2018 01:29:11 +0000 (18:29 -0700)]
Merge ""Unlocked device required" javadoc clarification" into pi-dev
am:
084f9aee9a
Change-Id: Icb6580e3c7ee5a1b5cbacbd99eb769e3f55b5d9a
Todd Kennedy [Tue, 3 Apr 2018 01:20:20 +0000 (18:20 -0700)]
Merge "Exit the loop at the right time" into pi-dev
am:
6d24a1c8be
Change-Id: Idbf0953a3fb4dd38640009a0b213dace99a282c5
Dianne Hackborn [Tue, 3 Apr 2018 00:52:06 +0000 (17:52 -0700)]
Merge "Work on issue #
74404949: Screen state usage API" into pi-dev
am:
886fc6aef0
Change-Id: Ia612052dee8b7729900ab091ecae7db073f8d9fd
Lucas Dupin [Tue, 3 Apr 2018 00:46:39 +0000 (17:46 -0700)]
Merge "Remove old alarm IPC" into pi-dev
am:
ae6b800562
Change-Id: I60977022c6075e1fa3aa27156733eb41891e5b26
Shawn Willden [Tue, 3 Apr 2018 00:43:45 +0000 (17:43 -0700)]
Merge "Rename trustedUserPresenceRequired." into pi-dev
am:
840c29eb0b
Change-Id: I197f09918da53af24dbdf73f514ede750129d4f6
Bryce Lee [Tue, 3 Apr 2018 00:24:11 +0000 (00:24 +0000)]
Merge "Do not set activity's task before clearing in some scenarios." into pi-dev
am:
540f747861
Change-Id: Ida4807ded086a070e2e905f03d298ffd4c6ab98b
Jeff Tinker [Tue, 3 Apr 2018 00:16:19 +0000 (00:16 +0000)]
Merge "Updates MediaDrm developer docs" into pi-dev
am:
1c967fe075
Change-Id: I218679fc0cf338389dfb489ba591d3480601280f
Hall Liu [Tue, 3 Apr 2018 00:14:58 +0000 (00:14 +0000)]
Merge "Change signature of requestBluetoothAudio"
Felipe Leme [Mon, 2 Apr 2018 23:39:03 +0000 (23:39 +0000)]
Merge "Don't use a copy of window params when showing a dialog." into pi-dev
am:
3f6b7714a7
Change-Id: Iaacd371fb0c63eedaab73f32314c14997e578462
Frank Salim [Mon, 2 Apr 2018 23:13:25 +0000 (23:13 +0000)]
Merge "Revise secure key import API after review" into pi-dev
am:
50228a6471
Change-Id: I4fe07806b781d337f2df40f34fb75662187f4360
Yi Jin [Mon, 2 Apr 2018 23:07:30 +0000 (23:07 +0000)]
Remove some letters of verbose log
am:
ea31cbea93
Change-Id: Ia1237171d4bcb5c5c86851883f58bbdd1cc7ac22
Yi Jin [Mon, 2 Apr 2018 23:04:07 +0000 (23:04 +0000)]
Merge "Use modern c++ code style for incidentd." into pi-dev
am:
56051569ab
Change-Id: Ifd36cb23ae185b8a37805deb6163e87a2e9ee1c9
Andrii Kulian [Mon, 2 Apr 2018 22:58:26 +0000 (22:58 +0000)]
Merge "Don't finish activity on duplicate resume request" into pi-dev
am:
38af02e75b
Change-Id: I8d7d56c9b6d7b1e987379ae26e883a8e1deb2ecf
Sudheer Shanka [Mon, 2 Apr 2018 22:53:08 +0000 (22:53 +0000)]
Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev
am:
8303baf4d0
Change-Id: Ia476818fee03347c5d0bf80d3197ef391b9f7c66
Todd Kennedy [Mon, 2 Apr 2018 21:59:09 +0000 (21:59 +0000)]
Merge "Use per user info for seinfo" into pi-dev
am:
ce5f2b3e87
Change-Id: I01dbd963e683fac472a58d6610fde40dc6fb79f2
Mike Digman [Mon, 2 Apr 2018 21:51:29 +0000 (21:51 +0000)]
Merge "Fix right-most navbar icon tinting mismatch" into pi-dev
am:
78e805684b
Change-Id: I2d038a72bd421832bd242b49e76eda9c16eb0285
Pavel Maltsev [Mon, 2 Apr 2018 21:47:22 +0000 (21:47 +0000)]
Merge "Make addUnwantedCapability method public" into pi-dev
am:
7f5670fdcd
Change-Id: I6d1676b72f125baf5b72e8718bd331a30b3c3c30
TreeHugger Robot [Mon, 2 Apr 2018 21:40:34 +0000 (21:40 +0000)]
Merge ""Unlocked device required" javadoc clarification" into pi-dev
Erik Kline [Mon, 2 Apr 2018 21:08:52 +0000 (21:08 +0000)]
Merge "Refactor isTetheringSupported() calls" am:
e34c426fd3
am:
6f63d051d6
Change-Id: Iad6358dc2f1d10b322d22ec90543adc50882962d
TreeHugger Robot [Mon, 2 Apr 2018 21:07:37 +0000 (21:07 +0000)]
Merge "Exit the loop at the right time" into pi-dev
Erik Kline [Mon, 2 Apr 2018 20:57:43 +0000 (20:57 +0000)]
Merge "Refactor isTetheringSupported() calls"
am:
e34c426fd3
Change-Id: Iecc4e563f151545facc23f4a24a8dbf2d6ab9822
Hall Liu [Mon, 2 Apr 2018 20:52:57 +0000 (13:52 -0700)]
Change signature of requestBluetoothAudio
requestBluetoothAudio now takes a BluetoothDevice instead of a string.
Bug:
74408978
Test: unable to CTS -- can't emulate bluetooth devices
Change-Id: Id21e32b911da234f69a248e9937f9df0cf12a9a9
Dianne Hackborn [Mon, 2 Apr 2018 20:48:51 +0000 (20:48 +0000)]
Merge "Work on issue #
74404949: Screen state usage API" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 20:41:24 +0000 (20:41 +0000)]
Merge "Remove old alarm IPC" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 20:36:34 +0000 (20:36 +0000)]
Merge "Rename trustedUserPresenceRequired." into pi-dev
Bryce Lee [Mon, 2 Apr 2018 20:28:00 +0000 (20:28 +0000)]
Merge "Do not set activity's task before clearing in some scenarios." into pi-dev
Android Build Merger (Role) [Mon, 2 Apr 2018 20:27:43 +0000 (20:27 +0000)]
Merge "Merge "Restore saveLayer APIs back into the public API." into pi-dev am:
ffe1c2a266" into pi-dev-plus-aosp
Derek Sollenberger [Mon, 2 Apr 2018 20:26:38 +0000 (20:26 +0000)]
Merge "Restore saveLayer APIs back into the public API." into pi-dev
am:
ffe1c2a266
Change-Id: I4dc9a7272aeeda9ae6be5ce9215cc2a4939286fa
Bryce Lee [Mon, 26 Mar 2018 23:03:47 +0000 (16:03 -0700)]
Do not set activity's task before clearing in some scenarios.
When the clear top and reset task launch flags are specified for a
standard launch mode activity, we should not add the activity to the
task before taking these actions. Doing so leads to the potential of
prematurely ending the starting activity and reparenting the activity
without a window container controller set.
This changelist ensures that the task is not associated until later.
Fixes:
70635977
Test: atest CtsActivityManagerDeviceTestCases:ActivityStarterTests
Change-Id: I8e2245f9ad9f07e259b099daefe9ebb2170ae28d
Android Build Merger (Role) [Mon, 2 Apr 2018 20:20:05 +0000 (20:20 +0000)]
Merge "Merge "Calculate multipath quota excluding current day." into pi-dev am:
07daad2dbf" into pi-dev-plus-aosp
Remi NGUYEN VAN [Mon, 2 Apr 2018 20:19:22 +0000 (20:19 +0000)]
Merge "Calculate multipath quota excluding current day." into pi-dev
am:
07daad2dbf
Change-Id: I8fc1a2c491f4518ee835a197a0f5f0cd7ba23543
Android Build Merger (Role) [Mon, 2 Apr 2018 20:15:03 +0000 (20:15 +0000)]
Merge "Merge "Fix PermissionMonitorTest that has been failing." into pi-dev am:
6e66280d35" into pi-dev-plus-aosp
Chalard Jean [Mon, 2 Apr 2018 20:14:29 +0000 (20:14 +0000)]
Merge "Fix PermissionMonitorTest that has been failing." into pi-dev
am:
6e66280d35
Change-Id: Ifb04fdda2b54b0bde8b6eeead3e0240d5cc1ff79
Android Build Merger (Role) [Mon, 2 Apr 2018 20:10:17 +0000 (20:10 +0000)]
Merge "Merge "TextClassifier API updates." into pi-dev am:
bf9dfb16be" into pi-dev-plus-aosp
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 20:05:00 +0000 (20:05 +0000)]
[automerger skipped] Merge "Adding debug message inside NetworkServiceCallback." am:
9bbfe5c14c
am:
cc1bf181d0 -s ours
Change-Id: Ica090f421ddbf4672f68bdbf77839a8e931638cf
Abodunrinwa Toki [Mon, 2 Apr 2018 20:03:04 +0000 (20:03 +0000)]
Merge "TextClassifier API updates." into pi-dev
am:
bf9dfb16be
Change-Id: I11d37c920abb4aa1fbd5022f30a10fdbe8efe997
TreeHugger Robot [Mon, 2 Apr 2018 20:00:46 +0000 (20:00 +0000)]
Merge "Updates MediaDrm developer docs" into pi-dev
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 19:54:57 +0000 (19:54 +0000)]
Merge "Adding debug message inside NetworkServiceCallback."
am:
9bbfe5c14c
Change-Id: Ida0d753a46f7aef9f0596d414edab8d36ea24b82
Bernie Innocenti [Mon, 2 Apr 2018 19:51:19 +0000 (19:51 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature" into pi-dev
am:
4a3ccc18e6
Change-Id: I62c4c90283ab9a989db084e8d19582010f66bcee
Remi NGUYEN VAN [Mon, 2 Apr 2018 19:43:54 +0000 (19:43 +0000)]
[automerger skipped] Merge "Add method to NetworkStatsService for UID stats." into pi-dev
am:
6f5a8db2e9 -s ours
Change-Id: I4182b2dfad1f40dd29da8c3612cf0dbc4038aa7b
Remi NGUYEN VAN [Mon, 2 Apr 2018 19:41:12 +0000 (19:41 +0000)]
Merge "Differentiate depleted and unset multipath quota" into pi-dev
am:
dfa8f0dbce
Change-Id: Ifb99a545b972b80ac5c0edf01e10b36e06ac06c5
Brian C. Young [Mon, 2 Apr 2018 19:40:58 +0000 (12:40 -0700)]
"Unlocked device required" javadoc clarification
Wording changes on the public API functions for these keys.
Test: CTS
Bug:
67752510
Change-Id: Iaf620e8c0e06d436d09f50d308268653bec196ce
Bill Yi [Mon, 2 Apr 2018 19:36:17 +0000 (19:36 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
e970444839 -s ours
Change-Id: Ia07b2d0ddf15dc1600bcf890ccb36e6cf26e8060
Bill Yi [Mon, 2 Apr 2018 19:35:42 +0000 (19:35 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ae73c8bea6 -s ours
Change-Id: I2af4ff532f7f72de181464ff43ec6dbc355896aa
Seigo Nonaka [Mon, 2 Apr 2018 19:31:33 +0000 (19:31 +0000)]
Merge "Fills font metrics before passing to ReplacementSpan" into pi-dev
am:
138148425c
Change-Id: I25a8114a246c7c0a244e2ee69f9efd58b5dbd6f9
Bill Yi [Mon, 2 Apr 2018 19:27:00 +0000 (19:27 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
299491afe1 -s ours
Change-Id: I08cce5c324d11d7cdbd9935a83593edada6d57c3
Bill Yi [Mon, 2 Apr 2018 19:26:22 +0000 (19:26 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
aaa2849890 -s ours
Change-Id: I6fbc173e9e9007dfd471b14edf806ba882f4e16a
Bo Zhu [Mon, 2 Apr 2018 19:25:47 +0000 (19:25 +0000)]
Merge "Skip the cert xml serial number check if the test root cert is in use" into pi-dev
am:
3cd574ced9
Change-Id: I01e101f36dba43b062bb3134ed171e1eff358d24
TreeHugger Robot [Mon, 2 Apr 2018 19:22:58 +0000 (19:22 +0000)]
Merge "Don't use a copy of window params when showing a dialog." into pi-dev
Bill Yi [Mon, 2 Apr 2018 19:21:53 +0000 (19:21 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
85e4a97789 -s ours
Change-Id: I97dd7864f151d03d6fa048720a039b81f84145a2
Bill Yi [Mon, 2 Apr 2018 19:21:22 +0000 (19:21 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
879127f31d -s ours
Change-Id: Idf4d54fcb3cab7feb32a9061978f5d5b4e671609
Bill Yi [Mon, 2 Apr 2018 19:20:54 +0000 (19:20 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
f03441f47f -s ours
Change-Id: I0397dce3962f676f180b499853faf64a8dabcb51
Daichi Hirono [Mon, 2 Apr 2018 19:20:24 +0000 (19:20 +0000)]
Merge "Add config flag to specify if wallpaper is rendered" into pi-dev
am:
c0f8eb345a
Change-Id: Icc3778801aad786bc9cd2ee01be93c70b9158c82
Bill Yi [Mon, 2 Apr 2018 19:15:44 +0000 (19:15 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
da6cff4e08 -s ours
Change-Id: I45d54de12a471a850a63e520899e6265d9a413a4
Dianne Hackborn [Mon, 2 Apr 2018 19:09:08 +0000 (19:09 +0000)]
Merge "Fix issue #
77230164: Add app op to control foreground services" into pi-dev
am:
21306849e6
Change-Id: Ia999a20e8f0959876f9cb05d121982cc2c1f0890
Shawn Willden [Tue, 27 Mar 2018 22:10:37 +0000 (16:10 -0600)]
Rename trustedUserPresenceRequired.
The existing name is misleading, because it can be read as requiring
that a trusted user be present, rather than the intended meaning of
requiring trusted proof of user presence. Since this is all about
TEE/SE-based keys, the "trusted" part is implied, so the simple
"userPresenceRequired" name makes more sense.
Bug:
77151288
Test: Keystore CTS tests
Change-Id: If8b533b9f34a1875eaf35cdd1bb8f3709da9761b
Mihai Popa [Mon, 2 Apr 2018 19:01:09 +0000 (19:01 +0000)]
Merge "[Magnifier-36] Fix content clamping inside view" into pi-dev
am:
4ab18af48a
Change-Id: I01333effc684267875cec696fab175b01304ef43
Treehugger Robot [Mon, 2 Apr 2018 18:47:18 +0000 (18:47 +0000)]
Merge "Refactor isTetheringSupported() calls"
Android Build Merger (Role) [Mon, 2 Apr 2018 18:46:40 +0000 (18:46 +0000)]
Merge "Merge "Don't allow using raw public keys to init recovery service any more" into pi-dev am:
b152a8c45d" into pi-dev-plus-aosp
Bo Zhu [Mon, 2 Apr 2018 18:46:18 +0000 (18:46 +0000)]
Merge "Don't allow using raw public keys to init recovery service any more" into pi-dev
am:
b152a8c45d
Change-Id: Ic23e7b2e675ac0f4b2b6e306a5b8605eab4a330c
TreeHugger Robot [Mon, 2 Apr 2018 18:45:35 +0000 (18:45 +0000)]
Merge "Revise secure key import API after review" into pi-dev
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 18:43:01 +0000 (18:43 +0000)]
Merge "Adding debug message inside NetworkServiceCallback."
Android Build Merger (Role) [Mon, 2 Apr 2018 18:41:53 +0000 (18:41 +0000)]
Merge "Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev am:
bf08774704" into pi-dev-plus-aosp
Dmitry Dementyev [Mon, 2 Apr 2018 18:41:30 +0000 (18:41 +0000)]
Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev
am:
bf08774704
Change-Id: Iee0b88661e5bbe67f6dcb7aa2027d0e5b123eef3
Android Build Merger (Role) [Mon, 2 Apr 2018 18:37:32 +0000 (18:37 +0000)]
Merge "Merge "Throw an exception if the given root alias is unknown" into pi-dev am:
49eb4c1f1f" into pi-dev-plus-aosp
Bo Zhu [Mon, 2 Apr 2018 18:37:04 +0000 (18:37 +0000)]
Merge "Throw an exception if the given root alias is unknown" into pi-dev
am:
49eb4c1f1f
Change-Id: I929c1ce5c10359a188ba2354697eda5cb8c17b08
Android Build Merger (Role) [Mon, 2 Apr 2018 18:33:07 +0000 (18:33 +0000)]
Merge "Merge "Slice row redlines and animations" into pi-dev am:
9009654c1d" into pi-dev-plus-aosp
Lucas Dupin [Mon, 2 Apr 2018 18:32:37 +0000 (18:32 +0000)]
Merge "Slice row redlines and animations" into pi-dev
am:
9009654c1d
Change-Id: Id420d3c839a440d395212e30c26c67a7b79488fa
Android Build Merger (Role) [Mon, 2 Apr 2018 18:28:41 +0000 (18:28 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
07a75e0f9f -s ours" into pi-dev-plus-aosp
Bill Yi [Mon, 2 Apr 2018 18:28:15 +0000 (18:28 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
07a75e0f9f -s ours
Change-Id: I29c5bed425329d789b1bef6efb147e6bcbd4ad7b
Android Build Merger (Role) [Mon, 2 Apr 2018 18:28:07 +0000 (18:28 +0000)]
Merge "Merge "Change Locate to Map for address selections" into pi-dev am:
03061a7903" into pi-dev-plus-aosp
Jan Althaus [Mon, 2 Apr 2018 18:27:44 +0000 (18:27 +0000)]
Merge "Change Locate to Map for address selections" into pi-dev
am:
03061a7903
Change-Id: I9ce3068cc2c8b09a73b6ac1f1a9b5585c767f316
Android Build Merger (Role) [Mon, 2 Apr 2018 18:23:56 +0000 (18:23 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
38dccc3fff -s ours" into pi-dev-plus-aosp
Bill Yi [Mon, 2 Apr 2018 18:23:35 +0000 (18:23 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
38dccc3fff -s ours
Change-Id: I9239d12a182a41dcb5db4a33f2b8fdac5aef5763
Android Build Merger (Role) [Mon, 2 Apr 2018 18:23:28 +0000 (18:23 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
46b20b4e18 -s ours" into pi-dev-plus-aosp
Android Build Merger (Role) [Mon, 2 Apr 2018 18:23:18 +0000 (18:23 +0000)]
Merge "Merge "APF: drop multicast ICMPv6 while in doze mode" am:
7880e284c8 am:
f0ddd72f0f" into pi-dev-plus-aosp
Bill Yi [Mon, 2 Apr 2018 18:22:53 +0000 (18:22 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
46b20b4e18 -s ours
Change-Id: Iff28e2792dafb0ed15eb975c0ac0bc2c3599ba15
Bernie Innocenti [Mon, 2 Apr 2018 18:22:47 +0000 (18:22 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode" am:
7880e284c8
am:
f0ddd72f0f
Change-Id: I2827fc9159fe8d372d881451b9971ddcc4a0530f
Bill Yi [Mon, 2 Apr 2018 18:22:24 +0000 (18:22 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
292a890081 -s ours
Change-Id: Ifa5849d408d523391ddbb7fdd73b30b87c75f168
Bill Yi [Mon, 2 Apr 2018 18:20:16 +0000 (18:20 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
5080670104 -s ours
Change-Id: I39a96d32716dc9a19c388ee3bced8ce69d4c9980
Bill Yi [Mon, 2 Apr 2018 18:19:36 +0000 (18:19 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
89af056de6 -s ours
Change-Id: I567c278d8ef71c51aa49efc9164ff9023c0a7d4a
Bill Yi [Mon, 2 Apr 2018 18:18:53 +0000 (18:18 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
86fdaf1a6b -s ours
Change-Id: I703f51fd74171813ef4031eb697b084343b4cd4e
Bill Yi [Mon, 2 Apr 2018 18:18:24 +0000 (18:18 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
2b7c92eb4c -s ours
Change-Id: I8c8079497c4c764bb16994624ad76857daa97e20
Bill Yi [Mon, 2 Apr 2018 18:15:09 +0000 (18:15 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
7f32755459 -s ours
Change-Id: Ie0a719062161f41e9398e8468fc53ce92f356660
Bernie Innocenti [Mon, 2 Apr 2018 18:13:42 +0000 (18:13 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode"
am:
7880e284c8
Change-Id: Ie0b719e2f7391d02c859e9961fc72550c64a5249
Yi Jin [Mon, 2 Apr 2018 18:09:57 +0000 (11:09 -0700)]
Remove some letters of verbose log
Bug:
77333635
Test: N/A
Change-Id: I94b288d070dfb372edf345d369d75bb3255f631b
Lucas Dupin [Mon, 2 Apr 2018 18:05:09 +0000 (11:05 -0700)]
Remove old alarm IPC
Not necessary anymore because the alarm moved to
KeyguardSliceProvider.
Test: switch from 12 to 24h format
Change-Id: I5796edfe7251e599d76ffecc35eeab27ddcc1e0d
Fixes:
77154815
TreeHugger Robot [Mon, 2 Apr 2018 18:01:15 +0000 (18:01 +0000)]
Merge "Use modern c++ code style for incidentd." into pi-dev
Andrii Kulian [Mon, 2 Apr 2018 17:58:42 +0000 (17:58 +0000)]
Merge "Don't finish activity on duplicate resume request" into pi-dev
Sudheer Shanka [Mon, 2 Apr 2018 17:34:16 +0000 (17:34 +0000)]
Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 17:23:34 +0000 (17:23 +0000)]
Merge "Use per user info for seinfo" into pi-dev
Felipe Leme [Thu, 29 Mar 2018 17:02:32 +0000 (10:02 -0700)]
Don't use a copy of window params when showing a dialog.
When a Dialog's show() method is called, it makes a copy (l) of its window param
and change the copy's softInputMode before calling wm.addView(). This call ends
up calling WindowManagerGlobal.addView(view, l, display, parentWindow),
which in turn sets the application token from the parentWindow into l and stores
l on its mParams map.
Later, when the dialog layout is changed (for example, if it's resized), the
original params ends up passed to WindowManagerGlobal.updateViewLayout(),
which in turn updates it's internal mParams with it, hence losing the
application token (as the token was set in the copy).
Then, when Autofill (and possibly Assist) is triggered to that activity, the
Dialog's view hierarchy is ignored because WindowManagerGlobal.getRootViews()
ignores views whose params do not have an application token.
This CL fixes this issue by passing the original dialog's param to the wm
method and resetting the softInputMode that was changed, rather than making a
copy.
Test: atest DialogLauncherActivityTest
Test: manual verification with Twitch
Fixes:
68816440
Change-Id: I55f510ab7a44030bc368221b7db1a221bc2e09c8
TreeHugger Robot [Mon, 2 Apr 2018 15:32:01 +0000 (15:32 +0000)]
Merge "Fix right-most navbar icon tinting mismatch" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 15:07:25 +0000 (15:07 +0000)]
Merge "Make addUnwantedCapability method public" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 14:28:48 +0000 (14:28 +0000)]
Merge "Restore saveLayer APIs back into the public API." into pi-dev
Treehugger Robot [Mon, 2 Apr 2018 13:57:43 +0000 (13:57 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode"
Bernie Innocenti [Wed, 28 Mar 2018 11:11:49 +0000 (20:11 +0900)]
APF: drop multicast ICMPv6 while in doze mode
Some WiFi hotspots send excessive multicast IPv6 ping requests which
cause considerable power drain. Thus, drop all multicast ICMPv6 ping
requests while the device is in doze mode.
Bug:
66930077
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
Test: manual - compared generated APF bytecode using apf_disassembler
Test: manual - force idle mode while sending multicast pings to device
Change-Id: I25dbf99985cf4413b4d0e3920d281fe6d663197a
Remi NGUYEN VAN [Mon, 2 Apr 2018 11:21:22 +0000 (11:21 +0000)]
Merge "Calculate multipath quota excluding current day." into pi-dev