Commit Graph

247970 Commits

Author SHA1 Message Date
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
Wale Ogunwale
8fd75428b4 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
2016-06-27 07:16:45 -07:00
Hugo Benichi
90b2c781ff Merge "Fix unsafe concurrent access in LegacyTypeTracker" into nyc-mr1-dev 2016-06-27 07:53:23 +00:00
TreeHugger Robot
54b2e7dc0a Merge "Delete one more legacy DHCP client string." into nyc-mr1-dev 2016-06-27 06:18:57 +00:00
Hugo Benichi
78caa25870 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
2016-06-27 15:04:27 +09:00
Lorenzo Colitti
8dcd3ea5ff Delete one more legacy DHCP client string.
Bug: 27192644
Change-Id: I945b399516e10a804cff64c470dfa967eb0d7860
2016-06-27 04:49:04 +00:00
Dirk Dougherty
3883938674 Merge \"Update finding success page to feature playbook.\" into nyc-dev
am: 61ae65f260

Change-Id: Ia4d4236d9e16de7a4b81a551d43edbd69c3d7c5d
2016-06-27 02:54:28 +00:00
Dirk Dougherty
61ae65f260 Merge "Update finding success page to feature playbook." into nyc-dev 2016-06-27 02:49:26 +00:00
Dan Sandler
1b2ed4394c Cats are not, technically, tasty treats.
am: 27a9fcc618

Change-Id: I6ffdf66c9ef70052b7ba5ac5d926b32eae633fde
2016-06-26 22:55:59 +00:00
Dan Sandler
27a9fcc618 Cats are not, technically, tasty treats.
Bug: 27376882
Change-Id: I97183339e51c5d07fe6e9404bbcc5178ca605c05
Copilot: Jason Monk <jmonk@google.com>
2016-06-26 15:00:11 +00:00
TreeHugger Robot
d37db3c77f Merge "Reduce vibration length of camera gesture" into nyc-mr1-dev 2016-06-25 02:06:43 +00:00
Dirk Dougherty
4f58324a43 Update finding success page to feature playbook.
Bug: 29207942
Change-Id: Ia8be8fa45bf9e37bb31627bdba042c7b3cfbe8c0
2016-06-24 18:10:48 -07:00
Jorim Jaggi
8ba1cb3a7a Reduce vibration length of camera gesture
Fixes: 29621269
Change-Id: Iaca4f82e75a709ccf1345c271ae443f16ebce852
2016-06-24 17:33:03 -07:00
TreeHugger Robot
4ee33795c4 Merge "Add a resource for demo mode launcher component name." into nyc-mr1-dev 2016-06-25 00:31:52 +00:00
Adam Lesinski
40b4ca8435 Merge \"Update DisplayMetrics when resizing\" into nyc-dev
am: 34ccbe035a

Change-Id: I28c48d01368afbaa37de88711f2caa27a6ea7457
2016-06-24 23:42:28 +00:00
TreeHugger Robot
34ccbe035a Merge "Update DisplayMetrics when resizing" into nyc-dev 2016-06-24 23:35:13 +00:00
Adam Powell
c43c9e052e Merge \"Fix layout issue after insets changed\" into nyc-dev
am: 119f1715b3

Change-Id: I343dc8ad193ad83a8c0628c104836bd392cd07d5
2016-06-24 23:28:57 +00:00
TreeHugger Robot
119f1715b3 Merge "Fix layout issue after insets changed" into nyc-dev 2016-06-24 23:21:29 +00:00
TreeHugger Robot
fdef509c93 Merge "Round unclipped saveLayers" into nyc-mr1-dev 2016-06-24 22:59:22 +00:00
Robert Carr
c6413cc919 Merge \"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\" into nyc-dev
am: 8afc1f70f0

Change-Id: Iabd270da70c540b9da38a72895adc6904bbb41cd
2016-06-24 22:50:39 +00:00
TreeHugger Robot
8afc1f70f0 Merge "PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL." into nyc-dev 2016-06-24 22:43:32 +00:00
Yorke Lee
d1d3950d94 Merge \"Update documentation for View.startDragAndDrop\" into nyc-dev
am: c63710ea48

Change-Id: Iebdb99f1032fbda52686df9dc02e740b61b7e7eb
2016-06-24 22:21:19 +00:00
Adam Lesinski
ac3e0e590a 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 8e8d23214a)
2016-06-24 22:11:27 +00:00
Yorke Lee
c63710ea48 Merge "Update documentation for View.startDragAndDrop" into nyc-dev 2016-06-24 22:10:47 +00:00
TreeHugger Robot
038084e61c Merge "Update DisplayMetrics when resizing" into nyc-mr1-dev 2016-06-24 22:04:15 +00:00
Adam Powell
76fdbb72c9 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
2016-06-24 14:47:06 -07:00
TreeHugger Robot
1af9a58956 Merge "Shortcut: Only "main" activities can have shortcuts." into nyc-mr1-dev 2016-06-24 21:36:38 +00:00
Chris Craik
d5a9011412 Round unclipped saveLayers
fixes: 29456451

