Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
563,207 Commits 3 Branches 0 Tags
0bb4053acaa24074e4bdff6e9a99ad38d38668b2
Commit Graph

563207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hai Shalom
0bb4053aca Merge "Support for Venue URL and friendly name from Network agent" am: 88baf235a9 am: 67242ec449 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515261

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8f462fc38255cdb41edc833f4b6e93f14d3290d
 2021-01-13 03:14:12 +00:00
Hai Shalom
67242ec449 Merge "Support for Venue URL and friendly name from Network agent" am: 88baf235a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515261

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I675ccea6bc692cf8519fce1026aa324efe774564
 2021-01-13 02:09:39 +00:00
Hai Shalom
88baf235a9 Merge "Support for Venue URL and friendly name from Network agent" 2021-01-13 01:54:05 +00:00
James Lin
40bbb90053 Merge "[RCS UCE] Expose the RCS UCE publishing device's capabilities APIs" am: 5b51530d0d am: c914ddf6b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a87adb081a61daaf47bb857436148742f17fa04
 2021-01-13 00:49:57 +00:00
Lorenzo Colitti
54e08a027c Merge changes I3eb82680,I9d6147d9 am: bbd9fb5c27 am: c27bf45cb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547644

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a111bb928c5afd2cbbb15db503b60ef501ff2e0
 2021-01-13 00:49:30 +00:00
Treehugger Robot
77c94b84ca Merge "Revert "OMS: add tests for the OMS transactional API"" am: 78a3fdfbed am: 55e40879e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83f0956b56a93fff302170997735450fa0adf087
 2021-01-13 00:49:02 +00:00
Treehugger Robot
1d12360a9e Merge "Revert "Push OverlayDeviceTests onto /system"" am: b294b8bc61 am: c0d6dea0fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bfc4304d0a230c15e011d0a2a456714bfefbf50
 2021-01-13 00:49:00 +00:00
Treehugger Robot
c9d2ce70de Merge "Revert "OMS: add transactional API"" am: 7facc4ec41 am: ba88e64636 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548437

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d5bf83f5d5ce2600084e4c2be28199ffe78db22
 2021-01-13 00:48:58 +00:00
James Lin
c914ddf6b8 Merge "[RCS UCE] Expose the RCS UCE publishing device's capabilities APIs" am: 5b51530d0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ccba700f145b722133b0e6929dca594ecef94b6
 2021-01-13 00:41:12 +00:00
Lorenzo Colitti
c27bf45cb6 Merge changes I3eb82680,I9d6147d9 am: bbd9fb5c27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547644

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d65a0465729426fb038004cd80a15ca9e438b0e
 2021-01-13 00:34:09 +00:00
James Lin
5b51530d0d Merge "[RCS UCE] Expose the RCS UCE publishing device's capabilities APIs" 2021-01-13 00:33:57 +00:00
Danny Epstein
3cbb779954 Merge "DO NOT MERGE Focus clock by default" into rvc-qpr-dev am: d77d372dc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13223231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f3e2761489f5dd954d1e490f9d8b926e4f61e13
 2021-01-13 00:33:04 +00:00
Danny Epstein
225530ba1c DO NOT MERGE Focus clock by default am: ab6fd7362d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13223231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f55b1deacdfe520bf371f48c98d1e16b675cf77
 2021-01-13 00:32:45 +00:00
Lorenzo Colitti
bbd9fb5c27 Merge changes I3eb82680,I9d6147d9 
* changes:
  NetworkWatchlistServiceTests: update IIpConnectivityMetrics.
  Stop using IIpConnectivityMetrics in ConnectivityService.
 2021-01-13 00:31:56 +00:00
Treehugger Robot
55e40879e8 Merge "Revert "OMS: add tests for the OMS transactional API"" am: 78a3fdfbed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e78a895a3c245e9faf07ce166aaa662b4703d75
 2021-01-13 00:27:47 +00:00
