Commit Graph

6582 Commits

Author SHA1 Message Date
Todd Kennedy
04d6a65f51 Merge "Retain fragment loaders" into mnc-dr-dev am: ad968cf4e5 am: 6320767fb1 am: 02940eb47f
am: 186fcb8b64

* commit '186fcb8b648edd31f7a59a358587264659e84f4f':
  Retain fragment loaders
2015-10-20 21:38:55 +00:00
Todd Kennedy
186fcb8b64 Merge "Retain fragment loaders" into mnc-dr-dev am: ad968cf4e5 am: 6320767fb1
am: 02940eb47f

* commit '02940eb47fc1bdb3b069e42190bf8a70a9b916bf':
  Retain fragment loaders
2015-10-20 14:58:40 +00:00
Todd Kennedy
6320767fb1 Merge "Retain fragment loaders" into mnc-dr-dev
am: ad968cf4e5

* commit 'ad968cf4e55afdd897ea84a44b7450442aea1e1d':
  Retain fragment loaders
2015-10-20 14:41:23 +00:00
Todd Kennedy
ad968cf4e5 Merge "Retain fragment loaders" into mnc-dr-dev 2015-10-20 14:36:00 +00:00
Todd Kennedy
fc5ac06906 Merge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d am: d419d86952 am: e9c7512147
am: eede174f7b

* commit 'eede174f7b7ee6fa8f1ad7de237c1d647a5db05f':
  Set host when restoring a fragment
2015-10-20 01:16:19 +00:00
Svetoslav Ganov
af9d635f8e Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 am: aebff7f1ad am: 2a95159d2c
am: 7fdc5d95ad

* commit '7fdc5d95ada01a378877d6a7c8be1894eb869e04':
  Don't allow concurrent permission requests.
2015-10-20 01:14:04 +00:00
Todd Kennedy
eede174f7b Merge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d am: d419d86952
am: e9c7512147

* commit 'e9c751214715f3d136ae07fe9f553c488d01f352':
  Set host when restoring a fragment
2015-10-19 23:52:37 +00:00
Svetoslav Ganov
7fdc5d95ad Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 am: aebff7f1ad
am: 2a95159d2c

* commit '2a95159d2cce4321205ca7f40027a97acc2fb77e':
  Don't allow concurrent permission requests.
2015-10-19 23:50:28 +00:00
Todd Kennedy
2ee19c7f46 Retain fragment loaders
Remove the partial fix [it did not work for child fragment managers]
and replace with a more general fix that works with all fragments.

Bug: 23838271
Change-Id: I88b465f6a06a6ad627b9651b9e2eea41fae08972
2015-10-19 16:40:03 -07:00
Todd Kennedy
d419d86952 Merge "Set host when restoring a fragment" into mnc-dr-dev
am: 986d4b482d

* commit '986d4b482da952cd07e329b3bd11c935edd7ec01':
  Set host when restoring a fragment
2015-10-19 23:22:57 +00:00
Svetoslav Ganov
aebff7f1ad Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev
am: e199016a82

* commit 'e199016a82329b645a86db345c2d39322c8ad03a':
  Don't allow concurrent permission requests.
2015-10-19 23:13:46 +00:00
Todd Kennedy
986d4b482d Merge "Set host when restoring a fragment" into mnc-dr-dev 2015-10-19 22:52:27 +00:00
Todd Kennedy
ac0e6ca0d2 Set host when restoring a fragment
When we restore a fragment [i.e. on configuration change], we need to
make sure the host is set prior to calling into lifecycle methods
such as onInflate(). These use data contained within the host.

Bug: 22512520
Change-Id: I709365a858cfc555ec5b7fc200629fa8d022faad
2015-10-19 12:55:19 -07:00
Pablo Ceballos
63afb86381 Merge "Remove GLTrace support" 2015-10-19 17:55:59 +00:00
Julia Reynolds
aeeb39d2ec Merge "Add Notification topics." 2015-10-19 14:38:40 +00:00
Svetoslav
ffb32b1f24 Don't allow concurrent permission requests.
bug:24690277

Change-Id: Ie8c6eae230cd20e40d32cf688d30f6d40f9a9acd
2015-10-16 13:42:32 -07:00
Julia Reynolds
74303cfe2b Add Notification topics.
Topics are tags that developers can add to group notifications
by theme. Users will be able to block notifications by topic.

Bug: 22451710
Change-Id: I5b4677da66b21933f479f5e56c18ca563810b43b
2015-10-16 16:38:45 -04:00
George Mount
27b3ae6126 Fix documentation for setTransition to include fade.
Bug 25016696

Also add annotations for FragmentTransaction methods.

