Commit Graph

63503 Commits

Author SHA1 Message Date
Robert Carr
9782de1ffd Merge "Fixes for ending PiP animation." into nyc-dev
am: bc9edc7ccb

* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
  Fixes for ending PiP animation.

Change-Id: If885965536859bc2433d14d4993010871c171360
2016-05-18 22:05:30 +00:00
TreeHugger Robot
bc9edc7ccb Merge "Fixes for ending PiP animation." into nyc-dev 2016-05-18 21:57:23 +00:00
Winson
6e2ee9e382 Merge "Mark occluded home stack as invisible." into nyc-dev
am: 32b54f2e42

* commit '32b54f2e42c4ff793c418c29c0ce9ef0be2a4a16':
  Mark occluded home stack as invisible.

Change-Id: Iaa68bb7c93ffd8bcfc9af3e66fd7fced7787a671
2016-05-18 21:49:17 +00:00
Winson Chung
32b54f2e42 Merge "Mark occluded home stack as invisible." into nyc-dev 2016-05-18 21:42:57 +00:00
Amith Yamasani
dbf0dbd8c2 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev 2016-05-18 20:57:12 +00:00
Robert Carr
c7294607fc Fixes for ending PiP animation.
During the PiP animation, we have two basic requirements:
   1. We need to scale windows to the pinned stack bounds.
   2. We need to halt resize and movement notifications to the client.
As we end the animation, we need to disable these states at differing
times. First we need to deliver a final resize and movement notification
to the client for it's new position. However, Surfaces may not
immediately resize (in particular in the case of child windows,
it may be some time!), furthermore Surfaces may resize at different
times so we need to persist scaling on a Surface by Surface
basis after reenabling resize notifications.

Bug: 28559097
Change-Id: I6d52a3e213e08a34f4c0eea892b2a84cd4c20e18
2016-05-18 13:24:41 -07:00
Svet Ganov
75a364eabf Merge "Hide ephemeral API" into nyc-dev
am: 68c2919f70

* commit '68c2919f70299352ae649e1d7a05e9431f8b7aa0':
  Hide ephemeral API

Change-Id: I033dcf9e551cf3a110aea0b3493e3cdad9a38d80
2016-05-18 20:16:33 +00:00
Svetoslav Ganov
68c2919f70 Merge "Hide ephemeral API" into nyc-dev 2016-05-18 20:10:28 +00:00
Sudheer Shanka
db9d529499 Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev
am: 0d902adbbc

* commit '0d902adbbc729f87f94fd70d9a6331e551108bc0':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: Iaad04447c2fffd0f6b80c22bfea576e5d2b28856
2016-05-18 17:14:29 +00:00
TreeHugger Robot
0d902adbbc Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 2016-05-18 17:09:46 +00:00
Robert Sesek
a83b4cfc74 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev
am: f45bc095c6

* commit 'f45bc095c6cef916f5f801fb320b3413f0fc099a':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: Ie16d11c4aaa515a570b8b717241d556903198d24
2016-05-18 15:32:18 +00:00
Robert Sesek
f45bc095c6 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 2016-05-18 15:25:41 +00:00
Svet Ganov
2265fddba6 Hide ephemeral API
bug:28825660

Change-Id: I4e9cdd6e29df44a173136aed13c4039443d944cc
2016-05-18 07:38:29 -07:00
Jim Miller
0991ba5b01 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev 2016-05-18 02:55:10 +00:00
Yohei Yukawa
13fa6b7c48 Merge "Move LocaleList to avoid layering violation." into nyc-dev
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I45e9b7e834d2c5e515eb6c60885296358e7d786e
2016-05-18 02:18:29 +00:00
Yohei Yukawa
31884efd13 Merge "Move LocaleList to avoid layering violation." into nyc-dev 2016-05-18 02:14:26 +00:00
Jim Miller
f4c0a13170 Add fingerprint navigation to enable pulling down the statusbar
Change-Id: If0584358fd615ebd9df11614c662f4f287abf5c4
2016-05-17 18:11:52 -07:00
Chris Craik
1edc049919 Merge "Document that SurfaceView is synchronous in N" into nyc-dev
am: 0cfbb7643e

