Commit Graph

244551 Commits

Author SHA1 Message Date
David Friedman
c682dfbb70 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am: bf56921d35 am: 86b5f72636
am: c19cf44966

* commit 'c19cf449664e985f0bb07833daadf533ec0dfa1c':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: I63ce9bb629c733bc494e27868727a79f4471af9c
2016-05-17 03:33:55 +00:00
David Friedman
c19cf44966 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am: bf56921d35
am: 86b5f72636

* commit '86b5f726368c873c8503ed7a8042cfa954f5e1a0':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: I83923831a50a94f46d05e18cfc4d69c68b2e58ed
2016-05-17 03:29:11 +00:00
David Friedman
86b5f72636 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs
am: bf56921d35

* commit 'bf56921d3527ad0652f4224b422dd611ec1a6fee':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: I8150c709818232cf24e4d967de45aeb1bd4c2956
2016-05-17 03:23:46 +00:00
David Friedman
bf56921d35 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs 2016-05-17 03:17:41 +00:00
David Friedman
182e8b53ea Docs: CL for continuing work on tactically merged N-DP3 docs.
This CL continues the work from ag/1036623 and ag/1036124.

Change-Id: Ic1e026ed9f53a389a0435c2b8e21edfe9ef635c4
2016-05-16 19:39:08 -07:00
Christopher Tate
d4056a279d Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev
am: 11d9586117

* commit '11d9586117e983e36b2467bcb436200268cd0933':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I7c894dd6dc494dc5c02ba9e9676b53b0acc281d4
2016-05-17 01:03:59 +00:00
Wale Ogunwale
273d6e8f56 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: I81250af945c186fbb687bc15ec03a85a019bd6e3
2016-05-17 00:59:36 +00:00
Chris Tate
11d9586117 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev 2016-05-17 00:56:49 +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
245d5580aa Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev
am: fc932b9d69

* commit 'fc932b9d699e5797fbbfac3ec09a789419ade269':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I2211b2a8eb03a692bdbc6124f0103340c39c4adc
2016-05-17 00:38:50 +00:00
Amith Yamasani
0250ae2c1b Merge "Allow Shell to change component enabled state" into nyc-dev
am: 19b34eccfe

* commit '19b34eccfee9d14e6888c4813cc369bd4b3a7e81':
  Allow Shell to change component enabled state

Change-Id: I8b472bf3149b1e721ea90a8a6fed12549e3f1510
2016-05-17 00:34:16 +00:00
TreeHugger Robot
fc932b9d69 Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev 2016-05-17 00:29:04 +00:00
Amith Yamasani
19b34eccfe Merge "Allow Shell to change component enabled state" into nyc-dev 2016-05-17 00:27:55 +00:00
Chris Craik
fa3e66e0ae Merge "Fix hw layer overdraw/update visualization" into nyc-dev
am: 189e3e5ec5

* commit '189e3e5ec5b698f1062fb98692fa75d3750148e0':
  Fix hw layer overdraw/update visualization

Change-Id: I4e788e8a83fa02881ca18d82dc2371d5bf43284c
2016-05-17 00:07:54 +00:00
TreeHugger Robot
189e3e5ec5 Merge "Fix hw layer overdraw/update visualization" into nyc-dev 2016-05-16 23:58:28 +00:00
Jorim Jaggi
4958217aa4 Handle multi-window for inset hint
am: 23bf5462f0

* commit '23bf5462f05b33ce4390d8370520e43b74dbec09':
  Handle multi-window for inset hint

Change-Id: I67d202891330ba78b6fbe62510261cc7f1449b42
2016-05-16 23:27:56 +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
Tim Murray
b9e8a87240 Merge "Make persistent apps become top correctly." into nyc-dev
am: 29af3cab29

* commit '29af3cab293dc7a19ca3b387c5507e521f66d0b7':
  Make persistent apps become top correctly.

Change-Id: Ic022afa3fa2004735b371dce4738da8d7dfeb008
2016-05-16 23:22:39 +00:00
Jorim Jaggi
23bf5462f0 Handle multi-window for inset hint
We need to incorporate task bounds when calculating the inset hint
so we don't specify something wrong to the client which we correct
immediately after.

