Svetoslav Ganov
ff484bbfeb
Allow SetupWizard to do WiFi scans if location off
...
am: b2457c3704
Change-Id: I3afe3d8628e8af5806b03b86ea5c866fd454cddd
2016-10-13 20:15:16 +00:00
Chris Tate
622e97ffaf
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev
...
am: 4bd56fbbee
Change-Id: I19fae35338016bbbb7de07e8c9d978bab2e088fe
2016-10-13 19:04:43 +00:00
Christopher Tate
4cb8e2de6f
Retain allowBackup annotation when system+lock wallpaper becomes lock only
...
am: edd8dc83d5
Change-Id: I2f3a6587bb7f53517232cf051a345e2c617b3778
2016-10-13 19:04:40 +00:00
Chris Tate
4bd56fbbee
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev
2016-10-13 18:51:13 +00:00
Bert McMeen
0a3270642c
Docs: Updates to the Download/Test file related to watch setup am: 137c545e4e am: 58425dc58d
...
am: 669537a9fe
Change-Id: Ie8e8b14c46ccfda8824dccfdbf2dc3029661ad0b
2016-10-13 18:03:31 +00:00
Bert McMeen
669537a9fe
Docs: Updates to the Download/Test file related to watch setup am: 137c545e4e
...
am: 58425dc58d
Change-Id: Icf36fd2b6c4b2489a7197d32392c4a6382a934c3
2016-10-13 17:50:57 +00:00
Bert McMeen
58425dc58d
Docs: Updates to the Download/Test file related to watch setup
...
am: 137c545e4e
Change-Id: Ic605d9d26c60e3dd01cd4a9993a6d50d5cfdd94c
2016-10-13 17:38:59 +00:00
Vladislav Kuzkokov
d469c4e8b6
Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev
...
am: b24489e20a
Change-Id: Ie0f53964c521c89217347be67c16b8fe73ccc09d
2016-10-13 08:41:55 +00:00
Vladislav Kuzkokov
98a145b5af
Revert "Fix backup for users hit by erroneous backup disabling"
...
am: 9f61d17e6a
Change-Id: I460fbb670fbc7a724c981c4fceae0048ff4c9ded
2016-10-13 08:41:52 +00:00
Vladislav Kuzkokov
b24489e20a
Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev
2016-10-13 08:34:20 +00:00
Julius D'souza
0dcdae30cf
Merge "DO NOT MERGE: Ambient light sensor changes for doze mode." into cw-f-dev
2016-10-13 07:43:19 +00:00
Julius D'souza
c4e1e4909d
DO NOT MERGE: Ambient light sensor changes for doze mode.
...
Bug: 18573988
Change-Id: I07eed120bdbefd23408921405466566da33c397d
2016-10-12 22:48:42 -07:00
Andrii Kulian
c4ceb50303
Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev
...
am: 1fefc8b9fa
Change-Id: I57af7dceec243b6befbaa293438d6239053bb0ed
2016-10-13 05:01:15 +00:00
Andrii Kulian
75cd6ef5dc
DO NOT MERGE -- Adjust focus when moving task back
...
am: d4b98705b5
Change-Id: I1d07e84360ef0bfeb6b0ce41466e4042ca70ad81
2016-10-13 05:01:11 +00:00
TreeHugger Robot
1fefc8b9fa
Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev
2016-10-13 04:47:46 +00:00
Andrii Kulian
d4b98705b5
DO NOT MERGE -- Adjust focus when moving task back
...
Resumed and focused activity should be adjusted simultaneously.
This was missing when task was moved back and focus was adjusted only
after previous activity stopped.
Bug: 31983988
Change-Id: Ie6c908b0c8c1adf94680b42ca5a8c9b01308e361
2016-10-13 03:14:07 +00:00
Robert Carr
708d218468
Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev
...
am: 1553d5411c
Change-Id: I9e12db9f686c934a2e2d391d80a0c1bb26398c7f
2016-10-13 02:15:33 +00:00
Robert Carr
bcbf6707b0
Correct recently introduced logic error in seamless rotation detection.
...
am: e441e7f15f
Change-Id: I3e9bdef49a3749e82dbed82bc230bcaac958608a
2016-10-13 02:15:31 +00:00
TreeHugger Robot
1553d5411c
Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev
2016-10-13 02:05:33 +00:00
Selim Cinek
77988e4aec
Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev
...
am: 0bdfc7be66
Change-Id: Ic63b6f6bf187ea632a05a6524d3b0f8bef376b74
2016-10-13 00:44:21 +00:00
Selim Cinek
c19b510454
Fixed a bug where the system could crash when expanding
...
am: 3e77984434
Change-Id: Icf8c8743f57a5e402275adfc645f08a10cf94a3b
2016-10-13 00:44:16 +00:00
Selim Cinek
531099ae14
Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev
...
am: d517c3c16b
Change-Id: I07d4f185a096c22628cd0d0ffcb789391a81f518
2016-10-13 00:42:47 +00:00
dooyoung.hwang
08011cdf33
Fix crashes after notifying bad notification
...
am: 78c4114101
Change-Id: I4d72feb9a40b99c5b40307ad01d708b3a66d1f54
2016-10-13 00:42:44 +00:00
Selim Cinek
f3eb11bdc1
Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev
...
am: 7ce68fd8a4
Change-Id: I775e64348075fe1dd57a7133fcdc7b11f79415d6
2016-10-13 00:41:27 +00:00
Selim Cinek
c46b2ef8d2
Fixed an issue where the emergency affordance would show
...
am: bd740cd56a
Change-Id: I6ce705cc701bf149dec45feabcf4777cc89afa6a
2016-10-13 00:41:24 +00:00
Selim Cinek
0bdfc7be66
Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev
2016-10-13 00:37:29 +00:00
Selim Cinek
d517c3c16b
Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev
2016-10-13 00:36:29 +00:00
Selim Cinek
7ce68fd8a4
Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev
2016-10-13 00:29:59 +00:00
Christopher Tate
edd8dc83d5
Retain allowBackup annotation when system+lock wallpaper becomes lock only
...
Bug 32069467
Change-Id: I5d0b91c40e1a2896f2b11efeef7bff84503cf2c0
2016-10-13 00:00:53 +00:00
Adrian Roos
b920d48e0a
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev
...
am: 5c8fc58850
Change-Id: Ic9b035247f5b09582adf20c7cb47361f7b035cf7
2016-10-12 23:19:22 +00:00
Adrian Roos
342bc437bf
Fix Notification.Action.Builder copy constructor
...
am: 7af5362571
Change-Id: I0853e663b1895e2c45fad17cfee79202f3b14ef7
2016-10-12 23:19:19 +00:00
TreeHugger Robot
5c8fc58850
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev
2016-10-12 23:11:22 +00:00
Adrian Roos
7af5362571
Fix Notification.Action.Builder copy constructor
...
The copy constructor of Notification.Action.Builder did not copy
the mAllowGeneratedReplies field.
Change-Id: I40fbe8950ee2232e2589ab3930a32bfbebe9fc89
Fixes: 31766718
Test: runtest --path $T/cts/tests/app/src/android/app/cts/NotificationTest.java
2016-10-12 15:19:55 -07:00
Adam Lesinski
cde80e68c6
Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev
...
am: baac85ec1f
Change-Id: I713561fcfdf28250e406fc9d7b497c2b70b287ca
2016-10-12 21:03:13 +00:00
Martin Wallgren
dce79f10ba
RRO: Synchronize access to overlays.list
...
am: 0fbb608110
Change-Id: I44a716df3954b6d2d58d7c9784f8b55cf041b10b
2016-10-12 21:03:11 +00:00
Doris Liu
64d24d6631
Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev
...
am: 269f76a7d2
Change-Id: Ia9a56b7c8c20d47e9dcc448c59061784d4edf865
2016-10-12 20:56:58 +00:00
Doris Liu
c47199bb6a
Fix SkShader leak for Gradient VectorDrawable and test
...
am: fc9cf72339
Change-Id: I493a8c52cd4cca79971a4fd2e3eed7f566ce8ecd
2016-10-12 20:56:55 +00:00
Adam Lesinski
baac85ec1f
Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev
2016-10-12 20:55:55 +00:00
Doris Liu
269f76a7d2
Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev
2016-10-12 20:44:50 +00:00
Robert Carr
e441e7f15f
Correct recently introduced logic error in seamless rotation detection.
...
The code detecting whether we should rotate seamlessly (which for
example we do not support for 180 degree rotations) was moved to before
mRotation was updated, so it was always passing the same value for old
and new rotation, and we were failing to perform the 180 degree rotation
check. Correct this.
Test: Rotate the device 180 degrees at once while in Camera. Things look ok.
Bug: 32025371
Change-Id: I0ef08e8cc4e5d87fdff6d839381196c2b52e71d5
2016-10-12 12:50:32 -07:00
Bert McMeen
137c545e4e
Docs: Updates to the Download/Test file related to watch setup
...
Bug: 32091353
Change-Id: I8b70b33c537c2edbaf0fbd09e62dc9564f03cd07
2016-10-12 12:49:48 -07:00
Selim Cinek
3e77984434
Fixed a bug where the system could crash when expanding
...
When expanding a notification it could disappear and the
system would crash.
Test: Manual, expand notification group and have it removed while
doing so.
Change-Id: I421ab0cf7a9292e6894529c80784ba0989071fb0
Fixes: 31941185
2016-10-12 12:08:57 -07:00
Shreyas Basarge
e04c7f151b
Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev
...
am: d5541b987a
Change-Id: If91f2edc57109308b34be67b9f3861b84147153f
2016-10-12 17:19:59 +00:00
Shreyas Basarge
50a22690f8
Add a delay before scheduling local syncs
...
am: ba1f790369
Change-Id: I4c880c4111f99d80cee7b960a97133cc0b86d61c
2016-10-12 17:19:56 +00:00
Shreyas Basarge
d5541b987a
Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev
2016-10-12 17:09:56 +00:00
Selim Cinek
bd740cd56a
Fixed an issue where the emergency affordance would show
...
If a device isn't voice capable, it shouldn't show the emergency
option.
Test: use tablet which isn't voice capable, insert indian sim and
make sure no emergency option is displayed in global actions.
Bug: 31953703
Change-Id: I351e87320f3ffec76d1c1fc5aac78e5c48c0ac54
2016-10-12 09:33:39 -07:00
Martin Wallgren
0fbb608110
RRO: Synchronize access to overlays.list
...
idmap --scan is executed as a part of the pre-loading in ZygoteInit.
The pre loading is executed in parallel for each supported architecture
(32/64 bit). This will cause a race condition in the creation of the
overlays.list file and the idmap files for the system overlays.
Apply flock on overlays.list to prevent the file from being thrown away
and recreated when it is in use by another Zygote.
Cherry-picked from AOSP.
Bug: 28032298
Test: manual
Change-Id: I51d39f121d207b11181340b68b164b60020f0c61
2016-10-12 14:56:31 +00:00
Daniel Sandler
bfc83493fe
Merge "Essential packages' notifications can no longer be silenced." into nyc-mr1-dev
...
am: 52cd2948a6
Change-Id: I00c94e1299651f12e030904a77396b74e825d8d9
2016-10-12 13:49:15 +00:00
Dan Sandler
b50c46a64e
Essential packages' notifications can no longer be silenced.
...
am: 028a60f003
Change-Id: Ic3e80d30c99e448c7719d5d40c9e957df94a6af6
2016-10-12 13:49:11 +00:00
Daniel Sandler
52cd2948a6
Merge "Essential packages' notifications can no longer be silenced." into nyc-mr1-dev
2016-10-12 13:39:02 +00:00