248141 Commits

Author SHA1 Message Date
Chris Craik
45e83338e5 Round unclipped saveLayers
fixes: 29456451

Change-Id: I2be8b47c46936e75071ad0819a718f72b96cbd2b
(cherry picked from commit d5a90114128f4d3d528f1a0e93651496c968f940)
2016-06-27 21:06:35 +00:00
Andrii Kulian
bb7c5aca25 Merge \"Resume only activities in focused stack\" into nyc-dev
am: 06b1d786e9

Change-Id: I699695002213bdc0482d6b44447a5c26a27445d1
2016-06-27 21:02:56 +00:00
Jorim Jaggi
573e85fff8 Merge \"Fix smooth panel deceleration\" into nyc-dev
am: e858432241

Change-Id: I2520d88620d5f3f12cab60a9422db8a41e40bec8
2016-06-27 20:54:29 +00:00
Andrii Kulian
06b1d786e9 Merge "Resume only activities in focused stack" into nyc-dev 2016-06-27 20:50:02 +00:00
TreeHugger Robot
e858432241 Merge "Fix smooth panel deceleration" into nyc-dev 2016-06-27 20:44:56 +00:00
John Reck
7b570deea6 Fix SurfaceViewPositionListener race bugs
Bug: 29628138

1: Make windowPositionLost synchronous as that's
what the Java side was expecting

2: Make the listener ref counted as otherwise
there's a race condition with the GC, which could
end up with use-after-frees

3: Ensure that all position updates are invoked
prior to frame completion

Change-Id: Iedbc017f611ba2878a49b4586612f79249ca2fe3
2016-06-27 13:35:13 -07:00
Android Build Merger (Role)
157c6811de Merge "Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev am: 95fbc2de1b" into nyc-mr1-dev 2016-06-27 20:21:26 +00:00
Dan Albert
b82f7fd2c0 Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev
am: 95fbc2de1b

Change-Id: I612b9e58060b46af2b1dce7f6d0faf91d9674d8c
2016-06-27 20:21:01 +00:00
Yohei Yukawa
cb56978912 Merge "Use a flag to grant a temporary URI permission." into nyc-mr1-dev 2016-06-27 20:18:51 +00:00
TreeHugger Robot
95fbc2de1b Merge "Fix mistranslation from the NDK changelog." into nyc-dev 2016-06-27 20:13:53 +00:00
Amith Yamasani
88a4c5ba4e Merge "Don't reuse userids that are being cleaned up on boot" into nyc-mr1-dev 2016-06-27 20:13:01 +00:00
Android Build Merger (Role)
61ef7897bd Merge "Remove reference to obsolete installation step. am: 17d0ccb1a9" into nyc-mr1-dev 2016-06-27 20:02:55 +00:00
Dan Albert
36b3143dc2 Remove reference to obsolete installation step.
am: 17d0ccb1a9

Change-Id: Iee295980a2c19e4319f569e81f9875d61b52506f
2016-06-27 20:02:29 +00:00
Andrew Sapperstein
26a17dc894 Merge "Add new private theme for Dialer." into nyc-mr1-dev 2016-06-27 20:01:32 +00:00
Adam Lesinski
6aec452f91 Fix AttributeCache
AttributeCache relied on the frequency of the garbage collector
to clean up resource references. The garbage collector seems to have
gotten faster and the cache essentially doesn't cache anything.

Switch to using an LRU cache that holds strong references to
a finite set of Resources. This should be very small, just to
keep the few working apps involved in app switches in memory.