* commit '0cfbb7643ef81cc8d1fd72bfe7c651d0e5e04949':
  Document that SurfaceView is synchronous in N

Change-Id: I1e4a36d64be663103c3150c86a75e2baa51fa4c4
2016-05-18 00:55:16 +00:00
Andrii Kulian
88a2a7be72 Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
am: 47aa3f61ac

* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I588355b4e5ac95e4f872bf06d77fd3d3346cddac
2016-05-18 00:55:12 +00:00
Joe Onorato
6f04fef272 Merge changes If51568c3,Idd434c19 into nyc-dev
am: 45165c9373

* commit '45165c9373f1bf2dbe0c3f11b271daa24414ea35':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Ibb36bb8d2c32c0fa8ec85eb093b8281f349158fb
2016-05-18 00:52:11 +00:00
TreeHugger Robot
0cfbb7643e Merge "Document that SurfaceView is synchronous in N" into nyc-dev 2016-05-18 00:51:57 +00:00
Andrii Kulian
47aa3f61ac Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev 2016-05-18 00:51:17 +00:00
Winson
529c8e4cf2 Mark occluded home stack as invisible.
- The home stack is still visible when a translucent activity (like 
  dialer) is on top, which caused us to use the logic path that just 
  tries to launch the next task.  However, that path does not reload
  the stack state (since the activity stack generally doesn’t change
  while Recents is visible) so it was always launching the already top
  activity.  The new check ensures that we start the activity anew
  as if it was coming from an occluding app.

Bug: 28767764
Change-Id: Iec0fdc0957e5070cec532c5de5cba3454c906a3b
2016-05-17 17:47:40 -07:00
TreeHugger Robot
45165c9373 Merge changes If51568c3,Idd434c19 into nyc-dev
* changes:
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from
2016-05-18 00:46:47 +00:00
Hangyu Kuang
8f3e14bc92 Merge "Hide HdrCapabilities constructor." into nyc-dev
am: c189934573

* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
  Hide HdrCapabilities constructor.

Change-Id: I55e8a10631507c6022a68467401f66ca70cfa0be
2016-05-18 00:46:31 +00:00
Hangyu Kuang
c189934573 Merge "Hide HdrCapabilities constructor." into nyc-dev 2016-05-18 00:42:55 +00:00
Jorim Jaggi
eae7928b34 Merge "Fix threading problems with drawables" into nyc-dev
am: 1e09e9826b

* commit '1e09e9826b24c6d877920b027954e0e861a336a0':
  Fix threading problems with drawables

Change-Id: I524eed30e7abb6aaf32cf596a8bb4de6ca52b673
2016-05-18 00:28:43 +00:00
TreeHugger Robot
1e09e9826b Merge "Fix threading problems with drawables" into nyc-dev 2016-05-18 00:24:04 +00:00
Adrian Roos
6cb72ee2eb Merge "Adjust Notification APIs per API council" into nyc-dev
am: 718ba309cf

* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
  Adjust Notification APIs per API council

Change-Id: Ic85fdd92c691f7b30cd73a9e1a7f147fcf55c3c5
2016-05-18 00:13:07 +00:00
Amith Yamasani
eb437d4dff Retail mode flag and some clients for it
Bug: 27280140
Change-Id: Ide33e941b9c71eb925b5977d0b0d62198537ca14
2016-05-18 00:07:36 +00:00
TreeHugger Robot
718ba309cf Merge "Adjust Notification APIs per API council" into nyc-dev 2016-05-18 00:06:30 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation.
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Chris Craik
6ee192f4e9 Document that SurfaceView is synchronous in N
bug:28821062