Change-Id: If3d1427d83dd7c399609bf8fd9a54467224d3a35
2015-10-16 12:36:58 -07:00
Wale Ogunwale
5247523c90 Merge "Don't set incorrect stack bounds when rotating screen in docked mode" 2015-10-13 01:58:05 +00:00
Wale Ogunwale
ffc11bb712 Don't set incorrect stack bounds when rotating screen in docked mode
Both window manager and activity manager could decide what the bounds
of other stacks should be when the docked stack exist which can get
out of sync. Now window manager does the bounds calculation and
activity manager asks window manager what the bounds should be when
it needs to resize the stack.

Bug: 24738105
Change-Id: I97356f008b676d2f58a8b54fdb08735ab51394af
2015-10-12 18:56:28 -07:00
Dianne Hackborn
30a4e6d514 resolved conflicts for 8cbd7c8a to master
Change-Id: I54dd1dbf2fd93c474e79d3d7be1b0bb57aff9ab7
2015-10-12 17:14:56 -07:00
Filip Gruszczynski
db5dec271e Improve relaunch merging in activity thread.
To reduce the number of times that we load resources based on
configuration changes ActivityThread employs an optimization
strategy that merges relaunch operations. If it receives a
relaunch request why one is already queued, it will just update
the queued request instead of creating a new one. Unfortunately
this breaks the guarantee of executing lifecycle events in the
order they were received.

Consider following scenario of requestes from Activity Manager:
1) relaunch the activity in not resumed state;
2) resume the activity;
3) relaunch the activity in resumed state.

The Activity Thread can process these commands in following order:
1) receive the request to relaunch in not resumed state;
2) receive the request to resume the activity;
3) receive the request to resumed state, update the exisiting
request;
4) execute the request to relaunch in resume state;
5) execute the request to resume.

This causes the activity to perform resume twice.

Since we need the merging of relaunch operations for performance
reasons, we need to introduce a secondary mechanism for ordering
of lifecycle requests. Relaunching, pausing, stopping and resuming
receive a sequence number based on when the request was received. If
the last executed sequence number is higher then the operations
sequence number then the operation will be dropped.

In the above scenario the sequence number would be:
1) request to relaunch not resumed receives seq + 0;
2) request to resume receives seq + 1;
3) request to relaunch resumed receives seq + 2;
4) execution of of request to relaunch resumed set current sequence
number to seq + 2;
5) since seq + 1 < seq + 2, then the execution of request to resume
is prevented.

Bug: 24806374

Change-Id: Ia520dd1aa215827d4172a9891a7cc01db2ce627e
2015-10-12 12:00:38 -07:00
Jeff Sharkey
8cbd7c8a8a am 8feaed95: am da5d9af8: am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
* commit '8feaed95cfc79cc96a0c0a18c3db8154dd9f551a':
  Default location is "internalOnly" when undefined.
2015-10-12 16:55:52 +00:00
Jeff Sharkey
da5d9af805 am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
* commit 'fe45f1b97a1f572ce453193035f1fabf7957cc03':
  Default location is "internalOnly" when undefined.
2015-10-12 16:39:29 +00:00
Jeff Sharkey
c88a2d5b33 Default location is "internalOnly" when undefined.
When an app doesn't define installLocation, the default behavior
should be to treat it as internal only.  This matches all the
published developer documentation.

Without this, apps could be unwittingly be moved to adopted storage
devices.

Bug: 24771264
Change-Id: Iaf38ab45329aad6cb5d6deac81fb1781f680189b
2015-10-09 13:22:09 -07:00
Mahaver Chopra
76b08a9d17 Documentation of EXTRA_PROVISIONING_WIFI_SECURITY_TYPE
Valid values for EXTRA_PROVISIONING_WIFI_SECURITY_TYPE in the documentation

Bug: 23379302
Change-Id: I039432d81de6834c01bbe6ca0fc668afec38d040
2015-10-09 12:32:31 +01:00
Julia Reynolds
8b14288c94 Merge "Remove rename automatic zen rule." 2015-10-08 22:27:10 +00:00
Filip Gruszczynski
c29ecc86c2 Don't remove task from recents if closed by caption button.
When the user clicks X in non client decor of a freeform task, we
don't want it to be removed from recents. The task gets finished,
but it will remain in recents.

Bug: 24718309

Change-Id: I8f47e310903ee7f839ec92f5c8ff3a9f1e09118c
2015-10-08 12:22:22 -07:00
Makoto Onuki
daa6521505 Merge "setDeviceOwner() now requires a full component name." 2015-10-08 17:01:07 +00:00
Julia Reynolds
4fe98d6d4c Remove rename automatic zen rule.
Use zen rule id as key when finding matching rule to update.

Bug: 22977552
Change-Id: I7beeb5688aabe409a9a72aaa3aa27932d590c489
2015-10-07 20:10:58 -04:00
Filip Gruszczynski
81cdf2b216 Merge "Dismissing of docked stack by dragging to the side." 2015-10-07 00:47:35 +00:00
Filip Gruszczynski
57b6ccecc0 Dismissing of docked stack by dragging to the side.
Bug: 24623909
Change-Id: Ic93b169442de1eb4dca9f65a87ae2b813bcef043
2015-10-06 17:46:05 -07:00
Pablo Ceballos
a4d4e82927 Remove GLTrace support
GLTrace is defunct, it does not support newer GL features, breaks
security requirements, and has no supported tooling now that Eclipse
is at end of life.

