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

563604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cody Kesting
00328b1c78 Merge changes I61dd789f,I57c73264 am: 48a1062811 am: fb9eb14070 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532160

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I807dddf4ee23771cbaa47cd9429a46e1d789841b
 2021-01-19 21:07:31 +00:00
Jeff Sharkey
fb7a6198db Merge "Make the performance team the owners for PinnerService.java" am: 96a8a5b924 am: 95ca7aafed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e7ef5d21f1d6b6a245e5f417b94484f9e9b6c34
 2021-01-19 21:06:58 +00:00
Cody Kesting
fb9eb14070 Merge changes I61dd789f,I57c73264 am: 48a1062811 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532160

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d1ebffbbb7617b37e4491049fba612280338865
 2021-01-19 20:51:35 +00:00
Jeff Sharkey
95ca7aafed Merge "Make the performance team the owners for PinnerService.java" am: 96a8a5b924 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8859abeced1ba00ca938f4de363b6bb4c2eaa04e
 2021-01-19 20:40:04 +00:00
Jack Yu
409a55ad6d [automerger skipped] Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" into rvc-qpr-dev am: 4488005ee5 -s ours 
am skip reason: Change-Id I2b987d24851cdb16d8457b0ec5c546ace5485ed0 with SHA-1 1f610b73f3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13357905

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a1e7cf3b21b9e280545544ab5183f72305880ef
 2021-01-19 19:59:40 +00:00
Cody Kesting
48a1062811 Merge changes I61dd789f,I57c73264 
* changes:
  Define add and remove for VCN policy listeners.
  Define VcnUnderlyingNetworkPolicy.
 2021-01-19 19:37:53 +00:00
Jeff Sharkey
96a8a5b924 Merge "Make the performance team the owners for PinnerService.java" 2021-01-19 19:34:23 +00:00
Carmen Jackson
e41a225e2e Make the performance team the owners for PinnerService.java 
In order to do this, updated the apct-tests/perftests/OWNERS file to
include the entire perf team and then added that to the
PinnerService.java definition.

Also removed srnvs@ since I am getting a "does not exist"
warning for that email.

Bug: 177918051
Test: Presubmit
Change-Id: I00f30f5131d38c4b073266e8c80d92d1ad734eb5
 2021-01-19 11:31:58 -08:00
Steven Moreland
41f79e8177 Merge "HwBlob: explicit size check" am: 4becb19325 am: d35ef5aea8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id50bafde7be609f4908b47d9bf5e69f69f75ce50
 2021-01-19 19:12:37 +00:00
Treehugger Robot
5a1e5ac1ff Merge "Fixed Handler Leak on WrapperInit" am: 9c7e15ab31 am: d723dd9191 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495716

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14173b39846f2ef92698731b48dd4dd79d361b97
 2021-01-19 19:12:06 +00:00
Jack Yu
4488005ee5 Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" into rvc-qpr-dev 2021-01-19 19:05:46 +00:00
Steven Moreland
d35ef5aea8 Merge "HwBlob: explicit size check" am: 4becb19325 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id46efd489eb9a31e4deac4ba3c514f865389f2df
 2021-01-19 18:36:09 +00:00
Treehugger Robot
d723dd9191 Merge "Fixed Handler Leak on WrapperInit" am: 9c7e15ab31 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495716

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5070ec1f948d3fee3eacf5f6069417b8c7d7474a
 2021-01-19 18:27:14 +00:00
Treehugger Robot
f1ec514926 Merge "Check ProjectBackwards property for childrens after children's syncProperties()." am: b22ef02f1f am: 56f018b1e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550595

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia73f6c7a664a29a3263063f5ee848274d9397c07
 2021-01-19 18:26:51 +00:00
Steven Moreland
4becb19325 Merge "HwBlob: explicit size check" 2021-01-19 18:11:46 +00:00
Treehugger Robot
9c7e15ab31 Merge "Fixed Handler Leak on WrapperInit" 2021-01-19 18:05:04 +00:00
Jack Yu
a2b07658c5 Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" into rvc-qpr-dev-plus-aosp 2021-01-19 17:52:11 +00:00
Treehugger Robot
56f018b1e4 Merge "Check ProjectBackwards property for childrens after children's syncProperties()." am: b22ef02f1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550595

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdf268e87ef8f77260e900f127762ca458e5d599
 2021-01-19 17:36:45 +00:00
