Commit Graph

8623 Commits

Author SHA1 Message Date
Adrian Roos
e5b0923a02 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: efc9c88d00
am: 31459c3202

* commit '31459c32028951101a338abf95e48d9143444914':
  Fix broken MessagingStyle

Change-Id: Ibc65e18c45862df50fc651028ce2347af886d7c6
2016-05-17 21:38:31 +00:00
Adrian Roos
31459c3202 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700
am: efc9c88d00

* commit 'efc9c88d002263f748716405f7e63becc3685211':
  Fix broken MessagingStyle

Change-Id: Ia328b569b347cb29ddc82b5fcce3efee6bfc7734
2016-05-17 21:22:39 +00:00
Adrian Roos
efc9c88d00 Merge "Fix broken MessagingStyle" into nyc-dev
am: 8802fd0700

* commit '8802fd0700e40ce97555f70db1b02daeece3bfb5':
  Fix broken MessagingStyle

Change-Id: I31975da4749c801a8fbf3bfffb666daa69c9c2af
2016-05-17 21:17:33 +00:00
Adrian Roos
8802fd0700 Merge "Fix broken MessagingStyle" into nyc-dev 2016-05-17 21:02:25 +00:00
Dianne Hackborn
fab87630f3 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5 am: a24af982ff
am: ae5664af28

* commit 'ae5664af28e78c685c4ffec671254d75f1c932fb':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: I96430b2073f2aafba489e5d2a0d11822709f4206
2016-05-17 18:44:56 +00:00
Dianne Hackborn
ae5664af28 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5
am: a24af982ff

* commit 'a24af982fffeeb6d3d4919907b5c27064c5a8ff1':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iea2b8a6b86f10122ea763e93e1516fce43e58dfa
2016-05-17 18:39:42 +00:00
Dianne Hackborn
4d7e92b56b Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iaf3102ba03cf2242b02030aa24df8282ed3fbdc8
2016-05-17 18:38:28 +00:00
Dianne Hackborn
a24af982ff Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: I749b455402caef335239b540ec8883a8d7b2a974
2016-05-17 18:32:46 +00:00
Michael Kwan
3ffbb6e7f9 Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev am: 59bce44aaa
am: 4fab094b07

* commit '4fab094b0731686d84c09f42f9e2380ce0f85b1b':
  Modified AlertController to allow themes to specify custom implementation.

Change-Id: I90e8e527d9628d17a8281ad5b2b79d9090841f3b
2016-05-17 18:20:23 +00:00
Dianne Hackborn
607844efa5 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 2016-05-17 18:19:36 +00:00
Michael Kwan
4fab094b07 Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev
am: 59bce44aaa

* commit '59bce44aaaad61c5bd57ddcc1225e69ad5d0500b':
  Modified AlertController to allow themes to specify custom implementation.

Change-Id: Ice8251602843a6a98552bcb85272d8cc9eefae2b
2016-05-17 18:14:47 +00:00
Michael Kwan
59bce44aaa Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev 2016-05-17 18:03:38 +00:00
Phil Weaver
2a72e8b390 Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 am: 11ece94702
am: 3070a2a97c

* commit '3070a2a97c40f78b0f716a92b8428ea9815d3d83':
  Hide UiAutomation#destroy as test api.

Change-Id: I81b65ece02a7b48bbc93d12f032af2bc8cced820
2016-05-17 17:41:19 +00:00
Phil Weaver
11ece94702 Merge "Hide UiAutomation#destroy as test api." into nyc-dev
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: I91cbc4571a110be81f1c25fc0f19fed81d3b2819
2016-05-17 17:32:24 +00:00
Phil Weaver
89d3ba72b7 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 2016-05-17 17:27:01 +00:00
Clara Bayarri
d1ad651149 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev am: bee2648027 am: 60d0910dc8
am: 4cfd27f9aa

* commit '4cfd27f9aa10bcbf272935e142d1171730e7c7b9':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: Ia8c7ede8cf8ebd706cfdf51024c001a9538be49a
2016-05-17 09:27:59 +00:00
Clara Bayarri
60d0910dc8 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev
am: bee2648027

* commit 'bee26480277234cb599a7131cd24ce3c5108e474':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: I1b5a1455199ba8e6ef6c877d7f4d4b13256eb1c6
2016-05-17 09:21:15 +00:00
Clara Bayarri
bee2648027 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 2016-05-17 09:12:36 +00:00
Wale Ogunwale
fde6b69095 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 33cffe3717
am: f5a87d86bf

