Commit Graph

60397 Commits

Author SHA1 Message Date
Abodunrinwa Toki
695f39de25 Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev am: 376f9f4bd6 am: 03e7feeba3
am: 58056cf0bc

* commit '58056cf0bc57d3ac125ba8bd544c56270124c884':
  Ensure that ViewGroup.getChildVisibleRect(...) is recursive.

Change-Id: Iec7b1687ec8902b817c5a3367306465b8433da50
2016-05-16 09:50:03 +00:00
Abodunrinwa Toki
58056cf0bc Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev am: 376f9f4bd6
am: 03e7feeba3

* commit '03e7feeba33b565dd09cb77834caa643b6dff0e9':
  Ensure that ViewGroup.getChildVisibleRect(...) is recursive.

Change-Id: If5557d0a968e263b4252566566621b522ffb5617
2016-05-16 09:47:03 +00:00
Abodunrinwa Toki
03e7feeba3 Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev
am: 376f9f4bd6

* commit '376f9f4bd6ba2e117f0356161c767225f47f2745':
  Ensure that ViewGroup.getChildVisibleRect(...) is recursive.

Change-Id: I35ef50e803c17df3911bee580e604992768df484
2016-05-16 09:44:05 +00:00
Abodunrinwa Toki
376f9f4bd6 Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev 2016-05-16 09:37:56 +00:00
Martijn Coenen
27a855d172 Merge "Address API review comments." into nyc-dev am: 9a32929def am: 1ffef9a239
am: 2386212c05

* commit '2386212c057009014b16c378910e0aea5292a09f':
  Address API review comments.

Change-Id: Iba1c5f79cdb527b710026e1e5ae9f3e337ff754b
2016-05-16 09:32:31 +00:00
Martijn Coenen
2386212c05 Merge "Address API review comments." into nyc-dev am: 9a32929def
am: 1ffef9a239

* commit '1ffef9a239a67016607f62dfd023bf7fefb85370':
  Address API review comments.

Change-Id: I1f7da4c07988923b22bfab5689d48531cfb95aa1
2016-05-16 09:28:57 +00:00
Martijn Coenen
1ffef9a239 Merge "Address API review comments." into nyc-dev
am: 9a32929def

* commit '9a32929def3425c55a1bc96ea20346bf95357ae4':
  Address API review comments.

Change-Id: Ieb67cdc7846a06d84280e9ea9ca1cbe34dbff78f
2016-05-16 09:25:58 +00:00
Martijn Coenen
9a32929def Merge "Address API review comments." into nyc-dev 2016-05-16 09:18:36 +00:00
Daniel Nishi
b4128249e6 Merge "Add an Activity action to go into the Deletion Helper." into nyc-mr1-dev am: e8ed2ed331
am: 057a101453

* commit '057a101453ea46a6207588b53952d78c2a80898c':
  Add an Activity action to go into the Deletion Helper.

Change-Id: I1f823bcdde7b48f37bfe9016ba68bbc3c27a4357
2016-05-14 01:20:39 +00:00
Daniel Nishi
057a101453 Merge "Add an Activity action to go into the Deletion Helper." into nyc-mr1-dev
am: e8ed2ed331

* commit 'e8ed2ed331a056fe2262ac649f71d781df25f363':
  Add an Activity action to go into the Deletion Helper.

Change-Id: I09b09f645b455c8a2cde7bd0eadb34b2cc704178
2016-05-14 01:17:24 +00:00
Daniel Nishi
ac62b4b360 Add an Activity action to go into the Deletion Helper.
Applications may want to jump to the Deletion Helper to free up
storage when the device is under storage pressure.

Bug: 28675265
Change-Id: I709c39f3e699ab5f51f4ad1272468583276ff050
2016-05-14 00:01:33 +00:00
Svetoslav Ganov
582ed22116 Merge "Make settings cahches generation mechanism robust." into nyc-dev am: b35301e421 am: d361bbd0db
am: 7cd6a970c0

* commit '7cd6a970c047c06c196cb351d00584180806351e':
  Make settings cahches generation mechanism robust.

Change-Id: I2181d6f48052e4ae3204e39bfb050387065a7fcc
2016-05-13 22:31:32 +00:00
Svetoslav Ganov
7cd6a970c0 Merge "Make settings cahches generation mechanism robust." into nyc-dev am: b35301e421
am: d361bbd0db

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

Change-Id: I5c3d4e6b0998396b37506d6842f8b37bb5d76460
2016-05-13 22:29:02 +00:00
Svetoslav Ganov
d361bbd0db Merge "Make settings cahches generation mechanism robust." into nyc-dev
am: b35301e421

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

Change-Id: I59566be20a76084f409f0dd57c70337b60339c87
2016-05-13 22:26:29 +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
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
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
3882169d7f docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e am: f975b74c0c
am: 0b15a5c94f

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

Change-Id: Id40a1c06b5a12c02ee26b855ec7c813abac8e554
2016-05-13 22:13:30 +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
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
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
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
TreeHugger Robot
a6c0cc0992 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev 2016-05-13 21:53:42 +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
Wei Wang
cead26c363 Properly handle registration timeout in BLE. am: 02bc008607 am: cde5d3db24
am: faf357e83c

