OSDN Git Service
Chris Craik [Tue, 28 Jun 2016 16:33:04 +0000 (09:33 -0700)]
Clip GradientDrawable's saveLayer
bug:
29456451
Avoid using very expensive unclipped saveLayer codepath.
Change-Id: Ib96a46169faa89eda6889b16813a7941ab402779
Christopher Tate [Mon, 27 Jun 2016 23:24:01 +0000 (23:24 +0000)]
Merge \"Fix #
29737133 : content-trigger jobs not running properly\" into nyc-dev
am:
f480698298
Change-Id: I957ae07c46573f0e6a066cc1cb0a27b8bafe5811
Bill Yi [Mon, 27 Jun 2016 23:19:28 +0000 (23:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Chris Tate [Mon, 27 Jun 2016 23:18:30 +0000 (23:18 +0000)]
Merge "Fix #
29737133 : content-trigger jobs not running properly" into nyc-dev
Christopher Tate [Mon, 27 Jun 2016 23:12:41 +0000 (16:12 -0700)]
Fix #
29737133 : content-trigger jobs not running properly
When removing the ContentObserver wrapper from our internal
bookkeeping we were using the wrong key. That led to future
re-registrations thinking they were reusing a currently-
registered observers, but instead never getting onChange()
notifications.
Change-Id: Id3111db057ae63194049d7d48d45b75be6bb0000
TreeHugger Robot [Mon, 27 Jun 2016 23:11:32 +0000 (23:11 +0000)]
Merge "Fix AttributeCache" into nyc-mr1-dev
John Reck [Mon, 27 Jun 2016 22:28:41 +0000 (22:28 +0000)]
Merge \"Add missing roundOut for layer damage\" into nyc-dev
am:
48cde353eb
Change-Id: I99532e6b7992452523c4fb0716a7161c06b92950
John Reck [Mon, 27 Jun 2016 22:22:40 +0000 (22:22 +0000)]
Merge "Add missing roundOut for layer damage" into nyc-dev
John Reck [Mon, 27 Jun 2016 22:13:54 +0000 (15:13 -0700)]
Add missing roundOut for layer damage
fixes:
29771171
This is a regression from HWUI_NEW_OPS, a roundOut
was missing in the new path that was in the old one
Change-Id: Ibf223d550bb5525781864dd9b7f7cd6d73adb98b
William Harmon [Mon, 27 Jun 2016 22:15:45 +0000 (22:15 +0000)]
Merge "Allow system apps to have disabled QS tiles." into nyc-mr1-dev
Will Harmon [Sat, 25 Jun 2016 00:02:34 +0000 (17:02 -0700)]
Allow system apps to have disabled QS tiles.
Otherwise the tile can get removed on bootup if the tile is disabled by
default.
Fixes:
29509725
Change-Id: Icc6b63b6cf9b9cdca367c79c3175896c87041e05
Chris Craik [Mon, 27 Jun 2016 21:45:03 +0000 (21:45 +0000)]
Round unclipped saveLayers
am:
45e83338e5
Change-Id: Ifc598495cb8ad99b9f1534c1d783c3e4f483f1c5
Tyler Gunn [Mon, 27 Jun 2016 21:35:48 +0000 (21:35 +0000)]
Merge "Add onConferenceSupportedChanged callback, carrier config." into nyc-mr1-dev
Chris Craik [Fri, 24 Jun 2016 20:53:37 +0000 (13:53 -0700)]
Round unclipped saveLayers
fixes:
29456451
Change-Id: I2be8b47c46936e75071ad0819a718f72b96cbd2b
(cherry picked from commit
d5a90114128f4d3d528f1a0e93651496c968f940)
Andrii Kulian [Mon, 27 Jun 2016 21:02:56 +0000 (21:02 +0000)]
Merge \"Resume only activities in focused stack\" into nyc-dev
am:
06b1d786e9
Change-Id: I699695002213bdc0482d6b44447a5c26a27445d1
Jorim Jaggi [Mon, 27 Jun 2016 20:54:29 +0000 (20:54 +0000)]
Merge \"Fix smooth panel deceleration\" into nyc-dev
am:
e858432241
Change-Id: I2520d88620d5f3f12cab60a9422db8a41e40bec8
Andrii Kulian [Mon, 27 Jun 2016 20:50:01 +0000 (20:50 +0000)]
Merge "Resume only activities in focused stack" into nyc-dev
TreeHugger Robot [Mon, 27 Jun 2016 20:44:55 +0000 (20:44 +0000)]
Merge "Fix smooth panel deceleration" into nyc-dev
Android Build Merger (Role) [Mon, 27 Jun 2016 20:21:25 +0000 (20:21 +0000)]
Merge "Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev am:
95fbc2de1b" into nyc-mr1-dev
Dan Albert [Mon, 27 Jun 2016 20:21:01 +0000 (20:21 +0000)]
Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev
am:
95fbc2de1b
Change-Id: I612b9e58060b46af2b1dce7f6d0faf91d9674d8c
Yohei Yukawa [Mon, 27 Jun 2016 20:18:50 +0000 (20:18 +0000)]
Merge "Use a flag to grant a temporary URI permission." into nyc-mr1-dev
TreeHugger Robot [Mon, 27 Jun 2016 20:13:52 +0000 (20:13 +0000)]
Merge "Fix mistranslation from the NDK changelog." into nyc-dev
Amith Yamasani [Mon, 27 Jun 2016 20:13:00 +0000 (20:13 +0000)]
Merge "Don't reuse userids that are being cleaned up on boot" into nyc-mr1-dev
Android Build Merger (Role) [Mon, 27 Jun 2016 20:02:54 +0000 (20:02 +0000)]
Merge "Remove reference to obsolete installation step. am:
17d0ccb1a9" into nyc-mr1-dev
Dan Albert [Mon, 27 Jun 2016 20:02:29 +0000 (20:02 +0000)]
Remove reference to obsolete installation step.
am:
17d0ccb1a9
Change-Id: Iee295980a2c19e4319f569e81f9875d61b52506f
Andrew Sapperstein [Mon, 27 Jun 2016 20:01:31 +0000 (20:01 +0000)]
Merge "Add new private theme for Dialer." into nyc-mr1-dev
Adam Lesinski [Mon, 27 Jun 2016 19:30:02 +0000 (12:30 -0700)]
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
Sanket Padawe [Mon, 27 Jun 2016 19:21:55 +0000 (19:21 +0000)]
Merge "Fix documentation of getTelephonyHistogram() api." into nyc-mr1-dev
Philip Cuadra [Mon, 27 Jun 2016 19:02:06 +0000 (19:02 +0000)]
Merge "Add tracing events for system service lifecycle events" into nyc-mr1-dev
Sanket Padawe [Mon, 27 Jun 2016 18:57:01 +0000 (11:57 -0700)]
Fix documentation of getTelephonyHistogram() api.
Bug:
29760459
Change-Id: Ib7c4df81026331f88f6a8776c0042abf4f32c620
Jorim Jaggi [Mon, 27 Jun 2016 18:50:58 +0000 (11:50 -0700)]
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
Steven Ng [Mon, 27 Jun 2016 18:50:00 +0000 (18:50 +0000)]
Merge "Disallow disable / hide device provision app" into nyc-mr1-dev
Dan Albert [Mon, 27 Jun 2016 18:19:11 +0000 (11:19 -0700)]
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
Cheryl Potter [Mon, 27 Jun 2016 18:17:15 +0000 (18:17 +0000)]
Merge \"Add redirect for new Run/Debug Config doc b/
29615014\" into nyc-dev
am:
5836c9e658
Change-Id: I0ee8a4c36279b6bd339454ad71bb2cba289f8306
Dan Albert [Mon, 27 Jun 2016 17:52:24 +0000 (10:52 -0700)]
Remove reference to obsolete installation step.
Bug: https://github.com/android-ndk/ndk/issues/136
Change-Id: Idd08b009fefd69053675545bf94fda2147e01318
Mitchell Wills [Mon, 27 Jun 2016 18:12:39 +0000 (18:12 +0000)]
Merge "Add a WifiScanner API to listener for ongoing scans" into nyc-mr1-dev
Philip P. Moltmann [Mon, 27 Jun 2016 18:12:11 +0000 (18:12 +0000)]
Merge "Do not remove handlers for loaders." into nyc-mr1-dev
Cheryl Potter [Mon, 27 Jun 2016 18:02:53 +0000 (18:02 +0000)]
Merge "Add redirect for new Run/Debug Config doc b/
29615014" into nyc-dev
Amith Yamasani [Mon, 27 Jun 2016 17:40:09 +0000 (10:40 -0700)]
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
Andrii Kulian [Mon, 27 Jun 2016 17:53:53 +0000 (10:53 -0700)]
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
Tyler Gunn [Fri, 24 Jun 2016 14:30:10 +0000 (07:30 -0700)]
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
Bill Yi [Mon, 27 Jun 2016 17:48:16 +0000 (17:48 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
cc67847367 -s ours
Change-Id: I920bd6e3739bf4fe103e5ba8fd26d2a0c10e52b0
TreeHugger Robot [Mon, 27 Jun 2016 17:34:24 +0000 (17:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 27 Jun 2016 17:33:51 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 27 Jun 2016 17:32:59 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 27 Jun 2016 17:24:20 +0000 (17:24 +0000)]
Merge "Fixed bug with continuously changing orientation while dreaming" into nyc-mr1-dev
Wale Ogunwale [Mon, 27 Jun 2016 17:19:55 +0000 (17:19 +0000)]
Merge "Added checks while unfreezing bounds" into nyc-mr1-dev
Dan Sandler [Mon, 27 Jun 2016 17:17:43 +0000 (17:17 +0000)]
Merge \"Most cats would prefer chicken.\" into nyc-dev
am:
d9069f8c9e
Change-Id: I6823b871b8a9eeb042d92395ee0a98ca050350dc
Wale Ogunwale [Mon, 27 Jun 2016 17:15:20 +0000 (10:15 -0700)]
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
John Reck [Mon, 27 Jun 2016 17:06:24 +0000 (17:06 +0000)]
Merge \"Add missing null checks\" into nyc-dev
am:
02e391585d
Change-Id: Idcba5c8393609034b70382844d499b45759b5e6d
Daniel Sandler [Mon, 27 Jun 2016 16:56:29 +0000 (16:56 +0000)]
Merge "Most cats would prefer chicken." into nyc-dev
John Reck [Mon, 27 Jun 2016 16:55:28 +0000 (16:55 +0000)]
Merge "Add missing null checks" into nyc-dev
Dan Sandler [Mon, 27 Jun 2016 15:51:14 +0000 (11:51 -0400)]
Most cats would prefer chicken.
Bug:
27376882
Change-Id: I2c6d04c2515fd23e44120a3f9ffd6b1668d521ff
Wale Ogunwale [Mon, 27 Jun 2016 16:25:12 +0000 (16:25 +0000)]
Merge "Reset relaunching count is app dies during re-launch" into nyc-mr1-dev
Cheryl Potter [Mon, 27 Jun 2016 16:23:14 +0000 (09:23 -0700)]
Add redirect for new Run/Debug Config doc
b/
29615014
Change-Id: Iff3d896d5f3788d0d20be0bfb6f305a77e094721
Lajos Molnar [Mon, 27 Jun 2016 16:16:37 +0000 (16:16 +0000)]
Merge \"media: document format keys for MediaMuxer\" into nyc-dev
am:
5059e65fec
Change-Id: If461a20e0fc2dabb62bbdf8bbfbc5d41ef803a85
Lajos Molnar [Mon, 27 Jun 2016 16:16:34 +0000 (16:16 +0000)]
Merge \"media: document output image crop and layout for MediaCodec\" into nyc-dev
am:
939484b8ab
Change-Id: I673b0f8721c3be180464268826c85e11b107b293
TreeHugger Robot [Mon, 27 Jun 2016 16:10:38 +0000 (16:10 +0000)]
Merge "media: document format keys for MediaMuxer" into nyc-dev
TreeHugger Robot [Mon, 27 Jun 2016 16:09:50 +0000 (16:09 +0000)]
Merge "media: document output image crop and layout for MediaCodec" into nyc-dev
Wale Ogunwale [Mon, 27 Jun 2016 15:46:09 +0000 (08:46 -0700)]
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
Chris Wren [Mon, 27 Jun 2016 15:08:01 +0000 (15:08 +0000)]
Merge "use an observer for the default sound" into nyc-mr1-dev
John Reck [Mon, 27 Jun 2016 14:56:37 +0000 (07:56 -0700)]
Add missing null checks
Bug:
29743482
Change-Id: Ic4bc5b9d5718eabd41e09a108a765b01aef4e3c8
Wale Ogunwale [Fri, 24 Jun 2016 21:20:37 +0000 (14:20 -0700)]
Reset relaunching count is app dies during re-launch
WindowManager keeps a count of how many relaunches an app is told
to do so that it can defer app transtions until the relaunches are
done. If the app porcess is killed during one of the relaunches
the app will never report back that it is done relaunching, so
app transtions into the app will not happen until will timeout
from waiting for the app.
We now notify WM of this situation so it can clear the relaunching
count for the app.
Bug:
29551109
Change-Id: Ibadba9f73e6e1bde141385aa8a0e066fbc0c5764
Ricky Wai [Wed, 15 Jun 2016 10:36:23 +0000 (11:36 +0100)]
Hide superfluous 'Android system' header in Quite mode dialog
Bug:
28390642
Change-Id: Ief678e35a0d9e4a37f4499c307ceb928e179cac8
Bill Yi [Mon, 27 Jun 2016 10:08:44 +0000 (03:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I19cb889e99f1491d64d24df1e5a53ff594d2882e
Auto-generated-cl: translation import
Bill Yi [Mon, 27 Jun 2016 09:50:00 +0000 (02:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1fe4de7ebd39f56c6538fc03b34e0d889268ac4d
Auto-generated-cl: translation import
Bill Yi [Mon, 27 Jun 2016 09:31:14 +0000 (02:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I284d2545fccfcb6c0d5dbab92090a6dd6d749b64
Auto-generated-cl: translation import
Hugo Benichi [Mon, 27 Jun 2016 07:53:21 +0000 (07:53 +0000)]
Merge "Fix unsafe concurrent access in LegacyTypeTracker" into nyc-mr1-dev
TreeHugger Robot [Mon, 27 Jun 2016 06:18:56 +0000 (06:18 +0000)]
Merge "Delete one more legacy DHCP client string." into nyc-mr1-dev
Hugo Benichi [Tue, 21 Jun 2016 00:48:07 +0000 (09:48 +0900)]
Fix unsafe concurrent access in LegacyTypeTracker
This patch adds synchronization inside LegacyTypeTracker so that
getNetworkForType() can safely run concurrently with remove().
Without synchronization if remove() removes the last network for a
given type while getNetworkForType() runs for the same type, it is
possible that getNetworkForType tries to access the head of an empty
list, resulting in a runtime exception.
This issue was found by zoran.jovanovic@sonymobile.com who proposed a
fix in AOSP (Change-Id: Ia963662edb9d643790e8d9439e4dbdcac4c2187b).
This patch differs from the fix proposed by the bug reporter and tries
instead to do the minimum amount of locking to make getNetworkForType
safe.
Bug:
29030387
Change-Id: I915aac527fc8828b32bf35fee870add2dfb11d8d
Lorenzo Colitti [Sun, 26 Jun 2016 13:27:37 +0000 (22:27 +0900)]
Delete one more legacy DHCP client string.
Bug:
27192644
Change-Id: I945b399516e10a804cff64c470dfa967eb0d7860
Dirk Dougherty [Mon, 27 Jun 2016 02:54:28 +0000 (02:54 +0000)]
Merge \"Update finding success page to feature playbook.\" into nyc-dev
am:
61ae65f260
Change-Id: Ia4d4236d9e16de7a4b81a551d43edbd69c3d7c5d
Dirk Dougherty [Mon, 27 Jun 2016 02:49:25 +0000 (02:49 +0000)]
Merge "Update finding success page to feature playbook." into nyc-dev
Dan Sandler [Sun, 26 Jun 2016 22:55:59 +0000 (22:55 +0000)]
Cats are not, technically, tasty treats.
am:
27a9fcc618
Change-Id: I6ffdf66c9ef70052b7ba5ac5d926b32eae633fde
Dan Sandler [Wed, 22 Jun 2016 04:05:11 +0000 (00:05 -0400)]
Cats are not, technically, tasty treats.
Bug:
27376882
Change-Id: I97183339e51c5d07fe6e9404bbcc5178ca605c05
Copilot: Jason Monk <jmonk@google.com>
TreeHugger Robot [Sat, 25 Jun 2016 02:06:42 +0000 (02:06 +0000)]
Merge "Reduce vibration length of camera gesture" into nyc-mr1-dev
Dirk Dougherty [Fri, 24 Jun 2016 19:08:00 +0000 (12:08 -0700)]
Update finding success page to feature playbook.
Bug:
29207942
Change-Id: Ia8be8fa45bf9e37bb31627bdba042c7b3cfbe8c0
Andrew Sapperstein [Fri, 24 Jun 2016 21:34:52 +0000 (14:34 -0700)]
Add new private theme for Dialer.
A dark theme with no action bar that uses the settings theme colors.
Change-Id: Iae75b38a9e3cdd8101f8328c123b35101857d26d
FIXES:
29580507
Jorim Jaggi [Sat, 25 Jun 2016 00:33:01 +0000 (17:33 -0700)]
Reduce vibration length of camera gesture
Fixes:
29621269
Change-Id: Iaca4f82e75a709ccf1345c271ae443f16ebce852
TreeHugger Robot [Sat, 25 Jun 2016 00:31:51 +0000 (00:31 +0000)]
Merge "Add a resource for demo mode launcher component name." into nyc-mr1-dev
Lajos Molnar [Thu, 23 Jun 2016 23:34:48 +0000 (16:34 -0700)]
media: document output image crop and layout for MediaCodec
These use hidden, now deprecated MediaFormat keys.
Bug:
14127601
Change-Id: Ib51e4ef41204c9be34ad571300fcb7860feb504e
Lajos Molnar [Fri, 24 Jun 2016 00:51:15 +0000 (17:51 -0700)]
media: document format keys for MediaMuxer
Bug:
19461810
Change-Id: Iee4396aa6f00b3f580c02fa99f0b9291700f5738
Adam Lesinski [Fri, 24 Jun 2016 23:42:28 +0000 (23:42 +0000)]
Merge \"Update DisplayMetrics when resizing\" into nyc-dev
am:
34ccbe035a
Change-Id: I28c48d01368afbaa37de88711f2caa27a6ea7457
TreeHugger Robot [Fri, 24 Jun 2016 23:35:12 +0000 (23:35 +0000)]
Merge "Update DisplayMetrics when resizing" into nyc-dev
Adam Powell [Fri, 24 Jun 2016 23:28:57 +0000 (23:28 +0000)]
Merge \"Fix layout issue after insets changed\" into nyc-dev
am:
119f1715b3
Change-Id: I343dc8ad193ad83a8c0628c104836bd392cd07d5
TreeHugger Robot [Fri, 24 Jun 2016 23:21:28 +0000 (23:21 +0000)]
Merge "Fix layout issue after insets changed" into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 22:59:21 +0000 (22:59 +0000)]
Merge "Round unclipped saveLayers" into nyc-mr1-dev
Robert Carr [Fri, 24 Jun 2016 22:50:39 +0000 (22:50 +0000)]
Merge \"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\" into nyc-dev
am:
8afc1f70f0
Change-Id: Iabd270da70c540b9da38a72895adc6904bbb41cd
TreeHugger Robot [Fri, 24 Jun 2016 22:43:30 +0000 (22:43 +0000)]
Merge "PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL." into nyc-dev
Yorke Lee [Fri, 24 Jun 2016 22:21:19 +0000 (22:21 +0000)]
Merge \"Update documentation for View.startDragAndDrop\" into nyc-dev
am:
c63710ea48
Change-Id: Iebdb99f1032fbda52686df9dc02e740b61b7e7eb
Adam Lesinski [Fri, 24 Jun 2016 19:29:16 +0000 (12:29 -0700)]
Update DisplayMetrics when resizing
Previously the DisplayMetrics passed to a new ResourcesImpl
object would be generated from the default DisplayAdjustments.
We now use the correct DisplayAdjustments for the ResourcesImpl
and make sure to update them for things like rotation changes.
Bug:
29619314
Change-Id: If2ba0d7670a4554dcd3fde9766e2337f20a191fd
(cherry picked from commit
8e8d23214a71d8813ebd3676b192924c530cb913)
Yorke Lee [Fri, 24 Jun 2016 22:10:46 +0000 (22:10 +0000)]
Merge "Update documentation for View.startDragAndDrop" into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 22:04:14 +0000 (22:04 +0000)]
Merge "Update DisplayMetrics when resizing" into nyc-mr1-dev
Adam Powell [Fri, 24 Jun 2016 21:42:30 +0000 (14:42 -0700)]
Fix layout issue after insets changed
Fix a regression where a change in insets would forceLayout on the
view hierarchy but not run the measure/layout as a result. This would
cause layout requests to become stalled until a window-level relayout
event.
Bug
29634368
Change-Id: Ia3f32f5891c8b32c06c13f95ebd0572233572b04
TreeHugger Robot [Fri, 24 Jun 2016 21:36:36 +0000 (21:36 +0000)]
Merge "Shortcut: Only "main" activities can have shortcuts." into nyc-mr1-dev
Chris Wren [Fri, 24 Jun 2016 21:07:40 +0000 (17:07 -0400)]
use an observer for the default sound
matches other settings use, and also improves testability of buzzbeepblink
Change-Id: I9445448c4c4f24f4f49f7cb1fdcd2f5362944606
Chris Craik [Fri, 24 Jun 2016 20:53:37 +0000 (13:53 -0700)]
Round unclipped saveLayers
fixes:
29456451
Change-Id: I2be8b47c46936e75071ad0819a718f72b96cbd2b
Robert Carr [Fri, 24 Jun 2016 20:58:16 +0000 (13:58 -0700)]
PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.
When we want the WindowManager to clip our requested width/height
to the display frame, we need to pass DISPLAY_CLIP_VERTICAL/HORIZONTAL.
It seems this behavior was unintentionally applied without this flag
in previous releases.
Bug:
29602363
Change-Id: Ib98060e36efde0dbaabb59a758da5374035dbb62
Fyodor Kupolov [Fri, 24 Jun 2016 20:49:09 +0000 (20:49 +0000)]
Merge "Prevent NPE in dispatchUserSwitch" into nyc-mr1-dev
Fyodor Kupolov [Fri, 24 Jun 2016 20:46:18 +0000 (13:46 -0700)]
Prevent NPE in dispatchUserSwitch
Access to mCurWaitingUserSwitchCallbacks should be synchronized and it's
safer to access the local variable curWaitingUserSwitchCallbacks
Bug:
29039588
Change-Id: Id91699670ca16467d385f476ba06da2cb29a984b