* commit 'f5a87d86bf08b564d2db00bf626092721e348e61':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: Ie5cf7842a219fedd849bc161899df113f383c944
2016-05-17 01:10:44 +00:00
Wale Ogunwale
33cffe3717 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I9e3bc8825d837abe61d31dea27249f7bce6e7f9d
2016-05-17 00:57:25 +00:00
TreeHugger Robot
b406dd20ee Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 2016-05-17 00:51:41 +00:00
Wale Ogunwale
3b23239d6e Fixed bugs with starting windows when displayng forcedResized activity
- Added ActivityOption to mark a starting activity as a taskOverlay
activity. That is the activity will always be the top activity of the
task and doesn't cause the task to be moved to the front when it is added.
- Only set the starting window state of the ActivityRecord to shown if
window manager actually showed the starting window for the activity.
Avoids incorrectly trying to remove starting window for an activity that
didn't show any.
- When starting additional activity in a task, transfer the starting
window from the top most activity with a starting window. It is possible
the top most window does have a starting window like in the case of the
forcedResized activity.
- Only ensure visiblity of an activity we are starting in a task whose top
activity is a task overlay. They need to start in the visible-paused state
and not the resumed state which just causes extra churn in the system.
- Always add additional starting activities in a task with an overlay
activity below the overlay activity.

Bug: 28751186
Change-Id: I3624a4313ae9c406d42c67a3537f67ad685791af
2016-05-16 16:27:01 -07:00
Michael Kwan
cc6e6f0e0a Modified AlertController to allow themes to specify custom implementation.
Bug: 17733928
Change-Id: I0264ee8ceee09dbc33da61365c424c74d2e3c3d6
2016-05-16 15:36:22 -07:00
Phil Weaver
e6269c3f1d Hide UiAutomation#destroy as test api.
Bug: 28771617
Change-Id: Ib113883d3d12fc6a9e8c038e2c4eb1731b026b38
2016-05-16 12:55:08 -07:00
Clara Bayarri
ab591ba4b6 Remove "if it succeeds" wording from requestShowKeyboardShortcuts
Bug: 28775576
Change-Id: Ib7bc2d78cc074c14384f5a86437c684462f1fb54
2016-05-16 17:48:16 +01:00
Clara Bayarri
bec98ff68b Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d34396443e am: 8184f2e545
am: 8bccf39875

* commit '8bccf39875b479c6e09eab3b107817028d90c793':
  Rename requestKeyboardShortcutsHelper

Change-Id: I83b36970bf652530797d7f383dbbbd090cd972ca
2016-05-16 15:18:36 +00:00
Clara Bayarri
8184f2e545 Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev
am: d34396443e

* commit 'd34396443e712a96572d26c820809a9485e57da3':
  Rename requestKeyboardShortcutsHelper

Change-Id: I0522d4d9bcfdce6b79dc672dcc0c515dc747b99d
2016-05-16 15:08:15 +00:00
Clara Bayarri
ac6f034f2a Rename requestKeyboardShortcutsHelper
Per API council feedback

Bug: 28775576
Change-Id: I1c4f98d7ec0d848f0c387aaedf8a0ed80628c64e
2016-05-16 14:15:14 +01:00
Narayan Kamath
9782056f16 LoadedApk: Avoid unnecessary work when mIncludeCode == false. am: 8995b00ce8 am: 150664c275
am: 9bfcf64542

* commit '9bfcf6454267deb29a517f20e9df9700a4c788cc':
  LoadedApk: Avoid unnecessary work when mIncludeCode == false.

Change-Id: I12d74bc35989d5e1a28481531b12d0ef882ab29e
2016-05-16 10:51:43 +00:00
Narayan Kamath
150664c275 LoadedApk: Avoid unnecessary work when mIncludeCode == false.
am: 8995b00ce8

* commit '8995b00ce8f68f2a285a97c2ce711bea8c61179e':
  LoadedApk: Avoid unnecessary work when mIncludeCode == false.

Change-Id: Ib34104b27c85d4b74e8505ca3030ae5578ed4599
2016-05-16 10:45:24 +00:00
Narayan Kamath
8995b00ce8 LoadedApk: Avoid unnecessary work when mIncludeCode == false.
We don't need to set up JIT profiles and register usage etc when
the package context we're trying to construct doesn't request code.

This will correct accounting for packages which are only used for
resources.

bug: 28519185
Change-Id: I849675efa76c8100ae937de478b52254babe384c
2016-05-16 10:39:08 +00:00
Dianne Hackborn
0c4e6a8da3 Fix issue #27532364: Security Vulnerability in IIntentSender.send
We need to make IIntentSender oneway...  but when the system is
calling that for itself, it needs to be able to return a result code.

Solution: instead of directly calling the interface, we have a new
IPC through the activity manager.  If the thing being used is the
activity manager impl, it can do the synchronous send and return
the result directly in place.  If not, you only get asynchronous
sending and thus never a failure result back (too bad for you!).

Change-Id: I4096e5b00063e8dba66230585a2dfe67e35e8092
2016-05-13 17:37:08 -07:00
Andrew Solovay
e7ffd8086f docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e am: f975b74c0c am: 0b15a5c94f
am: 3882169d7f

* commit '3882169d7f43e011ad77adb05aca2e5d6175c7f0':
  docs: Updates to multi-window and related docs.

Change-Id: Ief8906a4c0e57229b433c4e89c23990d957a4014
2016-05-13 22:16:16 +00:00
Andrew Solovay
0b15a5c94f docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e
am: f975b74c0c

* commit 'f975b74c0c60160092262fbc05f42f7e2584f0bd':
  docs: Updates to multi-window and related docs.