Jeff Sharkey
8c3a3e3eaf Merge "Correct ownership of AppSearchPersonTest" am: 8a1d03fe10 am: 03047824e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e5f494f9cba6c3ae2a0cdaec9c08ae97f12b8ff
 2021-01-19 17:20:24 +00:00
Treehugger Robot
b22ef02f1f Merge "Check ProjectBackwards property for childrens after children's syncProperties()." 2021-01-19 17:08:47 +00:00
Jeff Sharkey
03047824e4 Merge "Correct ownership of AppSearchPersonTest" am: 8a1d03fe10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia09adb9f121d88b60e0d374a6bd5be6d4d7fbc79
 2021-01-19 16:07:11 +00:00
Jeff Sharkey
8a1d03fe10 Merge "Correct ownership of AppSearchPersonTest" 2021-01-19 15:41:38 +00:00
Junyu Lai
707465a26a Merge "Revert "[VCN06] Support request background network"" am: b380466d29 am: 932ab25ed6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81c094b08398d55a0ada21af60c22dfe7ec9cd97
 2021-01-19 11:59:36 +00:00
Junyu Lai
932ab25ed6 Merge "Revert "[VCN06] Support request background network"" am: b380466d29 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8f292997e582da1eeeb469c91a52225ba4a2217
 2021-01-19 11:34:18 +00:00
Junyu Lai
b380466d29 Merge "Revert "[VCN06] Support request background network"" 2021-01-19 10:24:47 +00:00
Treehugger Robot
1d1b88dcae Merge "Add a permission check for the default network connectivity metrics." am: 20e113e316 am: 1d32a861eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554175

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I637a008e290934281d9d9640b3de6b7c49512539
 2021-01-19 09:41:11 +00:00
Junyu Lai
854241172b Revert "[VCN06] Support request background network" 
Revert submission 1545847-vcn06

Reason for revert: b/177876289 presubmit failure
Reverted Changes:
I8042ce197:[VCN06.1] Add CTS for request background network
If9aaa87b7:[VCN06] Support request background network

Change-Id: I9270b02a2d6d1ffcdd83b4f41becaf09a2b91e0a
 2021-01-19 09:06:00 +00:00
Treehugger Robot
1d32a861eb Merge "Add a permission check for the default network connectivity metrics." am: 20e113e316 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554175

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I557bc8d196bc18a05fa50d637ddc53ad01fe943e
 2021-01-19 08:37:24 +00:00
Treehugger Robot
20e113e316 Merge "Add a permission check for the default network connectivity metrics." 2021-01-19 07:52:03 +00:00
Jack Yu
1f610b73f3 Temporary fix to prevent TEMPORARILY_NOT_METERED leak 
Currently we are seeing TEMPORARILY_NOT_METERED occurs on non-5G
devices. This fix adds more checks to prevent incorrect
TEMPORARILY_NOT_METERED being set. Before we root cause the issue,
we only allow this bit when all of the following conditions met.

1. Devices should support 5G.
2. Carriers should support 5G unmetered data.
3. Device should camp on 5G network.

This temporary fix should be removed after we root cause the issue.

Bug: 176119724
Test: Manual
Merged-In: I2b987d24851cdb16d8457b0ec5c546ace5485ed0
Change-Id: I2b987d24851cdb16d8457b0ec5c546ace5485ed0
 2021-01-19 07:48:56 +00:00
Kyunglyul Hyun
6d901c94f6 Merge "MediaRouterService binds services when necessary" am: 2f9749cd57 am: e9d6a427fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf85a57b2f63a2dc2fc93e7308b0d4a445afc50e
 2021-01-19 06:30:17 +00:00
Treehugger Robot
7008bece02 Merge "Remove usage of NetCapability" am: bd3110f654 am: dd7445523b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0407079209842c317353e1e75391f949608b99bd
 2021-01-19 06:29:19 +00:00
Lorenzo Colitti
521a139f79 Add a permission check for the default network connectivity metrics. 
This check was missed in aosp/1541935.

Bug: 177656797
Test: atest FrameworksNetTests
Change-Id: Idea00f16e56cff79897c142a4da3b07e3d93f379
 2021-01-19 06:20:10 +00:00
