Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,319 Commits 3 Branches 0 Tags
de6400a2824b4396e971fc5105f6dc29b97cebc7
Commit Graph

244319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
de6400a282 Merge "Fix Skia filter behavior test" into nyc-dev 
am: 0c5bd7dffe

* commit '0c5bd7dffec8e5a5f21eed79dc827ef809048c2a':
  Fix Skia filter behavior test

Change-Id: Ifff29ff78c32bf2af43ffaa2b8c922b3a41fa195
 2016-05-13 23:17:33 +00:00
Chris Craik
0c5bd7dffe Merge "Fix Skia filter behavior test" into nyc-dev 2016-05-13 23:12:18 +00:00
Svetoslav Ganov
1ba77621c6 Merge "Make settings cahches generation mechanism robust." into nyc-dev 
am: b35301e421

* commit 'b35301e421bb08c28425c49ad46a277c96ccb411':
  Make settings cahches generation mechanism robust.

Change-Id: Ided07e935f83e96edfec9217bfad9ae2da1fc6fb
 2016-05-13 22:26:27 +00:00
Svetoslav Ganov
b35301e421 Merge "Make settings cahches generation mechanism robust." into nyc-dev 2016-05-13 22:22:32 +00:00
Svetoslav Ganov
04df738bcb Make settings cahches generation mechanism robust. 
Settings is using a MemoryIntArray to communicate the settings table
version enabling apps to have up-to-date local caches. However, ashmem
allows an arbitrary process with a handle to the fd (even in read only
mode) to unpin the memory which can then be garbage collected. Here we
make this mechanism fault tolerant against bad apps unpinning the ashmem
region. First, we no longer unpin the ashmem on the client side and if
the ashmem region is purged and cannot be pinned we recreate it and
hook up again with the local app caches. The change also adds a test
that clients can only read while owner can read/write.

bug:28764789

Change-Id: I1ef79b4b21e976124b268c9126a55d614157059b
 2016-05-13 15:14:14 -07:00
Andrew Solovay
93355f2943 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: I74022d22deb99d5cd83d7ed73658d65f7aa05fb3
 2016-05-13 22:10:47 +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
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
Andrew Solovay
c88130c572 docs: Updates to multi-window and related docs. am: 4d93a21980 
am: 8263d6c0a3

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

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

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

Change-Id: I04c96f7a7ecf73d63b401bb0e1e7d3900fd59310
 2016-05-13 21:57:52 +00:00
Andrew Solovay
8263d6c0a3 docs: Updates to multi-window and related docs. 
am: 4d93a21980

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

Change-Id: Ie12e3c25417943582aa1db1bf476e53a41838745
 2016-05-13 21:57:51 +00:00
TreeHugger Robot
a6c0cc0992 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev 2016-05-13 21:53:42 +00:00
Bert McMeen
6ed49919ac Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs am: 1334929863 am: 2288757582 
am: 1778b7cf07

* commit '1778b7cf07dd728b2858d5e3ce898782cf911c13':
  docs: Bridger feature page for Wear preview

Change-Id: I6f2722ac82be469d7278576ff9299a70f4461362
 2016-05-13 21:45:45 +00:00
Bert McMeen
1778b7cf07 Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs am: 1334929863 
am: 2288757582

* commit '2288757582bd8b572f009aee68a0fe1599507060':
  docs: Bridger feature page for Wear preview

Change-Id: Ica0f66a85c0b5c9d3db6eee71338b7a7956cb827
 2016-05-13 21:43:01 +00:00
Bert McMeen
2288757582 Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs 
am: 1334929863

* commit '133492986389a63e34cb9066e515864eadeeb485':
  docs: Bridger feature page for Wear preview

Change-Id: If629e5ff1d0a90661fc69287f9e669625f8ce5a2
 2016-05-13 21:40:22 +00:00
Bert McMeen
8216496435 Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs am: e8d7012fba am: 97158b85ec 
am: 689826fba9

* commit '689826fba95c20a7134d84ad9829cf766814e743':
  docs: Wear preview docs: Get Started, Download/Test, Program Overview

Change-Id: I9e784bc041618792ce8a09737b673cdd499eb879
 2016-05-13 21:37:44 +00:00
Bert McMeen
e97e3225f2 docs: Complications guide for Wear Preview am: c0780f1d52 am: 194fbc0da4 
am: ccbf8c5dde

* commit 'ccbf8c5dde16a156276cf241f64c08fea4df071b':
  docs: Complications guide for Wear Preview

Change-Id: I865bb3c9a88beb69429212067aeed01dd83e4bba
 2016-05-13 21:37:41 +00:00
Bert McMeen
689826fba9 Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs am: e8d7012fba 
am: 97158b85ec

* commit '97158b85ec07c22b0aca39ffaf0c8172751c0a65':
  docs: Wear preview docs: Get Started, Download/Test, Program Overview

