Felipe Leme
eb6a0c2560
Merge "Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880 am: 7e9f379b50 am: 82e7dfcae8" into oc-mr1-dev-plus-aosp
...
am: 11435f8153
2017-08-15 22:42:54 +00:00
Charles He
2a9b5933fc
Merge "Merge "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf am: 0fa9328b80 am: 51ca967453" into oc-dr1-dev-plus-aosp am: 5ee440bbcc" into oc-mr1-dev-plus-aosp
...
am: 417557193c
2017-08-15 22:23:55 +00:00
Felipe Leme
262966aad1
Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880 am: 7e9f379b50
...
am: 82e7dfcae8
2017-08-15 22:13:39 +00:00
Charles He
ec7018fad5
Merge "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf am: 0fa9328b80 am: 51ca967453" into oc-dr1-dev-plus-aosp
...
am: 5ee440bbcc
2017-08-15 21:55:17 +00:00
Felipe Leme
82e7dfcae8
Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880
...
am: 7e9f379b50
2017-08-15 21:42:40 +00:00
Felipe Leme
7e9f379b50
Merge "Additional documentation about Autofill / WebView security." into oc-dev
...
am: 36cbdef880
2017-08-15 21:32:44 +00:00
Charles He
2ae412019b
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf am: 0fa9328b80
...
am: 51ca967453
2017-08-15 21:32:01 +00:00
Charles He
51ca967453
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf
...
am: 0fa9328b80
2017-08-15 21:15:55 +00:00
TreeHugger Robot
36cbdef880
Merge "Additional documentation about Autofill / WebView security." into oc-dev
2017-08-15 21:12:32 +00:00
Lucas Dupin
bd4662cd31
Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev am: 3d141421f8
...
am: 6f8363aea2
2017-08-15 20:50:54 +00:00
Android Build Merger (Role)
0fa9328b80
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf
...
Change-Id: If5cad5c0f361acda25df4d90de06821d16e689c0
2017-08-15 20:47:03 +00:00
Charles He
24587d57cf
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4
...
am: 159cd14334
2017-08-15 20:42:11 +00:00
Lucas Dupin
6f8363aea2
Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev
...
am: 3d141421f8
2017-08-15 20:34:43 +00:00
TreeHugger Robot
3d141421f8
Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev
2017-08-15 20:24:27 +00:00
Felipe Leme
50563050c6
Merge "Dismiss Autofill Save UI when a new Activity is launched." into oc-mr1-dev am: 3568046048
...
am: 409ae8857e
2017-08-15 18:36:44 +00:00
David Stevens
1583a4f9c8
Merge "Let external activities run when the primary display is off"
2017-08-15 18:07:15 +00:00
Charles He
159cd14334
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4
...
Change-Id: I6bb7e6146e9a5a1a7c4721c496b1088fb3209f00
2017-08-15 17:54:35 +00:00
Charles He
40317127f4
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4
...
Change-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478
2017-08-15 17:54:05 +00:00
Charles He
4acf4fabf4
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49
...
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
2017-08-15 17:53:35 +00:00
Charles He
a3c1de7e49
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d
...
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
2017-08-15 17:52:57 +00:00
Charles He
6dfc8d8d4d
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f
...
Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
2017-08-15 17:52:27 +00:00
TreeHugger Robot
23494e3fe2
Merge "Update WindowManager to output dumpsys in protobuf format"
2017-08-15 17:52:10 +00:00
Charles He
1cd9e8096f
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0
...
Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
2017-08-15 17:51:58 +00:00
Charles He
b1141b6ff0
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c
...
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
2017-08-15 17:51:28 +00:00
Felipe Leme
409ae8857e
Merge "Dismiss Autofill Save UI when a new Activity is launched." into oc-mr1-dev
...
am: 3568046048
2017-08-15 17:39:02 +00:00
TreeHugger Robot
3568046048
Merge "Dismiss Autofill Save UI when a new Activity is launched." into oc-mr1-dev
2017-08-15 17:22:18 +00:00
Lucas Dupin
416fe954e9
Improved WallpaperService.Engine tests
...
Using final variables when possible, also testing if
overlaping invalidation requests will be posted to
the handler.
Bug: 63585249
Test: runtest -x services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java
Change-Id: I01cdbdfd5313e55d7a58c77f705aea0f6f817518
2017-08-15 10:19:48 -07:00
Neil Fuller
11f7eebe5b
Merge "Change SystemApi as per API council feedback" into oc-mr1-dev
...
am: a22dcfed28
2017-08-15 16:09:41 +00:00
Neil Fuller
a22dcfed28
Merge "Change SystemApi as per API council feedback" into oc-mr1-dev
2017-08-15 15:57:33 +00:00
Lorenzo Colitti
4faae82855
Merge changes Ifbd1e8d9,I1e017b6f into oc-mr1-dev
...
* changes:
Pass data usage limits to tethering offload code.
Don't time out when fetching tether offload stats.
2017-08-15 06:47:24 +00:00
David Stevens
9440dc87a6
Let external activities run when the primary display is off
...
- Make activity sleep state independent of power manager wakefulness
state. The state is now entirely dependent on sleep tokens (and the
voice interactor).
- Make sleep tokens operate on a per-display basis (and convert the
keyguard to a sleep token).
- Make ActivityStackSupervisor acquire/release sleep tokens for
non-default displays when the displays are turned on/off.
- Make WindowManagerService.okToDisplay operate on a per-display basis.
Bug: 34280365
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testExternalDisplayActivityTurnPrimaryOff
Test: #testLaunchExternalDisplayActivityWhilePrimaryOff
Test: #testExternalDisplayToggleState
Change-Id: I92086d7006a67b4b4f320c9bb3aa606954f85012
2017-08-14 21:59:06 -07:00
Lorenzo Colitti
62801ec2b7
Pass data usage limits to tethering offload code.
...
(cherry picked from commit 50b60fc34d
2017-08-15 12:12:04 +09:00
Lorenzo Colitti
8c0d16cfa6
Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf am: 0cf31d4d6d am: 20fa45e3a9
...
am: d14c177136
2017-08-15 02:52:22 +00:00
Lorenzo Colitti
d14c177136
Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf am: 0cf31d4d6d
...
am: 20fa45e3a9
2017-08-15 02:34:30 +00:00
Lorenzo Colitti
20fa45e3a9
Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf
...
am: 0cf31d4d6d
2017-08-15 02:25:36 +00:00
Lorenzo Colitti
0cf31d4d6d
Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05
...
am: 51c3d6a8bf
2017-08-15 02:16:18 +00:00
Lorenzo Colitti
51c3d6a8bf
Merge changes I82d3bee0,I9c9413d7
...
am: deb4eb5d05
2017-08-15 02:07:36 +00:00
Lorenzo Colitti
deb4eb5d05
Merge changes I82d3bee0,I9c9413d7
...
* changes:
Pass data usage limits to tethering offload code.
Don't time out when fetching tether offload stats.
2017-08-15 01:57:28 +00:00
Felipe Leme
05ea98a3f9
Dismiss Autofill Save UI when a new Activity is launched.
...
Test: manual verification using Settings
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -tandroid.autofillservice.cts.SimpleSaveActivityTest#testDismissSave_byLaunchingNewActivity
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -tandroid.autofillservice.cts.LoginActivityTest#testSaveGoesAwayWhenLaunchingNewActivity
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Fixes: 64693551
Change-Id: I323031c7285a4b49f9f0ca06618425a0ab7833da
2017-08-14 17:56:30 -07:00
Felipe Leme
6789909fb7
Merge "Fix CustomDescription so it allows multiple transformations per view id." into oc-mr1-dev am: d836c4f8a5
...
am: 1c3baee7e4
2017-08-15 00:13:28 +00:00
Steven Timotius
af03df6a7a
Update WindowManager to output dumpsys in protobuf format
...
Implement enough functionality in protobuf dumpsys to replicate
old functionaltiy in android.server.cts.WindowManagerState
Test: cts-tradefed run commandAndExit cts-dev --module CtsWindowManagerHostTestCases
cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases
Change-Id: Ib527ab3f44620a08cf03b77c37c2bae883d90e13
2017-08-14 17:06:17 -07:00
Felipe Leme
1c3baee7e4
Merge "Fix CustomDescription so it allows multiple transformations per view id." into oc-mr1-dev
...
am: d836c4f8a5
2017-08-14 23:51:12 +00:00
Todd Kennedy
9467febacf
Merge "Change protection level from ephemeral to instant" into oc-mr1-dev am: ef2e7d27ae
...
am: a1f2f3eb7b
2017-08-14 23:48:21 +00:00
Todd Kennedy
a1f2f3eb7b
Merge "Change protection level from ephemeral to instant" into oc-mr1-dev
...
am: ef2e7d27ae
2017-08-14 23:31:20 +00:00
TreeHugger Robot
d836c4f8a5
Merge "Fix CustomDescription so it allows multiple transformations per view id." into oc-mr1-dev
2017-08-14 23:30:00 +00:00
Todd Kennedy
4d725903ae
Merge "Hide internal value" into oc-mr1-dev am: d57287be19
...
am: c25cb8f933
2017-08-14 23:25:11 +00:00
TreeHugger Robot
ef2e7d27ae
Merge "Change protection level from ephemeral to instant" into oc-mr1-dev
2017-08-14 23:18:45 +00:00
Todd Kennedy
c25cb8f933
Merge "Hide internal value" into oc-mr1-dev
...
am: d57287be19
2017-08-14 23:11:18 +00:00
TreeHugger Robot
d57287be19
Merge "Hide internal value" into oc-mr1-dev
2017-08-14 22:52:25 +00:00
Nate Fischer
cf08be26fa
Merge "WebView: switch to OMR1 FactoryProvider" into oc-mr1-dev am: 417944624b
...
am: c5731e7c85
2017-08-14 21:53:19 +00:00