Kyunglyul Hyun
e9d6a427fe Merge "MediaRouterService binds services when necessary" am: 2f9749cd57 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbf0dcdbe627516fc11bd323f94233b0ed2a7f8b
 2021-01-19 06:10:49 +00:00
Kyunglyul Hyun
2f9749cd57 Merge "MediaRouterService binds services when necessary" 2021-01-19 06:06:26 +00:00
Treehugger Robot
dd7445523b Merge "Remove usage of NetCapability" am: bd3110f654 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifed84fa84f784d90fdd37aca45eb48571be014af
 2021-01-19 06:03:38 +00:00
Treehugger Robot
dc2c91f4f8 Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: caa5817c33 am: a8a4a46077 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib62b14620dd2aa880bca086d7144b05e088d236d
 2021-01-19 05:23:31 +00:00
Treehugger Robot
4a5b422455 Merge changes I475502fd,Ibf376a6f,Ia52f9caf am: 58a2186be0 am: 6ff1005d16 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553958

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I003a453f17b37f10e2acd4c92aa56fe52c09741f
 2021-01-19 05:22:18 +00:00
Treehugger Robot
bd3110f654 Merge "Remove usage of NetCapability" 2021-01-19 05:16:00 +00:00
Treehugger Robot
a8a4a46077 Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: caa5817c33 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74a6492618ca1e21e35474c012dee9886239e75a
 2021-01-19 04:49:10 +00:00
Treehugger Robot
caa5817c33 Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" 2021-01-19 04:45:08 +00:00
Treehugger Robot
6ff1005d16 Merge changes I475502fd,Ibf376a6f,Ia52f9caf am: 58a2186be0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553958

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cf8401a1cf16b8bbd3d46a65c40c642324c00e8
 2021-01-19 04:45:06 +00:00
Treehugger Robot
58a2186be0 Merge changes I475502fd,Ibf376a6f,Ia52f9caf 
* changes:
  Address comments on aosp/1539753, aosp/1542487 and aosp/1547496.
  Fix propagating underlying caps when a network disconnects.
  Test for bugs with suspended VPN underlying networks.
 2021-01-19 04:19:56 +00:00
raylinhsu
97a31e37b9 DO NOT MERGE "Fix the ambient lux which did not update for blocking zone" am: 73ba11e97b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13345660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d16aa1b6b32c53381ea356704524f589136fa2a
 2021-01-19 04:02:18 +00:00
Michael Wright
cd89ac9062 DO NOT MERGE "Allow DeviceConfig to change display settings for high zone" am: 58515946ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13345659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia563c3ff4128d22f1451b304b217de7473fffafd
 2021-01-19 04:02:10 +00:00
raylinhsu
50a6e3971d DO NOT MERGE "Set fixed fps when ambient or display brightness is high" am: 0ecd3e13e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13345658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68a63501e5bd8ff952a20da3b16496a9ea16d8be
 2021-01-19 04:01:51 +00:00
Remi NGUYEN VAN
e4954ca8ad Fix CaptivePortalDataTest#testParcelUnparcel on R 
CaptivePortalData only has 7 fields on R, not 8.

Bug: 177290955
Change-Id: I156738d07821fee43420d8af14c4bce36dd0e4a4
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalDataTest on R
 2021-01-19 02:33:09 +00:00
Lorenzo Colitti
78a7675a34 Address comments on aosp/1539753, aosp/1542487 and aosp/1547496. 
Bug: 173331190
Test: test-only change
Change-Id: I475502fde55d24e7ae3f7fe9f43c54740c57a9cf
 2021-01-19 10:35:43 +09:00
Junyu Lai
645596b998 Merge "[VCN06] Support request background network" am: a18490bdde am: 1856a60c7b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic810d591fcb5895db877fdd5634f9adca6a7720f
 2021-01-19 01:34:53 +00:00
Treehugger Robot
37f4ebb9e1 Merge "Make BugreportManager a public API that respects carrier privileges." am: 0dcf4de7df am: 6d6c5ec5cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552883

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib26fe91f828ca6d39f19f7893f2f3c76da6e9738
 2021-01-19 01:34:32 +00:00