Bug 22329852

Change-Id: I64c58464f8c2c7ae6125f5d5c7884e3fd34d68ea
2015-10-06 15:18:40 -07:00
Julia Reynolds
5686addb76 Merge "Add id and creation date to Zen rules." 2015-10-06 19:48:44 +00:00
Julia Reynolds
56106ff337 Add id and creation date to Zen rules.
Bug: 22977552
Change-Id: Ic79714ebbcc895e55ee87ccfc0e03b1735255ef3
2015-10-05 20:32:29 -04:00
Makoto Onuki
a52562ca9a setDeviceOwner() now requires a full component name.
Bug 20149907

Change-Id: I24e66159d1d966925aa3a494b1e2839b07cdafa2
2015-10-05 16:05:15 -07:00
Wale Ogunwale
7e8184b0ab Support for specifying stack to launch an activity from recents in.
Bug: 24668831
Change-Id: Iebd019d3a566a6d068253d8f566c1df88e9e64dd
2015-10-05 15:11:53 -07:00
Filip Gruszczynski
feb0dfc0e7 Merge "Fix recents crashing during docked stack resize." 2015-10-05 17:59:12 +00:00
Filip Gruszczynski
14418daa09 Fix recents crashing during docked stack resize.
Whether acitvity window should be preserved during the relaunch is
controlled by the activity manager and the existence of
non-client-decor should not affect it. For example, docked activities
will not have non-client-decor, but we would like to preserve them
anyway.

Bug: 24573657
Change-Id: I5d4852c3b7c26ac3ec1bbc105639f75b67d1d3ad
2015-10-05 10:56:49 -07:00
Craig Lafayette
c3cdf1c614 Merge "Remove device initializer agent" 2015-10-05 17:52:05 +00:00
Filip Gruszczynski
f48e1e2124 Remove accidentally added logging.
Change-Id: Ibffca5e034c5009684bfe6b9a04bd476b9385053
2015-10-04 16:02:06 -07:00
Filip Gruszczynski
44bc4daff3 Only request resize for tasks on the freeform stack.
This fixes a crash during orientation changes, where window manager
requests a resize for a docked task, but activity manager throws an
exception since dock tasks can only be resized when their stack is
being resized.

Bug: 24575031

Change-Id: I954c4e6ae60931b30200b10c8a4834b0a5757606
2015-10-04 10:12:08 -07:00
Craig Lafayette
e7ee54ee7f Remove device initializer agent
Bug: 23216982
Change-Id: I867c0b5f4165983d1ed2623a655f6a2a5e3770bb
2015-10-02 13:11:57 -04:00
Chong Zhang
f98feb05f0 Merge "Do not change task's stack in resizeTaskLocked" 2015-10-01 19:19:36 +00:00
Chong Zhang
6de2ae81ce Do not change task's stack in resizeTaskLocked
Move the task to the right stack before calling resizeTaskLocked
and let resizeTaskLocked only handle the resize.

Bug: 24462900
Change-Id: I3401c92f1893eaefde2909a9b20b00b5ea6cdf01
2015-10-01 12:14:34 -07:00
Amith Yamasani
11f15a3727 Merge "Delay cleaning user tasks until user is removed" 2015-10-01 17:32:42 +00:00
Amith Yamasani
515d40600e Delay cleaning user tasks until user is removed
Fixes #24301208 No recent apps shows when switching
between users.

Instead of cleaning up when stopping a user, we
should remove tasks when removing a user, since
recents tasks should be persisted across reboots.
Reboots are similar to stopping and starting users.

Change-Id: I9a250792077cca5f18ae1a10bc36f7b97e8ea867
2015-09-30 16:22:52 -07:00
Fyodor Kupolov
85f3402d31 Merge "Check multi-user support in isUserSwitcherEnabled" 2015-09-30 21:58:19 +00:00
Fyodor Kupolov
cd86ebf1c9 Check multi-user support in isUserSwitcherEnabled
isUserSwitcherEnabled now returns false if multi-user is disabled(
supportsMultipleUsers() returns false).

Removed GUEST_USER_ENABLED setting and replaced with DPM.getGuestUserDisabled
check. It currently always returns false, but will be replaced with an actual
policy check.

Bug: 17571233
Change-Id: I41853e8b321b2537952cac5d92e88bfdb8cbd9a8
2015-09-30 14:08:01 -07:00
Robin Lee
d47f68a807 Merge "Call into PackageManager as mContext, not myUserId" 2015-09-30 19:57:28 +00:00