Change-Id: I549ab462afb03184118a00aa3bcfdb45284b4288
 2016-05-13 21:35:03 +00:00
Bert McMeen
ccbf8c5dde docs: Complications guide for Wear Preview am: c0780f1d52 
am: 194fbc0da4

* commit '194fbc0da4272b1c957c1e69d363f2c566a30716':
  docs: Complications guide for Wear Preview

Change-Id: Ie3850f9647ec2fa2d0e43560e27ac1947a486375
 2016-05-13 21:34:58 +00:00
Bert McMeen
97158b85ec Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs 
am: e8d7012fba

* commit 'e8d7012fbafb64e71fe2d94b4ef1cb466f63bfc9':
  docs: Wear preview docs: Get Started, Download/Test, Program Overview

Change-Id: Icc722c4d00fc6862e28fc246cd376e90901c0092
 2016-05-13 21:32:10 +00:00
Bert McMeen
194fbc0da4 docs: Complications guide for Wear Preview 
am: c0780f1d52

* commit 'c0780f1d52c8e4d78e750fb0f16eec8280ddf5f4':
  docs: Complications guide for Wear Preview

Change-Id: I71999d68698c336c354cc11d042775685b77da8d
 2016-05-13 21:32:07 +00:00
Bert McMeen
1334929863 Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs 2016-05-13 21:30:19 +00:00
Bert McMeen
e8d7012fba Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs 2016-05-13 21:29:27 +00:00
Jorim Jaggi
b1ed1f6b3d Merge "Fix transition for forced resizable exit" into nyc-dev 
am: 6cb8a2cfd2

* commit '6cb8a2cfd2060301942b2a71f22ef62e9f39ffca':
  Fix transition for forced resizable exit

Change-Id: I57ad35b1905e61c79cfb115f7773ad3bd5b70d3f
 2016-05-13 21:27:00 +00:00
Sid Soundararajan
339b065453 Merge "Remove task based on object rather than position" into nyc-dev 
am: e1293b7d07

* commit 'e1293b7d07f5854337fef35a2e3b4338df90866e':
  Remove task based on object rather than position

Change-Id: I101dd1a8be5423a9fa7280d0b0a6f8361a9b001e
 2016-05-13 21:26:58 +00:00
Jorim Jaggi
c86e88a9e6 Don\'t allow any app to specify rotation unless in home task 
am: 0f6a6c4bc1

* commit '0f6a6c4bc15fee726ef9aeb0d99b1204767f431d':
  Don't allow any app to specify rotation unless in home task

Change-Id: Ie7f0065543addcf51df5b24b8b67d7f12d9001aa
 2016-05-13 21:26:54 +00:00
Jorim Jaggi
6cb8a2cfd2 Merge "Fix transition for forced resizable exit" into nyc-dev 2016-05-13 21:22:02 +00:00
Sid Soundararajan
e1293b7d07 Merge "Remove task based on object rather than position" into nyc-dev 2016-05-13 21:19:24 +00:00
Jorim Jaggi
e6d157b936 Fix transition for forced resizable exit 
Since the transition is picked from layout params from the activity
below, we need to manually override it.

Bug: 28750938
Change-Id: I7351c7d8bd14a393cba51d6afb1e644204217440
 2016-05-13 21:18:52 +00:00
Jorim Jaggi
0f6a6c4bc1 Don't allow any app to specify rotation unless in home task 
The previous logic was racy/buggy in a sense so that the non-home app
could still force the orientation when the divider was still minimized.
The logic is cleaned up so only the home task can force the orientation
in multi-window.

Change-Id: I9eccf86d9fa442375d6eca400cb6ac0815c9fa10
Fixes: 28675152
 2016-05-13 21:17:53 +00:00
Chong Zhang
49c0b0cd90 Merge "Update stack bounds for fullscreen if rotated after updateDisplayInfo" into nyc-dev 
am: 918084e9ae

* commit '918084e9ae9620c745e4d6212f6648771051e706':
  Update stack bounds for fullscreen if rotated after updateDisplayInfo

Change-Id: Id30d9ac8fc7c21c8ca65afb7c2bbb8fca1255d1b
 2016-05-13 20:54:40 +00:00
Wale Ogunwale
385f03f4e3 Merge "Fixed some issues with fullscreen dimming" into nyc-dev 
am: e208bd4cbe

* commit 'e208bd4cbea7468c989d25ef582e5a9ed7ecabf1':
  Fixed some issues with fullscreen dimming

Change-Id: Ibf06c08daca76f47a7a3cd8baf94aaf0b4d8adc2
 2016-05-13 20:51:58 +00:00