* commit 'faf357e83cfda779b36ea579b8304038ae9c6089':
  Properly handle registration timeout in BLE.

Change-Id: I9b9a7ef6167ae397ebf943bc61e854e4b887140d
2016-05-13 18:40:04 +00:00
Wei Wang
faf357e83c Properly handle registration timeout in BLE. am: 02bc008607
am: cde5d3db24

* commit 'cde5d3db24da4b5b6b640d99595b281a75997ef3':
  Properly handle registration timeout in BLE.

Change-Id: I986e05659a660e69b79e1e762398370394106727
2016-05-13 18:37:36 +00:00
Wei Wang
cde5d3db24 Properly handle registration timeout in BLE.
am: 02bc008607

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

Change-Id: I1cfeb8c7a84b667854871d7f6eafd0bb6a918d50
2016-05-13 18:35:08 +00: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
Abodunrinwa Toki
cb66406d33 Ensure that ViewGroup.getChildVisibleRect(...) is recursive.
This change fixes the issue where
getChildVisibleRect(View, Rect, Point, boolean) call isn't recursive.
The method was introduced in I49550ed4082bcbdcfe4643b962b50f3308092525

Bug: 28514727
Change-Id: Ib6b0fb67ca6c700b44f645319c23b1213a2742d4
2016-05-13 19:26:03 +01:00
Steve McKay
935d7d6854 Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev am: fec0d188c1 am: 6fdaf2f2cf
am: b8995b7abc

* commit 'b8995b7abc9cbaa1dcb363c68535a63f4e8768a3':
  Don't show new-window item in Downloads per Gabe.

Change-Id: I54d288582f474ed1a0718a3f6327af7f1814be75
2016-05-13 17:42:44 +00:00
Steve McKay
b8995b7abc Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev am: fec0d188c1
am: 6fdaf2f2cf

* commit '6fdaf2f2cf0d060c7f99baa28ff0514c31faa84f':
  Don't show new-window item in Downloads per Gabe.

Change-Id: If6dbf8d3d23f3e97fcf2db9ad7261c9217bfa631
2016-05-13 17:34:16 +00:00
Felipe Leme
5118db67f7 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 25018d41f4 am: cc02a95cbd
am: 6e12f9d36d

* commit '6e12f9d36da3214367fc4ad5510220a397970aa2':
  Fixed connectivity state in some power saving scenarios.

Change-Id: Idd27e581b208a0d80d8fa6a4d7cf75eac82a32fd
2016-05-13 17:31:58 +00:00
Steve McKay
6fdaf2f2cf Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev
am: fec0d188c1

* commit 'fec0d188c166e5a2c517f4494e83c1db11b31c68':
  Don't show new-window item in Downloads per Gabe.

Change-Id: Ic8d6afb5e38c1ded0ca7750be4ac4822aefbe6c1
2016-05-13 17:31:35 +00:00
Steve McKay
270539c6d0 Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev
am: fec0d188c1

* commit 'fec0d188c166e5a2c517f4494e83c1db11b31c68':
  Don't show new-window item in Downloads per Gabe.

Change-Id: I3e7b11561ad3d6a3407119428a2e20709072f53a
2016-05-13 17:31:32 +00:00
TreeHugger Robot
fec0d188c1 Merge "Don't show new-window item in Downloads per Gabe." into nyc-dev 2016-05-13 17:26:46 +00:00
Felipe Leme
6e12f9d36d Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 25018d41f4
am: cc02a95cbd

* commit 'cc02a95cbd694927cd70d7b0d7921d3f10300b38':
  Fixed connectivity state in some power saving scenarios.

Change-Id: I9ce60e8520c041e1345960a51394f8477c4ac49e
2016-05-13 17:26:29 +00:00
Felipe Leme
e90dee0077 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
am: 25018d41f4

* commit '25018d41f482fe21a45eb2e739f22dc7cc937428':
  Fixed connectivity state in some power saving scenarios.

Change-Id: I7ebe3864657d2147034ffae400312e94deb5ef35
2016-05-13 17:23:24 +00:00
Felipe Leme
cc02a95cbd Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
am: 25018d41f4

* commit '25018d41f482fe21a45eb2e739f22dc7cc937428':
  Fixed connectivity state in some power saving scenarios.

Change-Id: If76cc55916bbd7e5e4093b39ff81a40c1e43034c
2016-05-13 17:23:19 +00:00
TreeHugger Robot
25018d41f4 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev 2016-05-13 17:14:13 +00:00
Steven Ng
335e4bdf60 Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev am: e333b2eb81
am: a62fc512da

* commit 'a62fc512dae936ec1d8573cacbd4e649ecd9be1f':
  Add a Global setting for disabling OEM unlocking setting

Change-Id: I8e0f6f00599923be663c9808ffa187bbe014121c
2016-05-13 11:38:43 +00:00
Steven Ng
a62fc512da Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
am: e333b2eb81

* commit 'e333b2eb81958cc8d27eb687ebd84844a84919ea':
  Add a Global setting for disabling OEM unlocking setting

Change-Id: I625b51c1e257afa095dfacb3bcf481fb2068b56f
2016-05-13 11:36:20 +00:00
Steven Ng
e333b2eb81 Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev 2016-05-13 11:27:59 +00: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