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
Benjamin Miller
1bb5a1e5b3
Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev am: 947528607f
...
am: 96d506af85
2017-08-16 18:29:38 +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
TreeHugger Robot
6fc20cbffb
Merge "thermalservice: future-proofing fixup to Temperature constructor"
2017-08-16 14:26:28 +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
Benjamin Miller
96d506af85
Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev
...
am: 947528607f
2017-08-16 10:19:34 +00:00
TreeHugger Robot
947528607f
Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev
2017-08-16 10:13:09 +00:00
TreeHugger Robot
63c59937d7
Merge "Load Smart Select stroke color from colorControlActivated"
2017-08-16 10:01:05 +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
Todd Poynor
6d5ce9e234
thermalservice: future-proofing fixup to Temperature constructor
...
Change the default constructor to leverage the constructor with params
specified, to avoid future code duplication if more logic is added to
constructors in the future.
Test: manual: marlin with temporary java thermal event listener
Bug: 30982366
Change-Id: I0be55fe2561f606ddf1bcebb98ae7e1120ff8d2d
2017-08-16 08:01:12 +00:00
Felipe Leme
486ecbe517
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev
...
am: 6ba128762f
2017-08-15 22:49:15 +00:00
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
TreeHugger Robot
6ba128762f
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev
2017-08-15 22:23:57 +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
2220049d58
Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880
...
am: a3c2cee055
2017-08-15 21:48:32 +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
Charles He
77f3300f48
[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: b0fa5855dc
2017-08-15 21:35:05 +00:00
Felipe Leme
a3c2cee055
Merge "Additional documentation about Autofill / WebView security." into oc-dev
...
am: 36cbdef880
2017-08-15 21:33:01 +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
b0fa5855dc
[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:16:36 +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
Petar Šegina
5a239f0113
Load Smart Select stroke color from colorControlActivated
...
Test: manual - built an app that overrides colorControlActivated in it's
theme and tested the Smart Select animation in it
Change-Id: Ia6112e9e1f49b15a56f8f0455cd55bf3df598508
2017-08-15 20:01:45 +01: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
Benjamin Miller
1aed7889c0
Docs: Javadoc comment fixups for secure passcode reset methods.
...
Exceptions corrected for methods and cross references linked up.
Clarification about resetPassword() and work profiles.
Staged at: go/dac-stage/reference/android/app/admin/DevicePolicyManager.html
Test: make ds-docs with output staged and visually checked in DevicePolicyManager page
Bug: 38026339
Change-Id: I3346144193061fad7988c92e0d4be4b341ef7410
2017-08-15 18:34:06 +02: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
