Commit Graph

321341 Commits

Author SHA1 Message Date
Wale Ogunwale
59cd5a98dc Merge "Fix deadlock when create alert window notification" into oc-dev
am: 678477b383

Change-Id: If4da36399c68f7a91c0ab87d398eb3cdb70f2215
2017-06-09 13:15:38 +00:00
Wale Ogunwale
678477b383 Merge "Fix deadlock when create alert window notification" into oc-dev 2017-06-09 13:07:18 +00:00
Hugo Benichi
56057f2b55 Merge "Revert "Instrument captive portal login activity"" am: 2921320517
am: bbddbfc451

Change-Id: I0271fa4138ac9c4f1ddfea648c003a79909214df
2017-06-09 11:47:25 +00:00
Hugo Benichi
bbddbfc451 Merge "Revert "Instrument captive portal login activity""
am: 2921320517

Change-Id: Iacae406a0998bb91c84b73a66ff383dfa8038665
2017-06-09 11:40:01 +00:00
Hugo Benichi
2921320517 Merge "Revert "Instrument captive portal login activity"" 2017-06-09 11:31:23 +00:00
Hugo Benichi
828512f14c Revert "Instrument captive portal login activity"
This reverts commit f867da14ea.

Change-Id: Ic900c91ed87c2d65c151f8386954bd7b74128348
2017-06-09 11:30:05 +00:00
Bryce Lee
d1e55c133d Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am: ac56b8adde

Change-Id: Ib4fd790e9ee235b25ddde40d839c01e7685a2f12
2017-06-09 11:17:58 +00:00
Bryce Lee
ac56b8adde Merge "Prioritize reused activity's stack over computed stack." into oc-dev 2017-06-09 11:11:17 +00:00
Erik Kline
b9fc817f59 Merge "Convert IControlsTethering from interface into callback" am: 5b9d362b60
am: ad3fd82f8b

Change-Id: Ib1f41df1200378191c0722a280939ccbde539920
2017-06-09 09:23:37 +00:00
Erik Kline
ad3fd82f8b Merge "Convert IControlsTethering from interface into callback"
am: 5b9d362b60

Change-Id: I911548e994761778cf5434b2513d433eeaccd4f3
2017-06-09 09:16:01 +00:00
Erik Kline
5b9d362b60 Merge "Convert IControlsTethering from interface into callback" 2017-06-09 09:06:41 +00:00
Hugo Benichi
d614cd3509 Merge "Instrument captive portal login activity" am: b213053def
am: 30b7dfb526

Change-Id: Iec106e30ce9dbb38189fe3888f6111be92816891
2017-06-09 07:11:46 +00:00
Hugo Benichi
97520fb0dd Merge "New Metrics constants for captive portal related UI" am: aac9aff5dc
am: 75792d4299  -s ours

Change-Id: Ic7a559a6a5759dc0528e2a2d167d999b208225dd
2017-06-09 07:08:25 +00:00
Hugo Benichi
30b7dfb526 Merge "Instrument captive portal login activity"
am: b213053def

Change-Id: Ic8205b609f8c6e0bc04eac17c3bcbe7df0508207
2017-06-09 06:50:52 +00:00
Hugo Benichi
75792d4299 Merge "New Metrics constants for captive portal related UI"
am: aac9aff5dc

Change-Id: Ib55742148a08ae21f01539939e41699cdb581ca2
2017-06-09 06:47:47 +00:00
Hugo Benichi
b213053def Merge "Instrument captive portal login activity" 2017-06-09 06:39:19 +00:00
Hugo Benichi
aac9aff5dc Merge "New Metrics constants for captive portal related UI" 2017-06-09 06:38:11 +00:00
Hugo Benichi
f867da14ea Instrument captive portal login activity
Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.

Bug: 36203355
Bug: 34901696
Bug: 36532213
Test: manually tested with captive portal testing setup while watching
      event logs: adb logcat -b events | grep captiveportallogin
        06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
        06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]

Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c

(cherry picked from commit c61dc92fc0)

Change-Id: I9184f6263a003c2be28f41a550c6164c8d6ee907
2017-06-09 14:08:39 +09:00
Selim Cinek
81c8d5f861 Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
am: dc66506f0a

Change-Id: I541a5d64c0111057b709ca7179ff439da02bed29
2017-06-09 04:38:10 +00:00
Selim Cinek
0ae979806f Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
am: b9eb205bd7

Change-Id: I5b1ff4ba5708c7d470940fd46074aefe9c210b83
2017-06-09 04:30:51 +00:00
Selim Cinek
dc66506f0a Merge "Fixed an issue where the notification could stay userlocked" into oc-dev 2017-06-09 04:25:42 +00:00
Selim Cinek
b9eb205bd7 Merge "Fixed a bug where systemui could crash while cloning" into oc-dev 2017-06-09 04:22:06 +00:00
Jorim Jaggi
8fee9425e4 Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
am: d1f55f6302

Change-Id: Ibc28f6019637dbc9696c62f1ad1ce4679954fbd5
2017-06-09 04:16:28 +00:00
Jorim Jaggi
af3829adf4 Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
am: 713ad88afe

Change-Id: Idd18d8e092b1628eb0a08d579d6a6a488ce01026
2017-06-09 04:11:29 +00:00
Jorim Jaggi
d1f55f6302 Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev 2017-06-09 04:06:43 +00:00
Jorim Jaggi
713ad88afe Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev 2017-06-09 04:05:38 +00:00
Jorim Jaggi
34a0cdb98e Properly run window animations at vsync-sf (1/2)
- Add new Choreographer instance that runs on vsync-sf
- Use this new Choreographer for WindowAnimator, and remove all
the hacks around it

