Commit Graph

36241 Commits

Author SHA1 Message Date
Robert Carr
1b3e08b4d1 Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev
am: 1669d42808

* commit '1669d42808251eebddfe5e176eb8d322b84df636':
  Never set resized while not drag resizing for pinned stack.

Change-Id: I5da72476c63c5f368e7ff8c1269308d206761ffd
2016-05-19 21:45:58 +00:00
Damien Bargiacchi
96783005d7 Merge "Start the Wear Time System Service with SystemServer" into nyc-mr1-dev 2016-05-19 20:56:52 +00:00
Robert Carr
031384556e Never set resized while not drag resizing for pinned stack.
It's not necessary in the pinned stack and interferes with the
animation. It's not enough to just check getBoundsAnimating, as
we turn that off prior to the final resize so that we unmute
notifications to the client.

Bug: 28559097
Change-Id: Iae180c8a8ca0585184efcf24e7677557a33678eb
2016-05-19 13:19:53 -07:00
Christopher Tate
2b2ad77fdb Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev
am: 9d37bdcb91

* commit '9d37bdcb91dffbfeebc45ef5ae7724c556cb6864':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: I0dce83effbb05d52e2bcfb6f0ff48badbab71655
2016-05-19 19:44:42 +00:00
Chris Tate
9d37bdcb91 Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev 2016-05-19 19:34:08 +00:00
Wyatt Riley
2f052f8e94 Merge "Mapping up/down of legacy Gps vs. Gnss Status" into nyc-dev
am: b5b03bc450

* commit 'b5b03bc450235ffa85ac636da460b61f1e99bff1':
  Mapping up/down of legacy Gps vs. Gnss Status

Change-Id: I2ff6c7714ecca01cb75176452cdbd2ec969fc937
2016-05-19 18:49:30 +00:00
Wyatt Riley
b5b03bc450 Merge "Mapping up/down of legacy Gps vs. Gnss Status" into nyc-dev 2016-05-19 18:37:54 +00:00
Sanket Agarwal
9d2441369b While turning OFF do not honor ON requests.
am: 090bf55130

* commit '090bf551308e68b1b2a996c959b608cabd025c5c':
  While turning OFF do not honor ON requests.

Change-Id: I528c640a9bc482fbbec3b11eef6569c93a632b76
2016-05-19 18:32:24 +00:00
Sanket Agarwal
090bf55130 While turning OFF do not honor ON requests.
Native stack does not handle being put from OFF -> ON state without
doing a complete cleanup. Hence instead of going from start -> ON -> OFF
-> cleanup it goes start -> ON -> OFF ->ON -> ... usually leads to race
conditions down the road in native.

This patch is a workaround so that we can throw away the requests if we
are in currently "turning off" phase. The side-effect would be that user
will need to turn it ON again. The race happens when the turn OFF time
is longer but usually it is found to be close to order of seconds hence
the wait should be bounded.

Bug: b/28318203
Change-Id: I14f6633f31311e5b561e1dcbc8a9d6d2a5dd6fdc
2016-05-19 18:27:27 +00:00
Christopher Tate
98d609ce3f Incorporate feedback on new wallpaper-related APIs
- Documentation
- Method naming
- Throwing exceptions rather than returning zero/null/false on input failures

Bug 28773334

Change-Id: Ia41c1e31c76b7114f3ffeb16033384cac5a1031d
2016-05-19 10:33:22 -07:00
Andrii Kulian
5ac36afb0b Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev
am: 7fae7be595

* commit '7fae7be59514ba6a7fdc10bdb47c9a9fe09d2cef':
  Clear mResizedWhileNotDragResizing flag after reporting

Change-Id: Iab79d8cdb6f1f93bb44cceaaea5a838aee8e1cb0
2016-05-19 17:19:54 +00:00
Andrii Kulian
7fae7be595 Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev 2016-05-19 17:11:35 +00:00
Wyatt Riley
49d9891c57 Mapping up/down of legacy Gps vs. Gnss Status
- Maps incoming (from HAL) GpsSvStatus for Glonass, Beidou, SBAS, and QZSS
  from defacto (NMEA-like) numbers to internal platform with detected constellation.
- Maps outgoing (to Java API) GpsStatus getSatellite info back into the de-facto
  overloaded (beyond 32) "GPS" ID numbers.
