Lucas Dupin
04bc292787
Merge "Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev am: a4b6b9d265" into oc-mr1-dev-plus-aosp
...
am: 88b7016a39
2017-08-17 03:14:09 +00:00
Felipe Leme
3c0555eca0
Merge "Merge changes I768830f5,I665bde3a into oc-mr1-dev am: 7876b630be" into oc-mr1-dev-plus-aosp
...
am: 08ca3cc7e8
2017-08-17 03:04:57 +00:00
Sudheer Shanka
8e1c376d69
Merge "Fix and enable ConnOnActivityStartTest."
2017-08-17 02:10:44 +00:00
Makoto Onuki
1fa979ca82
Merge "Fix sync back-off" into oc-dr1-dev am: 9fd497cdae am: 89d8804c8e
...
am: f617d17ef6
2017-08-17 01:07:29 +00:00
Bryce Lee
a7ec0565c6
Merge "Update references to O MR1 to proper codename." into oc-mr1-dev am: 92a84efba1
...
am: a0cc0c5c90
2017-08-17 00:39:20 +00:00
Lucas Dupin
6bc59347ec
Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev
...
am: a4b6b9d265
2017-08-16 23:19:24 +00:00
Felipe Leme
05deaf54cc
Merge changes I768830f5,I665bde3a into oc-mr1-dev
...
am: 7876b630be
2017-08-16 23:13:57 +00:00
Lucas Dupin
a4b6b9d265
Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev
2017-08-16 22:30:04 +00:00
TreeHugger Robot
7876b630be
Merge changes I768830f5,I665bde3a into oc-mr1-dev
...
* changes:
Removed redundant [X] icon used to close Autofill Save UI.
Re-added outer layout on Autofill Save UI that was accidentally removed.
2017-08-16 22:11:12 +00:00
Todd Kennedy
519b589300
resolve merge conflicts of d22603ebd2 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iab4443f6a8b996ea9f28f4e68c6ec3bb708526e6
2017-08-16 15:00:20 -07:00
Sudheer Shanka
ded7ab0fff
Fix and enable ConnOnActivityStartTest.
...
- Set parole duration to 0 so that it won't affect app standby test.
- Use a bound service to send commands to test app instead of broadcasts.
- Remove code to install/delete test app as it will be done as part of tests
initialization.
Bug: 38432755
Test: forrest --extra_args='--class com.android.server.net.ConnOnActivityStartTest' \
test FrameworksServicesTests
Change-Id: Ic6cd574a60c4449195f2c8cd4e04b9cb47f225c8
2017-08-16 14:41:11 -07:00
Di Lu
ccc8229e30
Merge "Merge "Add user quota information into the IpSecService dump" am: fedd856546 am: 5bef43fb64 am: 759696c47c am: 7745a7975f" into oc-mr1-dev-plus-aosp
...
am: c07d76a77b
2017-08-16 20:22:28 +00:00
Makoto Onuki
f617d17ef6
Merge "Fix sync back-off" into oc-dr1-dev am: 9fd497cdae
...
am: 89d8804c8e
2017-08-16 20:12:06 +00:00
Makoto Onuki
89d8804c8e
Merge "Fix sync back-off" into oc-dr1-dev
...
am: 9fd497cdae
2017-08-16 19:57:36 +00:00
TreeHugger Robot
9fd497cdae
Merge "Fix sync back-off" into oc-dr1-dev
2017-08-16 19:41:53 +00:00
Narayan Kamath
dfff1c7723
Merge "PackageManagerService: Change getCompressedFiles to reflect the new layout." into oc-mr1-dev am: 169a65169d
...
am: 51432796dd
2017-08-16 18:52:58 +00:00
Jorim Jaggi
8702b0ad88
Merge "Fix issue when launching Camera" into oc-mr1-dev am: 5737af21cb
...
am: b0c8653427
2017-08-16 18:47:50 +00:00
Hugo Benichi
337f94ffcf
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23 am: f2ac860b7c am: cd7393c641
...
am: d1e7fc23ae
2017-08-16 18:39:54 +00:00
Andrii Kulian
4927b29c2a
Merge "Limit black background to only base and starting windows" into oc-dr1-dev am: 44cab75cb0 am: 68f48673c7
...
am: 992e299ec2
2017-08-16 18:08:45 +00:00
Bryce Lee
a0cc0c5c90
Merge "Update references to O MR1 to proper codename." into oc-mr1-dev
...
am: 92a84efba1
2017-08-16 17:57:23 +00:00
Android Build Merger (Role)
d22603ebd2
Merge "Merge "Allow explicit permission denial" into oc-mr1-dev am: 7fc53a11f8" into oc-mr1-dev-plus-aosp
2017-08-16 17:48:00 +00:00
Jean-Michel Trivi
6f82e92d06
AudioService: device connection intent: never send null action am: 87a264dfde am: c164123cc3
...
am: 9d71ca593f
2017-08-16 17:44:10 +00:00
Todd Kennedy
cab962b8d0
Merge "Allow explicit permission denial" into oc-mr1-dev
...
am: 7fc53a11f8
2017-08-16 17:41:38 +00:00
Bryce Lee
92a84efba1
Merge "Update references to O MR1 to proper codename." into oc-mr1-dev
2017-08-16 17:30:43 +00:00
Di Lu
b4f69022fe
Merge "Add user quota information into the IpSecService dump" am: fedd856546 am: 5bef43fb64 am: 759696c47c
...
am: 7745a7975f
2017-08-16 17:25:30 +00:00
Christopher Tate
682bd55847
Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev am: 4b7b5a6c59
...
am: 2402e4b385
2017-08-16 17:15:08 +00:00
Di Lu
7745a7975f
Merge "Add user quota information into the IpSecService dump" am: fedd856546 am: 5bef43fb64
...
am: 759696c47c
2017-08-16 17:12:05 +00:00
TreeHugger Robot
7fc53a11f8
Merge "Allow explicit permission denial" into oc-mr1-dev
2017-08-16 17:11:30 +00:00
Felipe Leme
05e435cfd1
Removed redundant [X] icon used to close Autofill Save UI.
...
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Test: manual verification
Fixes: 64694706
Change-Id: I768830f56db1814aecb82b94cebb9100dd47dd50
2017-08-16 10:00:28 -07:00
Di Lu
759696c47c
Merge "Add user quota information into the IpSecService dump" am: fedd856546
...
am: 5bef43fb64
2017-08-16 16:59:47 +00:00
Felipe Leme
749be66178
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev am: 6ba128762f
...
am: 486ecbe517
2017-08-16 16:38:18 +00:00
Lucas Dupin
a84952bc74
Fix null pointer when mColorFadeEnabled is false
...
mColorFadeOffAnimator and mColorFadeOnAnimator won't ever
be initialized if mColorFadeEnabled is set to false.
This means that we can't assume that these animators always exist.
Test: Manual, lock, unlock device
Change-Id: I0cb7a10f7d311bc992c4a3e1b4943b454e39ec1a
Fixes: 64726143
2017-08-16 09:37:54 -07:00
Di Lu
5bef43fb64
Merge "Add user quota information into the IpSecService dump"
...
am: fedd856546
2017-08-16 16:33:18 +00:00
Di Lu
fedd856546
Merge "Add user quota information into the IpSecService dump"
2017-08-16 16:20:18 +00:00
Narayan Kamath
51432796dd
Merge "PackageManagerService: Change getCompressedFiles to reflect the new layout." into oc-mr1-dev
...
am: 169a65169d
2017-08-16 15:01:57 +00:00
TreeHugger Robot
169a65169d
Merge "PackageManagerService: Change getCompressedFiles to reflect the new layout." into oc-mr1-dev
2017-08-16 14:53:59 +00:00
Todd Kennedy
74629e3183
Allow explicit permission denial
...
Change-Id: I5d348ed555f249d210253dab60ae11d4831c4f0a
Fixes: 63675512
Test: Manual
2017-08-16 14:43:05 +00:00
Jorim Jaggi
b0c8653427
Merge "Fix issue when launching Camera" into oc-mr1-dev
...
am: 5737af21cb
2017-08-16 14:10:46 +00:00
Jorim Jaggi
5737af21cb
Merge "Fix issue when launching Camera" into oc-mr1-dev
2017-08-16 14:03:36 +00:00
Hugo Benichi
d1e7fc23ae
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23 am: f2ac860b7c
...
am: cd7393c641
2017-08-16 12:23:25 +00:00
Hugo Benichi
cd7393c641
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23
...
am: f2ac860b7c
2017-08-16 12:14:09 +00:00
Hugo Benichi
f2ac860b7c
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057
...
am: 2f9fd9df23
2017-08-16 12:04:38 +00:00
Hugo Benichi
2f9fd9df23
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
...
am: b35719a057
2017-08-16 11:50:55 +00:00
Treehugger Robot
b35719a057
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
2017-08-16 11:34:24 +00:00
Hugo Benichi
bae105a5cc
Allow NetworkAgent "immutable updates" to NetworkCapabilities
...
This patch loosens the validation checks when a NetworkAgent updates it
NetworkCapabilities: instead of checking that capabilities labeled as
"immutable" stay identical across updates, it is now accepted to change
immutable capabilities in a way that the new NetworkCapabilities
satisfies the old NetworkCapabilities.
This allows a NetworkAgent to update itself in order to match more
requests, but will still catch NetworkAgents that sends degradation
updates causing potentially requests to not match anymore.
Bug: 64125969
Test: runtest frameworks-net
Change-Id: I2a1b3f9c0be6415e40edc989d0c1b03b5631f7b1
2017-08-16 18:30:30 +09:00
Andrii Kulian
992e299ec2
Merge "Limit black background to only base and starting windows" into oc-dr1-dev am: 44cab75cb0
...
am: 68f48673c7
2017-08-16 06:40:14 +00:00
Andrii Kulian
024494041f
Merge "Limit black background to only base and starting windows" into oc-dr1-dev
...
am: 44cab75cb0
2017-08-16 06:28:49 +00:00
Andrii Kulian
68f48673c7
Merge "Limit black background to only base and starting windows" into oc-dr1-dev
...
am: 44cab75cb0
2017-08-16 06:28:47 +00:00
Andrii Kulian
44cab75cb0
Merge "Limit black background to only base and starting windows" into oc-dr1-dev
2017-08-16 06:20:59 +00:00
Jean-Michel Trivi
9d71ca593f
AudioService: device connection intent: never send null action am: 87a264dfde
...
am: c164123cc3
2017-08-16 02:53:01 +00:00
