OSDN Git Service
Android Build Merger (Role) [Wed, 12 Apr 2017 21:34:58 +0000 (21:34 +0000)]
Merge "Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16 am:
91ed4d7553 am:
f9197e0180 -s ours" into oc-dev-plus-aosp
Svet Ganov [Wed, 12 Apr 2017 21:34:02 +0000 (21:34 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16 am:
91ed4d7553
am:
f9197e0180 -s ours
Change-Id: Ib3f118b07fbb994daa70ecbf37bc35dc4d16897b
Android Build Merger (Role) [Wed, 12 Apr 2017 21:33:41 +0000 (21:33 +0000)]
Merge "DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886 am:
f72dd4142b am:
f72b1104f3 -s ours" into oc-dev-plus-aosp
Julius D'souza [Wed, 12 Apr 2017 21:32:43 +0000 (21:32 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886 am:
f72dd4142b
am:
f72b1104f3 -s ours
Change-Id: I5d0b6cd4522507d6b8cffb88461a546de5b6f519
Svet Ganov [Wed, 12 Apr 2017 21:30:45 +0000 (21:30 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16 am:
91ed4d7553 -s ours
am:
84ec9cbace
Change-Id: I44899ea4d5c7a48d7168cb008db31f0b62b093be
Julius D'souza [Wed, 12 Apr 2017 21:29:50 +0000 (21:29 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886 am:
f72dd4142b -s ours
am:
3a967f92f2
Change-Id: I925d8a6b9bfb9e3020fd3a5a01794f4cc0243be4
Svet Ganov [Wed, 12 Apr 2017 21:28:45 +0000 (21:28 +0000)]
Merge "Add autofill feature API" into oc-dev
am:
a402d6dd2f
Change-Id: I5cfa36adbf31c49dffc519963545f388cae4b96d
Dianne Hackborn [Wed, 12 Apr 2017 21:27:27 +0000 (21:27 +0000)]
Merge "Add API to get a uid's current importance." into oc-dev
am:
ad6ab44e15
Change-Id: I845cb5fd01ccedd4a95093c56a320ee1f6497dac
Makoto Onuki [Wed, 12 Apr 2017 21:26:08 +0000 (21:26 +0000)]
Merge ""bmgr restore" really should wait until operation finishes." into oc-dev
am:
b4c2e6f468
Change-Id: Ic8779cbe121fcc2108bc742a6a9f2be866c76df3
Svet Ganov [Wed, 12 Apr 2017 21:22:08 +0000 (21:22 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16
am:
91ed4d7553
Change-Id: I8c34b0ee542819bb254183a96845e925bce2b0a8
Svet Ganov [Wed, 12 Apr 2017 21:21:56 +0000 (21:21 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16
am:
91ed4d7553 -s ours
Change-Id: Ia744f56107b83b6a5d5e236d24641bd7db71ab02
Dianne Hackborn [Wed, 12 Apr 2017 21:21:52 +0000 (21:21 +0000)]
Merge "Fix issue #
37220301: Allow broadcasts with permissions to not be restricted" into oc-dev
am:
f74210c3a3
Change-Id: I1ed7f3e0cf3ee644bdbe5cb87b06f8b910d9ddec
Julius D'souza [Wed, 12 Apr 2017 21:20:50 +0000 (21:20 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886
am:
f72dd4142b
Change-Id: I9466a9f2a35ac3f81b2203347afc9f2f62587b20
Julius D'souza [Wed, 12 Apr 2017 21:20:47 +0000 (21:20 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886
am:
f72dd4142b -s ours
Change-Id: Ia99beb815b720219daecfdc9446c5ff2c4d1b16f
Selim Gurun [Wed, 12 Apr 2017 21:19:16 +0000 (21:19 +0000)]
Merge "Deprecate findAddress() method" into oc-dev
am:
c68b1a8aef
Change-Id: I667ebcf6a9a18ae5a07a7e0f737abb6162568f83
TreeHugger Robot [Wed, 12 Apr 2017 21:17:29 +0000 (21:17 +0000)]
Merge "Add autofill feature API" into oc-dev
Shuo Qian [Wed, 12 Apr 2017 21:11:58 +0000 (21:11 +0000)]
Merge "ECBM SystemProperty cleanup" am:
4718606368 am:
40cde7b71f
am:
36611a0958
Change-Id: Ib68a4e3b34ad4d76e4b254350b523eaa424b30f9
Svet Ganov [Wed, 12 Apr 2017 21:11:57 +0000 (21:11 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
am:
39c3d2cf16
Change-Id: I3ddf7e0ceadd7c179f3c7de198658af190985f1b
Dianne Hackborn [Wed, 12 Apr 2017 21:11:40 +0000 (21:11 +0000)]
Merge "Add API to get a uid's current importance." into oc-dev
Julius D'souza [Wed, 12 Apr 2017 21:10:49 +0000 (21:10 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
am:
0a8ecc6886
Change-Id: I262e7497e9256f708847ba7c767f202c91aa1739
Makoto Onuki [Wed, 12 Apr 2017 21:10:32 +0000 (21:10 +0000)]
Merge ""bmgr restore" really should wait until operation finishes." into oc-dev
Dianne Hackborn [Wed, 12 Apr 2017 21:09:59 +0000 (21:09 +0000)]
Merge "Fix issue #
37220301: Allow broadcasts with permissions to not be restricted" into oc-dev
Shuo Qian [Wed, 12 Apr 2017 21:06:20 +0000 (21:06 +0000)]
Merge "ECBM SystemProperty cleanup" am:
4718606368
am:
40cde7b71f
Change-Id: I51ec750ff1833b1982d8fdc1995c1d8d29b36976
Selim Gurun [Wed, 12 Apr 2017 21:05:03 +0000 (21:05 +0000)]
Merge "Deprecate findAddress() method" into oc-dev
Shuo Qian [Wed, 12 Apr 2017 21:00:50 +0000 (21:00 +0000)]
Merge "ECBM SystemProperty cleanup"
am:
4718606368
Change-Id: Ie6b43fd0a0bfa7c813960d1bb53b7b57a4f82721
TreeHugger Robot [Wed, 12 Apr 2017 21:00:21 +0000 (21:00 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
Android Build Merger (Role) [Wed, 12 Apr 2017 20:54:56 +0000 (20:54 +0000)]
Merge changes from topic 'am-
e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'ipsec-api-tweaks' am:
fddf677b8b am:
176bfb58c6 am:
a237a34085
IpSecManager and IpSecAlgorithm API Tweaks am:
6045429b35 am:
9c2428ad4d am:
99c50add4f
nharold [Wed, 12 Apr 2017 20:53:17 +0000 (20:53 +0000)]
Merge changes from topic 'ipsec-api-tweaks' am:
fddf677b8b am:
176bfb58c6
am:
a237a34085
Change-Id: Ie868985d20535f35b869730a4ddaa00dc88a352d
Shuo Qian [Wed, 12 Apr 2017 20:52:18 +0000 (20:52 +0000)]
Merge "ECBM SystemProperty cleanup"
Nathan Harold [Wed, 12 Apr 2017 20:51:41 +0000 (20:51 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks am:
6045429b35 am:
9c2428ad4d
am:
99c50add4f
Change-Id: I49641308cd0f2ce3e8a7545c8b03108d69287c64
Jason Monk [Wed, 12 Apr 2017 20:50:32 +0000 (20:50 +0000)]
Merge "Make QS light" into oc-dev
am:
755138bb1c
Change-Id: I2a76725f4fb4edb0fa478619b28498c9bfc490ac
TreeHugger Robot [Wed, 12 Apr 2017 20:43:13 +0000 (20:43 +0000)]
Merge "Make QS light" into oc-dev
Bill Yi [Wed, 12 Apr 2017 20:27:30 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
88ab6c1304 -s ours
Change-Id: I5f4ab216d538b793f1b9437a9e44320e2412b9cc
Bill Yi [Wed, 12 Apr 2017 20:19:34 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Todd Kennedy [Wed, 12 Apr 2017 20:00:09 +0000 (20:00 +0000)]
Merge "Allow instant app resolution for any user" into oc-dev
am:
e7b806e9d2
Change-Id: Ic1dbc09e11aab6aacf66e0106274281534515b2d
Seigo Nonaka [Wed, 12 Apr 2017 19:55:52 +0000 (19:55 +0000)]
Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev
am:
1e924df63e
Change-Id: I484cd07fb67b40b54d7ad4b1ae7324a0d370ed6a
Jesse Evans [Wed, 12 Apr 2017 19:52:07 +0000 (19:52 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
am:
684b5381e9
Change-Id: I3be91519cbe8b7c3cef474923a30927504e68642
TreeHugger Robot [Wed, 12 Apr 2017 19:45:50 +0000 (19:45 +0000)]
Merge "Allow instant app resolution for any user" into oc-dev
Jaewan Kim [Wed, 12 Apr 2017 19:45:21 +0000 (19:45 +0000)]
Merge "Add documentation for 'am start-foreground-service'" into oc-dev
am:
e7ce1d40e1
Change-Id: I4202bc13102f35b8d3cd4b328c5a1de49b7cb08e
Seigo Nonaka [Wed, 12 Apr 2017 19:39:41 +0000 (19:39 +0000)]
Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:39:12 +0000 (19:39 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:37:22 +0000 (19:37 +0000)]
Merge "Add documentation for 'am start-foreground-service'" into oc-dev
Julia Reynolds [Wed, 12 Apr 2017 19:24:55 +0000 (19:24 +0000)]
Merge "Clear calling identity before verifying listeners" into oc-dev
am:
43dd3ba3c4
Change-Id: I05a728d069a06f4ec36dff79db022407f4d3504c
Casey Burkhardt [Wed, 12 Apr 2017 19:14:04 +0000 (19:14 +0000)]
Merge "Improved multiuser support for A11y button/Magnification" into oc-dev
am:
9aa64e6cfa
Change-Id: Ia7a56ce9ddc39d1e9e5d814d593dba96c95ae957
Julia Reynolds [Wed, 12 Apr 2017 19:13:01 +0000 (19:13 +0000)]
Merge "Clear calling identity before verifying listeners" into oc-dev
Julius D'souza [Wed, 12 Apr 2017 06:41:27 +0000 (23:41 -0700)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
Bug:
36515029
Test: the build still works.
Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84
(cherry picked from commit
8e9ea907448c49f573dd045707e37dd14efdf152)
Casey Burkhardt [Wed, 12 Apr 2017 19:04:12 +0000 (19:04 +0000)]
Merge "Improved multiuser support for A11y button/Magnification" into oc-dev
Svet Ganov [Wed, 12 Apr 2017 19:03:26 +0000 (19:03 +0000)]
Merge "Fill UI polish" into oc-dev
am:
c9a83326c2
Change-Id: Iafae2e819d836a1bda463898695f2fbf9334299b
TreeHugger Robot [Wed, 12 Apr 2017 18:54:28 +0000 (18:54 +0000)]
Merge "Fill UI polish" into oc-dev
Kang Li [Wed, 12 Apr 2017 18:41:21 +0000 (18:41 +0000)]
Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev
am:
1f477fb270
Change-Id: Ibab9026c9330218e459091f5d53505a64c039ce8
Mady Mellor [Wed, 12 Apr 2017 18:40:12 +0000 (18:40 +0000)]
Merge "Don't offer snooze for foreground service notifications" into oc-dev
am:
8f395a16fb
Change-Id: Ieb5ea626ed2fb83a4959f85be097d0f5563e1471
nharold [Wed, 12 Apr 2017 18:39:15 +0000 (18:39 +0000)]
Merge changes from topic 'ipsec-api-tweaks' am:
fddf677b8b
am:
176bfb58c6
Change-Id: I056e52c4c3bf41ffaf482ebaf4c7b14a9091f3ca
Nathan Harold [Wed, 12 Apr 2017 18:37:23 +0000 (18:37 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks am:
6045429b35
am:
9c2428ad4d
Change-Id: I6f7e2011a273d10386b72391d12a0ce55f18ffd7
Charles He [Wed, 12 Apr 2017 18:36:10 +0000 (18:36 +0000)]
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
am:
9f074e2224
Change-Id: Ie57c07ed9caee3ee66847cbedc4b10b79bcd9abe
TreeHugger Robot [Wed, 12 Apr 2017 18:33:18 +0000 (18:33 +0000)]
Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev
nharold [Wed, 12 Apr 2017 18:29:04 +0000 (18:29 +0000)]
Merge changes from topic 'ipsec-api-tweaks'
am:
fddf677b8b
Change-Id: I0c0812164e8fa4b36fd43f00b7388d4c0cc337f1
Mady Mellor [Wed, 12 Apr 2017 18:27:23 +0000 (18:27 +0000)]
Merge "Don't offer snooze for foreground service notifications" into oc-dev
Nathan Harold [Wed, 12 Apr 2017 18:27:09 +0000 (18:27 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks
am:
6045429b35
Change-Id: I93d58f64834e5a4c7bc1bf03a5baf2eb5364a36d
Bill Yi [Wed, 12 Apr 2017 18:26:14 +0000 (18:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
2d1fb47916 -s ours
Change-Id: Ie7184d013593bad3c8b70974917236fd1717bd6a
Charles He [Wed, 12 Apr 2017 18:25:46 +0000 (18:25 +0000)]
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
Siyamed Sinir [Wed, 12 Apr 2017 18:17:57 +0000 (18:17 +0000)]
Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev
am:
37bfd57ead
Change-Id: I9ccf940b5e2d47bbb29fcb12bea3c20d2ea9ae69
TreeHugger Robot [Wed, 12 Apr 2017 18:17:48 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
nharold [Wed, 12 Apr 2017 18:13:55 +0000 (18:13 +0000)]
Merge changes from topic 'ipsec-api-tweaks'
* changes:
Add FileDescriptor Versions of applyTransportModeTransform()
IpSecManager and IpSecAlgorithm API Tweaks
Siyamed Sinir [Wed, 12 Apr 2017 18:09:50 +0000 (18:09 +0000)]
Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev
Makoto Onuki [Wed, 12 Apr 2017 17:10:22 +0000 (10:10 -0700)]
"bmgr restore" really should wait until operation finishes.
Test: manual test
Bug
37246838
Change-Id: Ice381dc250e2d2a59cff48152dd3c8d6897d0804
Dianne Hackborn [Wed, 12 Apr 2017 18:02:53 +0000 (18:02 +0000)]
Merge "Add new "work queue" feature to JobScheduler." into oc-dev
am:
0a0a63c8b1
Change-Id: I646a3a144833650f9ee7b9727f73ee78c7c82532
Powei Feng [Wed, 12 Apr 2017 18:01:12 +0000 (18:01 +0000)]
Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev
am:
f63cb49b15
Change-Id: If3d06de8fcc60080b51bb367ddc37b3d924af0b3
Dianne Hackborn [Wed, 12 Apr 2017 17:55:49 +0000 (17:55 +0000)]
Merge "Add new "work queue" feature to JobScheduler." into oc-dev
Dianne Hackborn [Wed, 12 Apr 2017 17:54:03 +0000 (10:54 -0700)]
Add API to get a uid's current importance.
This is kind-of useful to go along with monitoring
uid importance changes.
Test: none yet
Change-Id: Ic0f8418955d17ea21d06f49dcd9641bc5f32387b
TreeHugger Robot [Wed, 12 Apr 2017 17:52:56 +0000 (17:52 +0000)]
Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev
Derek Sollenberger [Wed, 12 Apr 2017 17:49:19 +0000 (17:49 +0000)]
Merge "Change behavior of setBitmap to cleanly reset the canvas" into oc-dev
am:
7944962b7e
Change-Id: Iced04463ac3e7f0ff696f2cf75dc064cf704863f
Seigo Nonaka [Wed, 12 Apr 2017 17:37:54 +0000 (17:37 +0000)]
Merge "Remove unused public APIs." into oc-dev
am:
feaa8b0f01
Change-Id: I7ffbb8a98d342f12304bb85ce45498790363703c
TreeHugger Robot [Wed, 12 Apr 2017 17:37:01 +0000 (17:37 +0000)]
Merge "Change behavior of setBitmap to cleanly reset the canvas" into oc-dev
Soonil Nagarkar [Wed, 12 Apr 2017 17:36:30 +0000 (17:36 +0000)]
Merge "Fix foreground importance bug in LocationManagerService." into oc-dev
am:
25a263a303
Change-Id: If35b625802224f7f1dbfb24d83e469093bdc718b
TreeHugger Robot [Wed, 12 Apr 2017 17:31:38 +0000 (17:31 +0000)]
Merge "Remove unused public APIs." into oc-dev
Soonil Nagarkar [Wed, 12 Apr 2017 17:27:40 +0000 (17:27 +0000)]
Merge "Fix foreground importance bug in LocationManagerService." into oc-dev
Dongwon Kang [Wed, 12 Apr 2017 17:19:53 +0000 (17:19 +0000)]
Merge "TIF: add review rating columns to programs" into oc-dev
am:
bf02434e79
Change-Id: Ia359606a44ce4f08b4460443f803c204845f2c3d
Jorim Jaggi [Wed, 12 Apr 2017 17:18:06 +0000 (17:18 +0000)]
Merge "Disallow task snapshot starting window for intent != ACTION_MAIN" into oc-dev
am:
fe99773a70
Change-Id: I88f17c51cb020ed30b771a1bebfa565640f262fc
Jorim Jaggi [Wed, 12 Apr 2017 17:16:44 +0000 (17:16 +0000)]
Merge "Fix NPE in TaskSnapshotController" into oc-dev
am:
6846676b9b
Change-Id: Id27ee1c5147bbceddf36c3159d6fbf654ab965f7
Jason Monk [Wed, 12 Apr 2017 17:15:25 +0000 (17:15 +0000)]
Merge "Updates for QS DND tile" into oc-dev
am:
88b8dc5211
Change-Id: I091681155cfc263598d9fd918873d7269d3eee32
Dongwon Kang [Wed, 12 Apr 2017 17:12:13 +0000 (17:12 +0000)]
Merge "TIF: add review rating columns to programs" into oc-dev
Jason Monk [Wed, 12 Apr 2017 17:12:04 +0000 (17:12 +0000)]
Merge "Visual changes to dual target tiles" into oc-dev
am:
ec9afcd4c5
Change-Id: I3efde6087bb26ec580e0f685fa11687d7ce48ae1
George Mount [Wed, 12 Apr 2017 17:09:32 +0000 (17:09 +0000)]
Merge "Ensure bounds are updated together." into oc-dev
am:
a968d33edb
Change-Id: I462a00824c15864a5f68cd9a647da68f9119aff0
Seigo Nonaka [Wed, 12 Apr 2017 17:07:53 +0000 (17:07 +0000)]
Merge "Introduce FILE_ID for TTC fonts and variation fonts." into oc-dev
am:
33aae89f29
Change-Id: I8398ce892052a0c3fd67560d3fab25ed15210ee4
Jorim Jaggi [Wed, 12 Apr 2017 17:06:10 +0000 (17:06 +0000)]
Merge "Disallow task snapshot starting window for intent != ACTION_MAIN" into oc-dev
Jorim Jaggi [Wed, 12 Apr 2017 17:04:07 +0000 (17:04 +0000)]
Merge "Fix NPE in TaskSnapshotController" into oc-dev
Jason Monk [Wed, 12 Apr 2017 17:00:34 +0000 (17:00 +0000)]
Merge "Updates for QS DND tile" into oc-dev
Jason Monk [Wed, 12 Apr 2017 16:59:56 +0000 (16:59 +0000)]
Merge "Visual changes to dual target tiles" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 16:59:28 +0000 (16:59 +0000)]
Merge "Ensure bounds are updated together." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 16:54:43 +0000 (16:54 +0000)]
Merge "Introduce FILE_ID for TTC fonts and variation fonts." into oc-dev
Svet Ganov [Wed, 12 Apr 2017 16:25:20 +0000 (09:25 -0700)]
Add autofill feature API
We now have a software feature for autofill which can be used
by partners to disable it on low-end devices or form factors
for which autofill doesn't make sense.
bug:
35956220
Test: manual (requires a custom build)
Change-Id: I6c06462ed9ca3ae93331700dce38a8c08dfd0722
Svet Ganov [Wed, 12 Apr 2017 06:10:43 +0000 (23:10 -0700)]
Fill UI polish
1. Avoid jank when the suggesting list scrolled
2. Remove hard-coded values from max popup height
3. UX requested tweaks
4. Remove dead code
Test: manual
bug:
37245055
bug:
37179467
Change-Id: I6a6760edb06230e3d4925e23863667cfd3ac0601
Daniel Nishi [Wed, 12 Apr 2017 16:43:42 +0000 (16:43 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
am:
feada91060
Change-Id: I11d4cd7a4acb384c3a4d134d55d8630de24ce533
Dmitri Plotnikov [Wed, 12 Apr 2017 16:42:30 +0000 (16:42 +0000)]
Merge "Fixing content intent on External Storage notification" into oc-dev
am:
5a667c8eb1
Change-Id: I903ee416c140438805289a946d568e20b9c5ca80
Daniel Nishi [Wed, 12 Apr 2017 16:37:47 +0000 (16:37 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
Charles He [Wed, 12 Apr 2017 15:22:35 +0000 (16:22 +0100)]
Disallow direct-boot aware activities to bypass work lock
Effectively reverting
89927b3cd96472c478a988d6c731cd09d412a043, which
allowed direct-boot aware activities in the work profile to show before
the profile was unlocked. This causes problems with key eviction
introduced in O. Specifically, many system activities (e.g.
ChooserActivity, activities in Settings, etc.) are marked direct-boot
aware, and therefore can be started while the work profile is locked
with key evicted. Currently they either bypass the keyguard when they
should not, or simply crash due to profile still being locked.
In the future, we need to create a new mechanism to allow activities
such as video calls, alarm clocks, etc. to bypass the work keyguard. It
probably involves checking for something like FLAG_SHOW_WHEN_LOCKED.
Bug:
36961785
Bug:
35708183
Bug:
30296144
Test: manual, by following the steps in the bugs quoted
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I5ccaaf963f3dd96e4abb785a10aa258b15363178
Dmitri Plotnikov [Wed, 12 Apr 2017 16:34:27 +0000 (16:34 +0000)]
Merge "Fixing content intent on External Storage notification" into oc-dev
Svet Ganov [Mon, 5 Dec 2016 17:03:24 +0000 (09:03 -0800)]
[DO NOT MERGE] Allow multiple toasts for the focused app
We don't allow apps to add multiple toast windows to
prevent an attacker to keep adding the same toast as
a workaround for our measure to ensure toast windows
are removed after a timeout. The may cause backwards
compatibility issue for apps that add multiple toasts.
While we need to fix the security vulnerability it is
desirable to make the fix as backwards compatible as
possible. This change allows the focused app to add
as many toast windows as it wants since they will be
removed after the timeout and once the app is not the
one the user uses it will lose the multiple toast add
capability.
bug:
30150688
Change-Id: I2d9295926cb49b5bb80c7af2546872ff8ca22c64
(cherry picked from commit
296a60acc3d67cea23bae167dbcb51c0d0d60b23)
Russell Brenner [Wed, 12 Apr 2017 16:15:25 +0000 (16:15 +0000)]
Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev
am:
27ce8b0d34
Change-Id: If690b190990b1ca49a5efbc1994b8b09b332630e
Julia Reynolds [Wed, 12 Apr 2017 13:41:16 +0000 (09:41 -0400)]
Clear calling identity before verifying listeners
Also don't throw when can't verify listener.
And update mocking in tests to clean state between tests.
Bug:
36783632
Fixes:
37263567
Test: runtest-systemui-notification, create a secondary user
Change-Id: I5ec95539c9859b67b8fbc7e6a85334e08e6b5a98
OSDN Git Service