- Simplifies Glonass ID definition for N (comments only.)
- This enables GPS/GNSS Test apps a non-degrading upgrade path.

Bug: 28623392
Change-Id: I9a19db1f11267032c6927daed767df5afa51c770
2016-05-19 09:55:42 -07:00
Michael Wright
ce290a75f2 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I03543851263b7e9e2f84b179d66d3d269c48bf6c
2016-05-19 15:12:29 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Erik Kline
8958153ac7 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I10ed64f309794ed7a18e16f22fa75bc63707998c
2016-05-19 04:21:15 +00:00
Erik Kline
c21f84dddb Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 2016-05-19 04:12:40 +00:00
Andrii Kulian
1699b51cbe Merge "Rename minWidth/Height attributes" into nyc-dev
am: 42b3acf9d3

* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
  Rename minWidth/Height attributes

Change-Id: Id7d89884ea46b3900459af10f5b4a4b32139ddd8
2016-05-19 01:48:29 +00:00
Andrii Kulian
42b3acf9d3 Merge "Rename minWidth/Height attributes" into nyc-dev 2016-05-19 01:42:15 +00:00
Selim Cinek
8b624e5978 Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev
am: a75bd7d4e0

* commit 'a75bd7d4e01985c8ad8aa57960337cc3507f374a':
  Fixed a bug where autobundling could lead to bugs

Change-Id: I41033eaf326565f73cd2cbb2eb0d2a16be0e430f
2016-05-19 01:06:28 +00:00
TreeHugger Robot
a75bd7d4e0 Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev 2016-05-19 00:58:25 +00:00
Robin Lee
43fbfbf94c Merge "Lock down networking when waiting for always-on" into nyc-dev
am: d171df660e

* commit 'd171df660e19bdba4d188beeb8b6023874712413':
  Lock down networking when waiting for always-on

Change-Id: I34fffb119eecef0052be673f307ef63c94fc58ee
2016-05-18 23:42:40 +00:00
Robin Lee
d171df660e Merge "Lock down networking when waiting for always-on" into nyc-dev 2016-05-18 23:37:24 +00:00
Selim Cinek
5b03ce95c7 Fixed a bug where autobundling could lead to bugs
Notifications could appear twice if a notification with an app
group became bundled and one could not be swiped away anymore.
This is because we were unconditionally copying over the override
key even if the notification just became a group.

This also fixes a nullpointer that could happen with a racecondition
when a notification was cancelled and it tried to be used for autobundling.

This also fixes an issue that the autobundling wasn't working correctly
when a notification didn't have a group set but was set to be a
group summary.

Change-Id: Icd971f16ae0804ce162fd3171fcdd99bd04f3885
Fixes: 28706404
Fixes: 28628237
2016-05-18 16:31:41 -07:00
Robin Lee
17e6183b85 Lock down networking when waiting for always-on
Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa
2016-05-19 00:26:53 +01:00
Paul Crowley
2a1076339e Merge "Two phases to set the password for disk encryption" into nyc-dev
am: 56a9395aeb

* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
  Two phases to set the password for disk encryption

Change-Id: I76b3b1351ea85d8a5e42da523f57a291b3a1b0d9
2016-05-18 22:50:02 +00:00
Paul Crowley
56a9395aeb Merge "Two phases to set the password for disk encryption" into nyc-dev 2016-05-18 22:40:09 +00:00
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
Robert Carr
76ad440346 Merge "Correct PiP inset adjustment." into nyc-dev
am: 54a3dd53fe

* commit '54a3dd53fe6028db1f1c797ed6be12ccb6263ecf':
  Correct PiP inset adjustment.

Change-Id: I7e9ad20b69c5bfc99828537535bf83e6c864ffeb
2016-05-18 22:05:26 +00:00
TreeHugger Robot
bc9edc7ccb Merge "Fixes for ending PiP animation." into nyc-dev 2016-05-18 21:57:23 +00:00
TreeHugger Robot
54a3dd53fe Merge "Correct PiP inset adjustment." into nyc-dev 2016-05-18 21:57:04 +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
Chong Zhang
c5bdda2236 Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev
am: ff8ceadfc8

* commit 'ff8ceadfc8c5f03da57420ad93a698cb0a57fcd9':
  Request a traversal when a saved surface gets redrawn