Change-Id: I2be8b47c46936e75071ad0819a718f72b96cbd2b
2016-06-24 14:14:45 -07:00
Robert Carr
489c39d2db 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
2016-06-24 14:07:20 -07:00
Fyodor Kupolov
340105677e Merge "Prevent NPE in dispatchUserSwitch" into nyc-mr1-dev 2016-06-24 20:49:10 +00:00
Fyodor Kupolov
599d43b4fe 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
2016-06-24 13:46:18 -07:00
TreeHugger Robot
44d909c971 Merge "Properly tint crash dialog." into nyc-mr1-dev 2016-06-24 20:45:56 +00:00
Mitchell Wills
015c8a3ac0 Merge "Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime" into nyc-mr1-dev 2016-06-24 20:24:13 +00:00
Mitchell Wills
a464a9fce8 Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime
wpa_supplicant can update this value when authenticating so if the
framework writes it back the new value can be overwritten.

TEST: Patch was validated by original reporter
      Enterprise tests pass (b/29608435)
Change-Id: If359b4ca625371fbdb68177c7cdb6498c3a519a1
Fixes: 28161335
2016-06-24 13:17:31 -07:00
Adam Lesinski
8e8d23214a 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
2016-06-24 13:13:19 -07:00
Min Yun
dd962fd1bd Reapply more strings for \"more settings\"
am: de383c75eb

Change-Id: I4d31eb5dd262e68542af4360da062ecdb3ff822f
2016-06-24 20:10:02 +00:00
Makoto Onuki
b08790c3b2 Shortcut: Only "main" activities can have shortcuts.
- Don't publish shortcuts when their target activities are not main.
- Only scan manifest shortcuts for main activities.
- When an app is updated, remove shortcuts that no longer belong to
valid main activities.

- Also re-publish manifest shortcuts after 'clear data'
- Also listen to PACKAGE_CHANGED and disable/re-publish shortcuts
properly.

Bug 29355786
Bug 29582255
Bug 29601844

Change-Id: I6c701ce669cf30a227bc2af4aa01de467ef73e3a
2016-06-24 13:07:17 -07:00
Andrew Sapperstein
0ccd0fed27 Properly tint crash dialog.
Change-Id: I6a74b08acd5e13c750ce512e61518972cc55940b
FIXES: 29619712
2016-06-24 12:11:09 -07:00
Chong Zhang
1156c52b03 Merge "Do not load exit animation again if window is already animating" into nyc-mr1-dev 2016-06-24 18:51:14 +00:00
Andrew Sapperstein
411b9c69a1 Merge "Add DeviceDefault style used by ringtone picker." into nyc-mr1-dev 2016-06-24 18:31:43 +00:00
Chong Zhang
8c5d422e02 Do not load exit animation again if window is already animating
Transition can be started as soon as the entering app is drawn.
If the exiting app relayouts to invisible after transition started,
don't load the exit animation again.

bug: 29405575
Change-Id: I05ba4f733afb9426626db113be721a6bf888f093
2016-06-24 11:30:58 -07:00
Min Yun
de383c75eb Reapply more strings for "more settings"
Fixes: 29620816

Change-Id: Iabfcb3b762e1d7d105d2b4c417fc0902d7e7ca16
2016-06-24 18:28:17 +00:00
Andrew Sapperstein
3d29644f28 Merge "Update QS battery trendline to use theme color." into nyc-mr1-dev 2016-06-24 18:19:32 +00:00
Doris Liu
7f9c189f06 Merge "Fix NPE for checking for whether animators should play together" into nyc-mr1-dev 2016-06-24 17:47:44 +00:00
Makoto Onuki
2a6f79d45f Merge "Make "cmd package set-home-activity" more CTS friendly" into nyc-mr1-dev 2016-06-24 17:37:07 +00:00
Bill Yi
27465d7d0e Import translations. DO NOT MERGE
am: 34f5924ca6  -s ours

Change-Id: Iddaaa1eb8c715a66a3d3fab95f0ac4eba2865877
2016-06-24 17:28:18 +00:00
Amith Yamasani
bb1fb395ca Merge "Resetting some settings on starting a new demo session" into nyc-mr1-dev 2016-06-24 16:08:16 +00:00
Bill Yi
34f5924ca6 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29578243
Change-Id: Ibfcaf1dcbb2cc51dcec359edb8525a2a56ab1231
2016-06-24 08:33:56 -07:00
Julia Reynolds
630cc3017a Always reapply strings.
am: 9c0c3d8d8b

Change-Id: I20ad505b3cb75319cc81a3dfb6ecfd0fae9ac24a
2016-06-24 15:16:35 +00:00
TreeHugger Robot
459f594bb1 Merge "Show volume row headers by default." into nyc-mr1-dev 2016-06-24 14:52:40 +00:00