Bug: 28697105
Change-Id: I23cec7d6cc62a4d982e0796a867e803d4cce0803
2016-05-16 23:18:14 +00:00
Wale Ogunwale
db0fa12b73 Update configuration of all visible activities in a stack when resizing
Previously we were only updating configuration for the top activity in
the stack during resizing. This caused an activity behind the top
translucent activity to continue to display in the old configuration
and also get relaunched without window preservation when the top
translucent activity is finished.
We now make sure all activities at all below a translucent activity
have their configuration updated during resizing.

Bug: 28762547
Change-Id: I0926ac6db088cdf3f6a225c552dbfbe944830f68
2016-05-16 16:14:33 -07:00
TreeHugger Robot
29af3cab29 Merge "Make persistent apps become top correctly." into nyc-dev 2016-05-16 23:13:25 +00:00
Anthony Hugh
91dd6209f8 Merge "Change Priority Only mode defaults on watches" into nyc-mr1-dev 2016-05-16 23:00:53 +00:00
Hans Boehm
eb714f3d29 Merge "Clear more native pointers in finalizers" into nyc-dev
am: 53c33d9701

* commit '53c33d97013ad10a42d9b37fe77884f596250109':
  Clear more native pointers in finalizers

Change-Id: I0e28a59e0f2d60b38a5e2bdd55bbd72ec1da42d9
2016-05-16 22:57:14 +00:00
Svetoslav Ganov
5f8c5ec9a4 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev
am: 008d73bd5b

* commit '008d73bd5b3ca4b1b7a8af61957759d65dd67e3b':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: Iebbe27690aeac898807c13ef05c730697dbb406a
2016-05-16 22:48:35 +00:00
Dirk Dougherty
69083dd202 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 am: b33f36497d am: a4101e6693
am: de84a27872

* commit 'de84a27872a9eca52d0703d602335f558021c10e':
  Update default image for n preview docs. Update tools resources.

Change-Id: I2b2c575fff29152e32b6ad46005b3e27fa865f11
2016-05-16 22:48:33 +00:00
Scott Main
231adb3e0f Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9 am: 592b36a326 am: 0b019a3d02
am: 1d145e7d2b

* commit '1d145e7d2b4b10ba0b9330766e3975802e5aa1e4':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: I67591e599c9d0def077ad2a8b48cd53a78b785c7
2016-05-16 22:48:30 +00:00
Hans Boehm
53c33d9701 Merge "Clear more native pointers in finalizers" into nyc-dev 2016-05-16 22:45:04 +00:00
Jaewan Kim
3f41684de5 Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev
am: 174aa3346c

* commit '174aa3346c06341d13f287c72ccd9ec47fce5987':
  Workaround that Recents is shown again after an activity is PIPed

Change-Id: I8a2a7daeebeb37817a36d12e52db86912dce2186
2016-05-16 22:43:01 +00:00
Svetoslav Ganov
008d73bd5b Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev 2016-05-16 22:42:49 +00:00
Dirk Dougherty
de84a27872 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 am: b33f36497d
am: a4101e6693

* commit 'a4101e66933fd5acb882bfc0311f3f4b5cbd5b11':
  Update default image for n preview docs. Update tools resources.

Change-Id: I859659905ab0bdd7e16a2406542c0cac69e1f4d7
2016-05-16 22:41:55 +00:00
smain@google.com
1d145e7d2b Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9 am: 592b36a326
am: 0b019a3d02

* commit '0b019a3d028990a9832188d3ef2c9540e5d37f40':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: Ifba667194d2e2f04a9824945d5100cdea01a9c77
2016-05-16 22:41:44 +00:00
Jaewan Kim
174aa3346c Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev 2016-05-16 22:38:23 +00:00
Dirk Dougherty
a4101e6693 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2
am: b33f36497d

* commit 'b33f36497dbc7265ee16323ee6c0281690ca3221':
  Update default image for n preview docs. Update tools resources.

Change-Id: I1ed7ac4ecf30538252d4b277b1baf93ec61e4835
2016-05-16 22:35:33 +00:00
Scott Main
0b019a3d02 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9
am: 592b36a326