Treehugger Robot
c0d6dea0fb Merge "Revert "Push OverlayDeviceTests onto /system"" am: b294b8bc61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie597d66089a2de256d8817269179c5426bc7d728
 2021-01-13 00:23:41 +00:00
Danny Epstein
d77d372dc7 Merge "DO NOT MERGE Focus clock by default" into rvc-qpr-dev 2021-01-13 00:20:19 +00:00
Treehugger Robot
ba88e64636 Merge "Revert "OMS: add transactional API"" am: 7facc4ec41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548437

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a7d5d6c65b5dd9531f155cc4403c8e5d2ed136b
 2021-01-13 00:16:39 +00:00
Treehugger Robot
78a3fdfbed Merge "Revert "OMS: add tests for the OMS transactional API"" 2021-01-13 00:00:42 +00:00
Treehugger Robot
b294b8bc61 Merge "Revert "Push OverlayDeviceTests onto /system"" 2021-01-13 00:00:42 +00:00
Treehugger Robot
7facc4ec41 Merge "Revert "OMS: add transactional API"" 2021-01-13 00:00:42 +00:00
Tomasz Wasilczyk
dcc64b54fc Merge "Keep Vehicle internal network always up" am: c353781098 am: e189a2466a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfb77d0632352c41629395fe4d8b546c593599ce
 2021-01-12 23:04:07 +00:00
Ken Chen
3da4638c49 Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 am: fac52cd24b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I792005c9abd7ccf6a0948330a32b2dcc07d51506
 2021-01-12 23:03:49 +00:00
Tomasz Wasilczyk
e189a2466a Merge "Keep Vehicle internal network always up" am: c353781098 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I486b4c9dd987dd94b4e4ca9d1f87fe58d9f9f51e
 2021-01-12 22:43:41 +00:00
Tomasz Wasilczyk
c353781098 Merge "Keep Vehicle internal network always up" 2021-01-12 22:40:50 +00:00
Ken Chen
fac52cd24b Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I867128ec2eddf494c8ff15e19c54733778d5eace
 2021-01-12 22:39:07 +00:00
Ken Chen
191e2d3c39 Merge "Let ConnectivityService control the socket closure" 2021-01-12 22:23:59 +00:00
TreeHugger Robot
910b875440 Merge "Fix the ambient lux which did not update for blocking zone" into rvc-qpr-dev am: 61b61e49ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13288650

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3c67929da76d462dfb42df1bcbc406388930278
 2021-01-12 22:08:35 +00:00
TreeHugger Robot
61b61e49ed Merge "Fix the ambient lux which did not update for blocking zone" into rvc-qpr-dev 2021-01-12 21:45:48 +00:00
Ryan Mitchell
0ad9a225d4 Revert "OMS: add tests for the OMS transactional API" 
This reverts commit 2241956858.

Reason for revert: 177065099

Change-Id: Id47cc94591eefbc276f77ae8601bb6d52cfa2f63
 2021-01-12 21:11:17 +00:00
Ryan Mitchell
118ddbccc9 Revert "Push OverlayDeviceTests onto /system" 
This reverts commit 2b1b3b282f.

Reason for revert: b/177065099

Change-Id: I0ac8d525c9f36ace5e65ffb2305f75fef0b6dc65
 2021-01-12 21:10:19 +00:00
Ryan Mitchell
295e0d7183 Revert "OMS: add transactional API" 
This reverts commit ac6bbdb6b0.

Reason for revert: b/177065099

Change-Id: I11d8a498f25b3e734a28f160a6b65c5b5720a38d
 2021-01-12 21:09:53 +00:00