Change-Id: I1c17949d93de3d1f89c504fc061f7d20dd451a4d
2016-05-17 16:17:25 -07:00
Jorim Jaggi
ca0cf0f529 Fix threading problems with drawables
We can't use the same instance on both the main and the background
thread, as this will lead to problems.

Change-Id: Ieec525f028df2d0596667126d8f5004773461517
Fixes: 28745682
2016-05-17 23:05:38 +00:00
Robert Sesek
55b2d11cd3 Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.
Bug: 28775488
Change-Id: Ic0473d3664671f0ac5df8412f61ca8c1d029887f
2016-05-17 18:53:13 -04:00
Adrian Roos
96b7e20ba6 Adjust Notification APIs per API council
Also fixes a slight bug where a CharSequence extra
was retrieved as a string.

Change-Id: I8a40ab1934b8a20355c3cd4afd66a4a7b91fb517
Fixes: 28775580
Fixes: 28775582
2016-05-17 15:35:33 -07:00
Joe Onorato
1cc1d13d6e Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
It's raising alarm bells but there isn't much we can do without a lot
of rewriting inside the ActivityManager.  The only consequence is stats
that are off by a little bit.

Bug: 28581070
Change-Id: If51568c3a708a907ceef6452e7d45599a57454f7
2016-05-17 15:31:38 -07:00
Joe Onorato
22cfef381d @hide SystemHealthManager.from
Bug: 28820055
Change-Id: Idd434c196428178e2c66facea36a7e010246611c
2016-05-17 15:29:51 -07:00
Dianne Hackborn
ab82de14b1 Merge "Work on issue #28689719: Runtime restart" into nyc-dev
am: 77ad5f1657

* commit '77ad5f1657a8bef6b28f69f9bd8a2d1978c88a57':
  Work on issue #28689719: Runtime restart

Change-Id: Ic44a4f56be67e3a50932d6bfbb58cdca6536e501
2016-05-17 22:06:57 +00:00
Dianne Hackborn
77ad5f1657 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 2016-05-17 21:58:21 +00:00
Hangyu Kuang
1e7d1aa6a6 Hide HdrCapabilities constructor.
Bug:25684127
Change-Id: I1a30ab3c162d8891c8aea1447757c85942033a0d
2016-05-17 14:21:01 -07: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
Andrii Kulian
5c96320e40 DO NOT MERGE Hide decor caption APIs
Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.

Bug: 28774476
Change-Id: Ic2de33c5a611a515fc1c72535587ebf2e0a03a7f
2016-05-17 20:56:24 +00:00
Dianne Hackborn
2675616719 Work on issue #28689719: Runtime restart
There are few paths I can see to get a null intent down into
the framework at this point.  Add in some checks and reports
at those places to mitigate and report such problems.

Change-Id: If235bf342558321d3fabe9363fcebb2bcea18df1
2016-05-17 13:40:44 -07:00
Sudheer Shanka
93f8fd714a Update RestrictedLockUtils to use UM.getUserRestrictionSource.
Bug: 28269827
Change-Id: Ib4a1441b71986ca6637a9236136b60e18dbc1643
2016-05-17 13:27:27 -07:00
Felipe Leme
3b91df7ccf Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev
am: 2c6a450fa2

* commit '2c6a450fa23b97e6082e2daa1aa9c7f07a4def8f':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Id9cb27070e1e72b12c5ade60b637e63319021f90
2016-05-17 18:39:02 +00:00
Martijn Coenen
225d221945 Merge "Adddress NFC API review comments." into nyc-dev
am: 1fef88d8dc

* commit '1fef88d8dc8e25c71dc6b217202593e0f17b2105':
  Adddress NFC API review comments.

Change-Id: Ib327612766f91c583ea0a23e71bac34615edd12d
2016-05-17 18:38:40 +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
TreeHugger Robot
2c6a450fa2 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 2016-05-17 18:28:22 +00:00