Change-Id: Ia7b8adbe3140a59d2e2433b3795e58a16763527c
2016-05-13 22:10:49 +00:00
Andrew Solovay
f975b74c0c docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572
am: d29c26073e

* commit 'd29c26073e97e4c6e7825641cf6e76720df395e3':
  docs: Updates to multi-window and related docs.

Change-Id: Ic4be60debb41d074d717bfb0989125299428831a
2016-05-13 22:08:17 +00:00
Adam Powell
c68c2b44ab Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992 am: 46ca7d8c28
am: bbb2c35902

* commit 'bbb2c359023a0cd8ee3790235ed35cec2c13ea27':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I0561042957f8f150c5206cd5a3cfb3b2d5ce4035
2016-05-13 22:03:16 +00:00
Andrew Solovay
d29c26073e docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3
am: c88130c572

* commit 'c88130c5724227b3ba7ef0b5ef4476fedabca650':
  docs: Updates to multi-window and related docs.

Change-Id: I308c988e3a93737a478f9f2445b512e86f218643
2016-05-13 22:03:15 +00:00
Adam Powell
bbb2c35902 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992
am: 46ca7d8c28

* commit '46ca7d8c288da4414f40de7e8b1d8f929816bd82':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I6862300fc5aff480c4215d66eb8c9167ed17e448
2016-05-13 22:00:46 +00:00
Adam Powell
f1dda81c42 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev
am: a6c0cc0992

* commit 'a6c0cc099221a5321505b1343f623e76f52b2ad5':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I9138e3ee5706cbd35a119843f0007f548021e2f9
2016-05-13 21:57:57 +00:00
Adam Powell
e30299f990 Add Fragment#onAttachFragment for parent fragments
Framework edition

Add a matching onAttachFragment method to Fragment to match the
fragment host version.

Bug 28760393

Change-Id: I5f50b3446449cae7110da6b4e468ee80f413e1e5
2016-05-13 13:38:45 -07:00
Andrew Solovay
4d93a21980 docs: Updates to multi-window and related docs.
Clarified behavior when activity is resized or put in fullscreen
mode, per b/28580007 . Also (per email from o-o) removed misleading
statement about when onStop() might or might not be called.

Both changes can go live now (multiwindow update applies to DP1 & 2,
and onStop() clarification applies to all versions of API), so I'll
submit as soon as this is approved.

See first comment for doc stage location.

bug: 28580007
Change-Id: Ib008f24e5796ec7810b67c91e512e679680d4afd
2016-05-13 13:33:55 -07:00
Adrian Roos
fbddd2c39c Fix broken MessagingStyle
Messages with a "null" sender indicating a message from
the local user did not correctly unparcel.

Change-Id: I7d42d5dc407ebd8d1e3b5451f72f52cc1543a32d
Fixes: 28763122
2016-05-13 12:57:34 -07:00
Andrii Kulian
42a2e42f94 Merge "Close leaked windows when trying to preserve main one" into nyc-dev am: 4ef107bb7a am: 1c4c2caa4c
am: 49f7135fef

* commit '49f7135fef3a982edd04a292a8c46afff4d6ef86':
  Close leaked windows when trying to preserve main one

Change-Id: Ic83f1f4a07bed89bf77e96ae16a273c859624948
2016-05-13 03:35:42 +00:00
Andrii Kulian
1c4c2caa4c Merge "Close leaked windows when trying to preserve main one" into nyc-dev
am: 4ef107bb7a

* commit '4ef107bb7ad0c1f28db710374bb118e6658d3238':
  Close leaked windows when trying to preserve main one

Change-Id: I20b5d6ab8adbb97cffca52e1daf66ed939d508b8
2016-05-13 03:30:45 +00:00
Andrii Kulian
4ef107bb7a Merge "Close leaked windows when trying to preserve main one" into nyc-dev 2016-05-13 03:24:34 +00:00
Dimitry Ivanov
e543776d59 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b am: 76766d29b3
am: 61820a6a63

* commit '61820a6a63e4a10fdab7f9bf7a9e33b0744be253':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: Iee0980f34860e51e64aa6d0f9d12abf730d4343f
2016-05-12 21:26:16 +00:00
Dimitry Ivanov
76766d29b3 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev
am: 7f0708390b

* commit '7f0708390b3006965fe640c72c4254eb74daca3a':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: I406dad31babb52d601e1212c4672f1ce7cd9aa57
2016-05-12 21:21:25 +00:00
Jesse Hall
7f0708390b Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev 2016-05-12 21:13:26 +00:00
Adrian Roos
9240b15a1a Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b am: f46fdf877e
am: d5bd2b647c

* commit 'd5bd2b647c8f0acaffae72090748d346cae2351b':
  DPM control for remote input when locked

Change-Id: Ic97f9dbb0f4013709b62ee8dbf7d49c29c5fe807
2016-05-12 21:04:41 +00:00
Adrian Roos
d5bd2b647c Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b
am: f46fdf877e

* commit 'f46fdf877ef54adc236698635967ff79d7a0dfe2':
  DPM control for remote input when locked

Change-Id: I7eb3cdf17b4a61865bfe85ae6d9c281b113aeb9f
2016-05-12 21:01:32 +00:00