Change-Id: I5cd93f39d2cf2b11e405f4d9f05ecb6bc2040267
2016-05-18 21:01:44 +00:00
Chong Zhang
ff8ceadfc8 Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev 2016-05-18 20:57:30 +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
Robert Carr
bc13376449 Correct PiP inset adjustment.
We want to calculate the scaling factor we need to have
the content area of the surface (not including insets) to reach
our desired size, otherwise we will seem to scale the insets
up or down over time.

Bug: 28559097
Change-Id: I86dbd5fc902b5d380d33dba626c6694b3c57ff25
2016-05-18 13:24:10 -07:00
Amith Yamasani
ebbf0b6b21 Merge "Fix a deadlock in system server" into nyc-dev
am: ab0744344d

* commit 'ab0744344db3e626f1a249f285289b66653cf6bb':
  Fix a deadlock in system server

Change-Id: Ib223cf25d4ac53225e9e8791bdae497956dc8471
2016-05-18 20:22:07 +00:00
TreeHugger Robot
ab0744344d Merge "Fix a deadlock in system server" into nyc-dev 2016-05-18 20:12:27 +00:00
Jorim Jaggi
e19f2f2fc9 Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev
am: 96b2fe6a4e

* commit '96b2fe6a4eec82635f39c025ee9c57e99207a3df':
  Fix a few issues with ime adjust/minimized dock stack

Change-Id: I29e2d748e77f7773d7fc45440c1f807b25389ac5
2016-05-18 19:34:26 +00:00
Christopher Tate
69b65f2012 Explicitly close pipe end when we cease operations...
am: 3bed1c0ef8

* commit '3bed1c0ef8a66c4ce064b1c6ee443681070c5fcb':
  Explicitly close pipe end when we cease operations...

Change-Id: Iefb271ac59812bee8e271bbfe6fc73fcd60c4581
2016-05-18 19:28:24 +00:00
Jorim Jaggi
3070e77f91 Fix a few issues with ime adjust/minimized dock stack
- Do not override minimized state in SysUI when IME adjust change
comes in.
- Do not animate IME adjust if we are already animating for minimized.
This lead to problems that we animated the minimized state with the IME
adjust values.
- Make sure to update state after checking whether the IME adjust is
animating. This is to fix an issue where sometimes the IME adjust
animation didn't run because the old target was wrong.

Change-Id: Ie35e2f943a4cda99ffdc6f14663d892863759e46
Fixes: 28819201
2016-05-18 19:27:24 +00:00
Christopher Tate
3bed1c0ef8 Explicitly close pipe end when we cease operations...
...because the other in-VM reference to that FD means that it won't
get GC'd after we release our local reference to the containing object,
and we wind up with the feeder end blocking on write to a still-fully-
open pipe rather than being made aware that the read end has needed
to shut down.

Bug 28756668

Change-Id: I90b6aaeaabe7d912d96d7ef57c24f68d87d9d0ab
2016-05-18 19:24:32 +00:00
Ruben Brunk
775982b830 Merge "Update VrListener location permission." into nyc-dev
am: 403970c3ce

* commit '403970c3ce8fe76b34ff966c43e3e11debeef582':
  Update VrListener location permission.

Change-Id: Ie40926579463b1f08c7f490be63f83e32854470b
2016-05-18 19:07:18 +00:00
Jeff Sharkey
11c68e8cc9 Merge "Check processName when starting providers." into nyc-dev
am: 6bd012a799

* commit '6bd012a799f1dfd3d40dc3d581d18fb36618f0b1':
  Check processName when starting providers.

Change-Id: I5a7bfd0756d0e84288ae69ce2f2263d5a51ea045
2016-05-18 19:02:30 +00:00
Ruben Brunk
403970c3ce Merge "Update VrListener location permission." into nyc-dev 2016-05-18 18:57:09 +00:00
Jeff Sharkey
6bd012a799 Merge "Check processName when starting providers." into nyc-dev 2016-05-18 18:52:03 +00:00
Amith Yamasani
3603bc6e3f Fix a deadlock in system server
Don't call into DPMS with PackageManager lock held. Doh!

Bug: 28828415
Change-Id: I08437d849236374acc0d804fe31aba703af385ba
2016-05-18 11:51:09 -07: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