Test: Open apps and close apps, notice no stutter
Test: Screen zoom animations
Test: go/wm-smoke
Bug: 36631902
Change-Id: I988ae25645effc3ac20efa7cb9b68f23444da0d0
2017-06-08 17:22:43 -07:00
Jakub Pawlowski
232108bafb Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
am: 556b10a4e6

Change-Id: I92c46f849d80794d6c658b4ec0cfd071bf89a7bf
2017-06-09 00:01:44 +00:00
Wale Ogunwale
4cd3f5c519 Fix deadlock when create alert window notification
Don't hold WM lock when calling into notification manager which
can call into activity manager.

Test: Make sure alert window notification is displayed
Change-Id: Id8831878093f8079f815a830ff8acdfad99d48cb
Fixes: 62458061
2017-06-08 16:51:48 -07:00
Jakub Pawlowski
556b10a4e6 Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev 2017-06-08 23:51:27 +00:00
Android Build Merger (Role)
ccf45069c0 Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e620153" into oc-dev-plus-aosp 2017-06-08 23:44:45 +00:00
Matthew Ng
5305c575c7 Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am: 008e620153

Change-Id: If6a7101ba7055e23562b87195f35f1e068048389
2017-06-08 23:43:49 +00:00
Matthew Ng
71e5f8f64d Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am: 008e620153

Change-Id: If1947aac627b92213202b22b721a397492173508
2017-06-08 23:31:02 +00:00
Bill Yi
71713e846c Merge "Import translations. DO NOT MERGE" into oc-dev
am: dd5886bc5b  -s ours

Change-Id: I99f7800bccdd03503185c593f86c1daab328c7f5
2017-06-08 23:23:02 +00:00
TreeHugger Robot
008e620153 Merge "Fixes the animation and state when docking a task by drag" into oc-dev 2017-06-08 23:21:11 +00:00
Bill Yi
3183fb75ac Merge "Import translations. DO NOT MERGE" into oc-dev
am: 67a947b636  -s ours

Change-Id: I87e77b18f173d20154743daf5e735bf72bfc685f
2017-06-08 23:14:52 +00:00
Bill Yi
dd5886bc5b Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-08 23:04:57 +00:00
Bill Yi
67a947b636 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-08 23:04:00 +00:00
Jorim Jaggi
245281c056 Boost android.anim and wm lock sections to -10 during transition
-4 is not enough if we have to compete against RT and main thread
from top app that have -10. Boost it more during app transitions

Test: Inspect systrace, make sure priorities are right, including
getting reset after the transition.
Test: Open Chrome 100x
Test: go/wm-smoke

Change-Id: Id6b060b8aafded67b4bae61b6e8960e37976b096
Fixes: 36631902
2017-06-08 15:57:44 -07:00
Bill Yi
5679e1cc6e Merge "Import translations. DO NOT MERGE" into oc-dev
am: 75b5199e9d  -s ours

Change-Id: I3393f85819b8ed0fec35cfa0cbea0899141d73dc
2017-06-08 22:45:15 +00:00
Bill Yi
75b5199e9d Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-08 22:34:40 +00:00
Mathieu Chartier
abb7782a4e Merge "Add system property for hot startup method threshold" am: a370159592
am: 187b15bbd5

Change-Id: Id56adbe39e8a81ef12c4b9d8fdcf65c94a316d6f
2017-06-08 22:00:09 +00:00
Mathieu Chartier
187b15bbd5 Merge "Add system property for hot startup method threshold"
am: a370159592

Change-Id: I271cf74364b7b9c2d16282ef6a9ab24b6d243e1e
2017-06-08 21:54:22 +00:00
Mathieu Chartier
a370159592 Merge "Add system property for hot startup method threshold" 2017-06-08 21:44:08 +00:00
Android Build Merger (Role)
c2bc1f2790 Merge "Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100" into oc-dev-plus-aosp 2017-06-08 21:23:36 +00:00
Adam Lesinski
8573162324 Merge "Revert "always adjust per-user application info"" into oc-dev
am: 887544e100

Change-Id: I944c449954876353c7e597fca19ac5fe00e62906
2017-06-08 21:22:21 +00:00
Jakub Pawlowski
3b852973e3 Merge "Bluetooth: fix connectGatt overload invocations" am: 404e9f209f
am: c0fed83b84

Change-Id: I871bc30dcd7aeb5c4a6f6c15d84b43dee84994f2
2017-06-08 21:20:27 +00:00
Adam Lesinski
887544e100 Merge "Revert "always adjust per-user application info"" into oc-dev 2017-06-08 21:14:09 +00:00
Jakub Pawlowski
c0fed83b84 Merge "Bluetooth: fix connectGatt overload invocations"
am: 404e9f209f

Change-Id: I01699795f733fbf46af10ba25afd8cb3feecc9ea
2017-06-08 21:12:26 +00:00
Adam Lesinski
157be6ead8 Revert "always adjust per-user application info"
This reverts commit e0046cecb0.

Reason for revert: Regresses UI theme

Bug: 62445682
Bug: 36561125
Change-Id: I9b60bd8e4eb89129368d38e83c0036ab459a524e
2017-06-08 21:10:52 +00:00