Chong Zhang
918084e9ae Merge "Update stack bounds for fullscreen if rotated after updateDisplayInfo" into nyc-dev 2016-05-13 20:48:32 +00:00
TreeHugger Robot
e208bd4cbe Merge "Fixed some issues with fullscreen dimming" into nyc-dev 2016-05-13 20:42:21 +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
Bert McMeen
c0780f1d52 docs: Complications guide for Wear Preview 
Bug: 28425614
Change-Id: Ic1d5ce1a962b39a395c447c1f4d3bfadd6114246
 2016-05-13 12:30:17 -07:00
Wei Wang
6122c4392a Properly handle registration timeout in BLE. 
am: 02bc008607

* commit '02bc0086071b5faff260566b4d3713861703eee3':
  Properly handle registration timeout in BLE.

Change-Id: If6315c9ac1d083c4c26f5835d19722c94ccabcd5
 2016-05-13 18:35:06 +00:00
Wei Wang
02bc008607 Properly handle registration timeout in BLE. 
Bug:25384098
Change-Id: I7877f6368c4982fcd91e68810c4da0ab7b5fc6b7
 2016-05-13 18:32:15 +00:00
Dirk Dougherty
e863a112bb Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30 am: 6d3ca9aaa9 am: 0e4b51ebc6 
am: b72bf5cfdd

* commit 'b72bf5cfdd35b72f3335b29165d9f7b01474b30a':
  Correct the DP2 status beta -> alpha.

Change-Id: I206df6485a71241602f938490385a9c89fe50ccf
 2016-05-13 18:19:19 +00:00
Joe Fernandez
427d5b9ed5 Merge "docs: change preview landing page top ribbon color" into mnc-io-docs am: a138ad92b2 am: 3357a67905 
am: cfe2e7e1a9

* commit 'cfe2e7e1a9950df852a06e5363f4c0bd9b59b8e5':
  docs: change preview landing page top ribbon color

Change-Id: I5930d3b7c07dfa403d16b2b6bba93d7e56698d73
 2016-05-13 18:16:38 +00:00
Dirk Dougherty
b72bf5cfdd Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30 am: 6d3ca9aaa9 
am: 0e4b51ebc6

* commit '0e4b51ebc6b86a535a9f7757e8b64f70a10aaa30':
  Correct the DP2 status beta -> alpha.

Change-Id: I9fded988b946d669f9560716563771f8e6b82351
 2016-05-13 18:16:15 +00:00
Joe Fernandez
cfe2e7e1a9 Merge "docs: change preview landing page top ribbon color" into mnc-io-docs am: a138ad92b2 
am: 3357a67905

* commit '3357a67905453d64846079e560bbe893c4c733b6':
  docs: change preview landing page top ribbon color

Change-Id: I7eede6be5a8960e7f2360656c66b136f519fb1bb
 2016-05-13 18:13:46 +00:00
Dirk Dougherty
0e4b51ebc6 Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30 
am: 6d3ca9aaa9

* commit '6d3ca9aaa91328d3664a217fee8a49c9ee46858e':
  Correct the DP2 status beta -> alpha.

Change-Id: Iecc460e2b5399bff284f8d2479d475325fc8a1df
 2016-05-13 18:13:40 +00:00
Joe Fernandez
3357a67905 Merge "docs: change preview landing page top ribbon color" into mnc-io-docs 
am: a138ad92b2

* commit 'a138ad92b299bf32a59ee5f4ba5a9e34e6998cb4':
  docs: change preview landing page top ribbon color

Change-Id: Ib7d5c3fc9a133ceb0a97f801218481a94fb15a47
 2016-05-13 18:11:15 +00:00
Dirk Dougherty
6d3ca9aaa9 Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs 
am: 3a263cec30

* commit '3a263cec302b3d1883e3cc48b068c05240506d31':
  Correct the DP2 status beta -> alpha.

Change-Id: I925a0c044e1b7b6186f348c4c8e216b8f53a13f4
 2016-05-13 18:11:11 +00:00
Chong Zhang
ccc335cfc7 Update stack bounds for fullscreen if rotated after updateDisplayInfo 
Rotation could change again after updateDisplayInfo is called. We
need to set stack bounds even for fullscreen stacks in this case.
Otherwise the bounds will be incorrect until it's rotated again.

bug: 28611814
Change-Id: I31289524a9ceacaaaa66924e9bf6cbe88fd83f99
 2016-05-13 11:07:22 -07:00
Joe Fernandez
a138ad92b2 Merge "docs: change preview landing page top ribbon color" into mnc-io-docs 2016-05-13 18:06:42 +00:00
Dirk Dougherty
3a263cec30 Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs 2016-05-13 18:03:24 +00:00
Amanda Kassay
26818308f9 Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs am: 379e28db22 am: 494a4c967c am: 899981c244 
am: a63801a7c2

* commit 'a63801a7c2fa80d5815c78d6339536690803b34b':
  Clean up sdk/sdk_vars.cs file b/28744510

Change-Id: I69785f0e0ddad254c583f0fc087bba4d5134ec6a
 2016-05-13 18:02:22 +00:00