* commit '592b36a326216cd2442c47da9608ca2afd7e4d16':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: I54b1282f6ef2d92251a4624c8f439499831af1a6
2016-05-16 22:35:30 +00:00
Svetoslav Ganov
a8bbd76d9b Ensure app op restrictions reset when the app that set them dies.
We were not keeping track when an app that set an app op restriction
dies to clean up after that. As a result we may end up with stale
restrictions that will be there until the device reoots - not cool.
This change adds remote binder death tracking and simplifies the
code as adding the formed would have made more complex.

bug:28770536

Change-Id: I7dcaafba2354843a0cdf0206ab1f96625edc5120
2016-05-16 15:34:34 -07:00
Jorim Jaggi
87072fed10 Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev
am: 8e30eb3a7f

* commit '8e30eb3a7f81729065bad6d971bf414f995410df':
  Fix transition delay tracking when starting activity from recents

Change-Id: I1b0a85c1fe5ce607e7bb46da03d27f77abe498db
2016-05-16 22:31:32 +00:00
Dirk Dougherty
b33f36497d Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs
am: 0a957d5aa2

* commit '0a957d5aa28920f8854070676955f941e3ae6726':
  Update default image for n preview docs. Update tools resources.

Change-Id: I3fa206d3bfc74d20cb74e19f0d084d62fb47c0e2
2016-05-16 22:31:30 +00:00
Dianne Hackborn
c5d784caf3 Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev
am: 0cb1cc74b8

* commit '0cb1cc74b851f995110b8231f754c9f84122c816':
  Fix issue #28794831: meminfo considers cached processes to be services

Change-Id: I2d9ab20344f982e97d91422e89e56a27420233bd
2016-05-16 22:31:25 +00:00
smain@google.com
592b36a326 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs
am: a0acf474e9

* commit 'a0acf474e9db6e1a444d7e48b520b48ded8fcdce':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: I337e5167eb9191f674c6cc397d61925c334c3b72
2016-05-16 22:31:22 +00:00
Dirk Dougherty
0a957d5aa2 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs 2016-05-16 22:27:48 +00:00
TreeHugger Robot
8e30eb3a7f Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev 2016-05-16 22:27:39 +00:00
Dianne Hackborn
0cb1cc74b8 Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev 2016-05-16 22:26:13 +00:00
Scott Main
a0acf474e9 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs 2016-05-16 22:25:51 +00:00
Billy Lamberta
031929076e Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 am: 51ceb1bad1
am: a0a34f6017

* commit 'a0a34f6017287d466e90a27f82ff8cf4c91c0663':
  docs: work minisite

Change-Id: I2152083326c271ebd9adc5eea7a072db9b7aa080
2016-05-16 22:23:55 +00:00
Felipe Leme
d028ec4e29 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev
am: 522787f39a

* commit '522787f39a759cf8af8438641fa8df7470a1b959':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: I1187ffeeb42b61329674ca022735efa08c7e9d98
2016-05-16 22:23:46 +00:00
smain@google.com
d078d20ac6 Avoid weird line wrapping by removing columns and forcing line breaks between the links
Change-Id: I797b46d75643ce2491d47c95599164022ce451a7
2016-05-16 15:22:17 -07:00
Michael Kwan
0092f82d4c Merge "Allow ANR dialogs for Watch eng builds." into nyc-mr1-dev 2016-05-16 22:21:30 +00:00
Billy Lamberta
a0a34f6017 Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13
am: 51ceb1bad1

* commit '51ceb1bad18c39a5281fc2cbd6d9c234c2e7f14a':
  docs: work minisite

Change-Id: Ieac1a9a571bfe6ef94663623f5715d1b205dd242
2016-05-16 22:19:41 +00:00
Amith Yamasani
bf12565276 Allow Shell to change component enabled state
But make sure that we don't allow Shell or other apps
to disable an active profile or device owner.

Also limit exactly what states Shell can switch apps
between, similar to Settings UI.

This is required for some CTS tests

Bug: 27924655
Change-Id: I958f0d1de7f0bc1f5a0cbf853d57dfdeb2f9ad59
2016-05-16 15:17:50 -07:00
TreeHugger Robot
522787f39a Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 2016-05-16 22:17:42 +00:00