Treehugger Robot
7c6dd474c4 Merge "Reland revert of "Added mitigation for b/122921367"""" am: 5be93c2823 am: 333c5f633f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546309

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9cbc5ee29e82a28d1a26d6d14e5c342c6d65136
 2021-01-12 21:03:02 +00:00
Adam Bookatz
9ac98ffa59 Merge "Add User* OWNERS file (part 2)" am: da79da08f0 am: b9b73d26db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543926

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87bc14c52e4aa4ed42f73496e104f0f3182c613b
 2021-01-12 20:55:13 +00:00
Treehugger Robot
333c5f633f Merge "Reland revert of "Added mitigation for b/122921367"""" am: 5be93c2823 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546309

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I427fc5166b5d5e29340a549f42626e1ac062d80f
 2021-01-12 20:51:56 +00:00
Patrick Rohr
da388b2cb4 Merge changes from topic "restricted-mode-cts" am: a96eeac8d6 am: 6b0836f428 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545868

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b20d406cc52bf79b3644be76505cae1c285736a
 2021-01-12 20:48:25 +00:00
Patrick Rohr
429f94a923 Add shell command to query Restricted Mode state am: ce9f94d956 am: 791ea8a405 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica34e35563ce181894c865ba94eafa8ce097fe6f
 2021-01-12 20:48:23 +00:00
Patrick Rohr
d5475db15a Add Restricted Mode settings observer to NetworkPolicyManagerService am: 8b6082b585 am: f2832ba483 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e00cf86a40356d373e56375eec78679cd06b191
 2021-01-12 20:48:21 +00:00
Patrick Rohr
c4ad204556 Merge changes I0731fa84,Id31a60ad am: 1ab1849ab2 am: 6e05084c6a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I081abc916ae5ec6333cfda1d8a6e5ee20560be85
 2021-01-12 20:47:46 +00:00
Adam Bookatz
b9b73d26db Merge "Add User* OWNERS file (part 2)" am: da79da08f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543926

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06b98717800242d82eb60c7e7144d1a53c0cfefd
 2021-01-12 20:47:44 +00:00
Patrick Rohr
ad3194204d Refactor updating rules for all apps in NetworkPolicyManagerService am: e944af5bd6 am: 9405e43734 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee0b722916a5b48bb2b375f8d7e0f39620936617
 2021-01-12 20:47:43 +00:00
Patrick Rohr
6b0836f428 Merge changes from topic "restricted-mode-cts" am: a96eeac8d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545868

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4015fa686b9511bfb89e4b6e3093def02d3eb9b1
 2021-01-12 20:43:06 +00:00
Patrick Rohr
791ea8a405 Add shell command to query Restricted Mode state am: ce9f94d956 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8f0ebad3b3aa8d0552f75b2927607e616970a0d
 2021-01-12 20:39:28 +00:00
Patrick Rohr
f2832ba483 Add Restricted Mode settings observer to NetworkPolicyManagerService am: 8b6082b585 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c42c4c0ac3dcf860d5daacaf2748ea951a9cade
 2021-01-12 20:34:21 +00:00
Treehugger Robot
5be93c2823 Merge "Reland revert of "Added mitigation for b/122921367"""" 2021-01-12 20:32:17 +00:00
Patrick Rohr
6e05084c6a Merge changes I0731fa84,Id31a60ad am: 1ab1849ab2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb217a2f933bd215a489f202f737122cf87b9b36
 2021-01-12 20:28:07 +00:00
Patrick Rohr
9405e43734 Refactor updating rules for all apps in NetworkPolicyManagerService am: e944af5bd6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1bf72d746a418d7310eb59a8039221fd56988c2
 2021-01-12 20:14:27 +00:00
Evan Laird
4134ac8ade Merge "Listen for EXTRA_PRESENT changes" into rvc-qpr-dev am: 623049adac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13083016

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad025254e0c1d8e3400ee9554594bc28d5b20b84
 2021-01-12 20:12:54 +00:00
Evan Laird
623049adac Merge "Listen for EXTRA_PRESENT changes" into rvc-qpr-dev 2021-01-12 18:57:58 +00:00
Adam Bookatz
da79da08f0 Merge "Add User* OWNERS file (part 2)" 2021-01-12 18:46:24 +00:00