Bug:29405575
Change-Id: I64b34742c820f1e7872061a574e6cf1a76887149
2016-06-27 12:30:02 -07:00
Sanket Padawe
afcc40f818 Merge "Fix documentation of getTelephonyHistogram() api." into nyc-mr1-dev 2016-06-27 19:21:56 +00:00
Philip Cuadra
e9d6d6dcf5 Merge "Add tracing events for system service lifecycle events" into nyc-mr1-dev 2016-06-27 19:02:07 +00:00
Sanket Padawe
7f89016579 Fix documentation of getTelephonyHistogram() api.
Bug: 29760459
Change-Id: Ib7c4df81026331f88f6a8776c0042abf4f32c620
2016-06-27 11:57:01 -07:00
Jorim Jaggi
0fdf574bc8 Fix smooth panel deceleration
State of dismiss view was wrong when the panel was closed, thus, we didn't
apply our logic for smooth panel deceleration anymore.

Bug: 29579394
Change-Id: I79718517e776adad092457aba6db18219998fde1
2016-06-27 18:54:34 +00:00
Steven Ng
dc52eaaa98 Merge "Disallow disable / hide device provision app" into nyc-mr1-dev 2016-06-27 18:50:02 +00:00
Dan Albert
cb76aad0c4 Fix mistranslation from the NDK changelog.
Gingerbread begins at API level 9, not 10.

Bug: https://github.com/android-ndk/ndk/issues/136
Change-Id: Ie65e543c06bed925f33e2cac92a27d6b83934a88
2016-06-27 11:19:11 -07:00
Cheryl Potter
3a6b63ee7e Merge \"Add redirect for new Run/Debug Config doc b/29615014\" into nyc-dev
am: 5836c9e658

Change-Id: I0ee8a4c36279b6bd339454ad71bb2cba289f8306
2016-06-27 18:17:15 +00:00
Dan Albert
17d0ccb1a9 Remove reference to obsolete installation step.
Bug: https://github.com/android-ndk/ndk/issues/136
Change-Id: Idd08b009fefd69053675545bf94fda2147e01318
2016-06-27 11:16:42 -07:00
Amith Yamasani
b75fc2b2b7 Add tron logging for retail demo session counters
Count each demo user creation and time between
first touch (to dismiss the video) and the start
of inactivity timeout.

Fixed an NPE in SysUI when user switcher is missing.

Bug: 29540372
Change-Id: I7bc0e0dde75e7b213a025683c15c9b3e750643a9
2016-06-27 11:15:38 -07:00
Mitchell Wills
9f750bf5f4 Merge "Add a WifiScanner API to listener for ongoing scans" into nyc-mr1-dev 2016-06-27 18:12:41 +00:00
Philip P. Moltmann
b6ee468b3e Merge "Do not remove handlers for loaders." into nyc-mr1-dev 2016-06-27 18:12:12 +00:00
Cheryl Potter
5836c9e658 Merge "Add redirect for new Run/Debug Config doc b/29615014" into nyc-dev 2016-06-27 18:02:54 +00:00
Amith Yamasani
ae26189aa9 Don't reuse userids that are being cleaned up on boot
During the current session, if we're cleaning up some
old users, mark them as being in the remove pile so
that the userIds are not reused right away. Otherwise
there's a potential for confusing the file-based crypto
layer.

Bug: 29635364
Change-Id: I57a868fbe6c58a02ffcea63809d25eba01360e1e
2016-06-27 10:58:39 -07:00
Andrii Kulian
c11ce7b1cd Resume only activities in focused stack
While performing ensureActivitiesVisibleLocked we should only
resume activity in focused stack. Otherwise we can get several
resumed activities at the same time.

Bug: 29619461
Change-Id: Id65fe1a29841ee3166694bfb6a8236151b9fc7ec
2016-06-27 10:58:13 -07:00
Tyler Gunn
7d633d3337 Add onConferenceSupportedChanged callback, carrier config.
Used to inform listeners when a connection can or cannot be part of a
conference.  Used to inform the conference controller so that it can
recalculate the conferencable connections.

Adding carrier config for carrier requirement.

Bug: 29059073
Change-Id: Iab028fd44d87c8dc2bbbe8bba7ba9ccdc223fe51
2016-06-27 10:49:04 -07:00
Bill Yi
9fe8474ec7 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: cc67847367  -s ours

Change-Id: I920bd6e3739bf4fe103e5ba8fd26d2a0c10e52b0
2016-06-27 17:48:16 +00:00
TreeHugger Robot
cc67847367 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-27 17:34:25 +00:00
TreeHugger Robot
6ad70eaa60 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-27 17:33:55 +00:00
TreeHugger Robot
06676e897a Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-27 17:33:00 +00:00
TreeHugger Robot
8a009f43bf Merge "Fixed bug with continuously changing orientation while dreaming" into nyc-mr1-dev 2016-06-27 17:24:23 +00:00
Wale Ogunwale
b59b5a679a Merge "Added checks while unfreezing bounds" into nyc-mr1-dev 2016-06-27 17:19:57 +00:00
Dan Sandler
d6b907d58f Merge \"Most cats would prefer chicken.\" into nyc-dev
am: d9069f8c9e

Change-Id: I6823b871b8a9eeb042d92395ee0a98ca050350dc
2016-06-27 17:17:43 +00:00
Wale Ogunwale
37dbafce9b Added checks while unfreezing bounds
- Make sure we don't try to remove from an empty list
- No need to do anything if the relaunch count is already 0.

Bug: 29758829
Change-Id: I042c231269a2297bb4b2ddd78092827c6738d192
2016-06-27 10:15:20 -07:00
John Reck
0fc8707e2d Merge \"Add missing null checks\" into nyc-dev
am: 02e391585d

Change-Id: Idcba5c8393609034b70382844d499b45759b5e6d
2016-06-27 17:06:24 +00:00
Daniel Sandler
d9069f8c9e Merge "Most cats would prefer chicken." into nyc-dev 2016-06-27 16:56:30 +00:00
John Reck
02e391585d Merge "Add missing null checks" into nyc-dev 2016-06-27 16:55:30 +00:00
Dan Sandler
9a9e673bc5 Most cats would prefer chicken.
Bug: 27376882
Change-Id: I2c6d04c2515fd23e44120a3f9ffd6b1668d521ff
2016-06-27 16:34:33 +00:00
Wale Ogunwale
45f8aaca7c Merge "Reset relaunching count is app dies during re-launch" into nyc-mr1-dev 2016-06-27 16:25:13 +00:00
Cheryl Potter
2403ac1089 Add redirect for new Run/Debug Config doc
b/29615014

Change-Id: Iff3d896d5f3788d0d20be0bfb6f305a77e094721
2016-06-27 09:23:14 -07:00
Lajos Molnar
8ae7c6b61e Merge \"media: document format keys for MediaMuxer\" into nyc-dev
am: 5059e65fec

Change-Id: If461a20e0fc2dabb62bbdf8bbfbc5d41ef803a85
2016-06-27 16:16:37 +00:00
Lajos Molnar
153d6e5531 Merge \"media: document output image crop and layout for MediaCodec\" into nyc-dev
am: 939484b8ab

Change-Id: I673b0f8721c3be180464268826c85e11b107b293
2016-06-27 16:16:34 +00:00
TreeHugger Robot
5059e65fec Merge "media: document format keys for MediaMuxer" into nyc-dev 2016-06-27 16:10:39 +00:00
TreeHugger Robot
939484b8ab Merge "media: document output image crop and layout for MediaCodec" into nyc-dev 2016-06-27 16:09:52 +00:00
Wale Ogunwale
049b6d8927 Fixed bug with continuously changing orientation while dreaming
If the keyguard is locked while the device is dreaming in landscape
mode, the display will be frozen. When this happens we want to continue
to use the orientation the keyguard forced since that will be the
orientation used once the display is no longer frozen vs. switching to
the orientation of the top activity.

Bug: 29542506
Change-Id: I30a8370357735dcdff336a562ca248aa9206ae29
2016-06-27 08:46:09 -07:00
Chris Wren
4e4d325b56 Merge "use an observer for the default sound" into nyc-mr1-dev 2016-06-27 15:08:03 +00:00