Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
559,250 Commits 3 Branches 0 Tags
3a42fb2dee8167085c78377463d896b143047c5b
Commit Graph

559250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Geoffray
3a42fb2dee Merge "Remove NativeTestTarget." am: b3db690a48 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529303

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I812c35afe49f7f1019e6eabe297cc307eb9f5bb5
 2020-12-16 10:35:37 +00:00
Nicolas Geoffray
b3db690a48 Merge "Remove NativeTestTarget." 2020-12-16 10:01:20 +00:00
Lorenzo Colitti
e8c002d842 Merge changes Ie0b32460,I21028457,I82754375 am: 29e5346c24 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec4ec0fa39235a171431832a5871e2cfdf1fbf25
 2020-12-16 09:10:43 +00:00
Lorenzo Colitti
29e5346c24 Merge changes Ie0b32460,I21028457,I82754375 
* changes:
  Allow ConnectivityServiceTest to change the calling UID.
  Add a test for getDefaultNetworkCapabilitiesForUser.
  Add tests for always-on VPN lockdown mode.
 2020-12-16 08:29:32 +00:00
Aaron Huang
8192596775 Merge "Move MultipathPolicyTracker back to framework" am: a2c355cc18 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519959

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24dd1d64b33265ef296e9e912ae18a3e7ae7b10f
 2020-12-16 04:07:51 +00:00
Jeff Sharkey
bcfe028bff Merge "Remove "set noparent" in blobstore OWNERS file" am: be6079bd17 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93962cda116ab16f4f0275110a2799ed13dd6a56
 2020-12-16 04:05:35 +00:00
Jeff Sharkey
2aa39e4407 Merge "Added owners for DevicePolicy mocking tests" am: eea226987e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530768

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78dfd9f534fe277f801262d06275c1e5c5d79f6d
 2020-12-16 04:03:32 +00:00
Jeff Sharkey
1ba06f2dde Merge "Add BATTERY_STATS_OWNERS to OWNERS for battery stats tests" am: f37523fbb1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531243

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c6b327edf54ed93a6d98a008a6914fc6b4121bc
 2020-12-16 03:58:19 +00:00
Aaron Huang
a2c355cc18 Merge "Move MultipathPolicyTracker back to framework" 2020-12-16 03:38:22 +00:00
Jeff Sharkey
be6079bd17 Merge "Remove "set noparent" in blobstore OWNERS file" 2020-12-16 03:26:55 +00:00
Jeff Sharkey
eea226987e Merge "Added owners for DevicePolicy mocking tests" 2020-12-16 03:26:36 +00:00
Jeff Sharkey
f37523fbb1 Merge "Add BATTERY_STATS_OWNERS to OWNERS for battery stats tests" 2020-12-16 03:26:08 +00:00
Brian Stack
a0e1666a74 Merge "Ensure UWB conforms to API guidelines" am: 0070e26a5e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I827e18f97985aeeeaa922432f539bc0f27c96025
 2020-12-16 00:28:33 +00:00
Dmitri Plotnikov
cd2be4417b Add BATTERY_STATS_OWNERS to OWNERS for battery stats tests 
Test: N/A
Change-Id: I1115bb151454b2c86332388d40e13cdfb9db66a0
 2020-12-16 00:14:52 +00:00
Brian Stack
0070e26a5e Merge "Ensure UWB conforms to API guidelines" 2020-12-16 00:01:26 +00:00
Jakub Pawlowski
b253796204 Merge "Add LE Audio UUID placeholder" am: eec09803da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a86c322ef50db2aefcc3a3862f68d332e8e0b5d
 2020-12-15 22:09:01 +00:00
Jeff Sharkey
9ffe8e1bf3 Merge "Add missing OWNERS files to UWB" am: 6591e70397 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a282d7f37bd531ffa69065110a45efb9d18d40a
 2020-12-15 22:06:11 +00:00
Treehugger Robot
14659d0a88 Merge changes Ieae66cc7,Idf94ddb5 am: 7d486bd054 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512886

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c380bab3d814c44d4df5b0267fe45ee1f2d6f0f
 2020-12-15 22:00:48 +00:00
Jeff Sharkey
0eb1190094 Merge "Add OWNERS to UWB" am: 6d76b53c26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2386ee3dbc4561a6afa71c2fa50303ba16f518e5
 2020-12-15 21:57:03 +00:00
Jakub Pawlowski
eec09803da Merge "Add LE Audio UUID placeholder" 2020-12-15 21:54:45 +00:00
Jeff Sharkey
6591e70397 Merge "Add missing OWNERS files to UWB" 2020-12-15 21:43:02 +00:00
Treehugger Robot
7d486bd054 Merge changes Ieae66cc7,Idf94ddb5 
* changes:
  CEC : Add additional constraint to validate physical address
  CEC : Add validator for tuner device status message
 2020-12-15 21:38:51 +00:00
Brian Stack
6c0a9094a5 Add missing OWNERS files to UWB 
Bug: 175698723
Test: Manual
Change-Id: I4d4d9489f110efc85ce96fe7d37f7acc7bd82341
 2020-12-15 13:35:47 -08:00
Jeff Sharkey
6d76b53c26 Merge "Add OWNERS to UWB" 2020-12-15 21:20:54 +00:00
Treehugger Robot
6a6ee5f318 Merge "iorap: Terminate iorapd process when both tracing and prefetching are off." am: 8ac80b0915 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522026

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52a5012d525d1556acf24b6e13734f72602832e9
 2020-12-15 20:54:14 +00:00
Felipe Leme
d40ddcf022 Added owners for DevicePolicy mocking tests 
Test: none
Bug: 171603586

Change-Id: Ice08374448f5b7899925465e0c49d28d0374c64a
 2020-12-15 12:50:58 -08:00
Peiyong Lin
181ff65039 Merge "[GraphicsEnvironment] Avoid null access." am: 393215e245 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530839

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5af8bb8a0d5f1b6d4bb9b26e8e049720135b5109
 2020-12-15 20:38:00 +00:00
Treehugger Robot
8ac80b0915 Merge "iorap: Terminate iorapd process when both tracing and prefetching are off." 2020-12-15 20:36:52 +00:00
Peiyong Lin
393215e245 Merge "[GraphicsEnvironment] Avoid null access." 2020-12-15 20:10:47 +00:00
Anton Hansson
83ae4ece0b Remove "set noparent" in blobstore OWNERS file 
Change-Id: Ied56c752bb631885d1183a5300631432a40864fe
 2020-12-15 18:40:31 +00:00
Brian Stack
bf2f411e26 Add OWNERS to UWB 
Bug: 175698723
Test: Manual
Change-Id: Ia1982ed3864bbffcce5f4f9192a3cb681085e387
 2020-12-15 10:26:49 -08:00
Peiyong Lin
3cb225dc74 [GraphicsEnvironment] Avoid null access. 
Currently when debug layer apk is not installed, GraphicsEnvironment
logs the message and proceeds, which results in null pointer access
crash when later trying to access primaryAbi. Avoid null access by an
early return statement.

Bug: N/A
Test: specify not installed debug layer apk and no crash
Change-Id: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
Merged-In: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
(cherry picked from commit c5c17e66ba)
 2020-12-15 10:22:53 -08:00
Nicolas Geoffray
7a0acb4d34 Merge "Make Class.getPackageName public." am: 3a76c4c9aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id82c4473902d0ca0ae31b4c7b7d4c9939bfe0bc6
 2020-12-15 17:36:13 +00:00
Nicolas Geoffray
3a76c4c9aa Merge "Make Class.getPackageName public." 2020-12-15 16:55:44 +00:00
Alison Cichowlas
ace8f705bc Merge "Add SystemUI to OWNERS for Sharesheet." am: eff7324d9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73decbc839f7c7a89c61927573c1c0a45f81ae55
 2020-12-15 15:47:07 +00:00
Baligh Uddin
eeb48e12d4 [automerger skipped] Merge "Migrate to frameworks/proto_logging/stats" am: 474ccaacd2 -s ours 
am skip reason: Change-Id Id85494f7f40a0201061e74fbf3f08f70a632a62c with SHA-1 73802a1802 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f47d8a6b9204d784742f44181505f4e6713b413
 2020-12-15 15:40:59 +00:00
Jeff Sharkey
ff4f8415e1 Merge "Update the owner file for recovery system tests" am: 99388fe4a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529741

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23b49e940a96802fc562a120a045e8ad549da28e
 2020-12-15 15:37:53 +00:00
Charles Chen
531ac1780d Merge "Make everyone able to modify mock package" am: c3c6148928 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I185904c92b7436803a6da6c237f0ab8aedc1515f
 2020-12-15 15:34:41 +00:00
Alison Cichowlas
eff7324d9c Merge "Add SystemUI to OWNERS for Sharesheet." 2020-12-15 15:08:10 +00:00
Baligh Uddin
474ccaacd2 Merge "Migrate to frameworks/proto_logging/stats" 2020-12-15 15:06:36 +00:00
Baligh Uddin
cfea49246b Migrate to frameworks/proto_logging/stats 
BUG: 175318992
Test: TH
Merged-In: Id85494f7f40a0201061e74fbf3f08f70a632a62c
Change-Id: I8bee7a0a6acecc1274d5acc0adb44c5dde8862e4
 2020-12-15 15:05:53 +00:00
Baligh Uddin
9218917ebb Merge "Migrate to frameworks/proto_logging/stats" into stage-aosp-master 2020-12-15 15:05:05 +00:00
Jeff Sharkey
99388fe4a9 Merge "Update the owner file for recovery system tests" 2020-12-15 13:50:13 +00:00
Lorenzo Colitti
de7f7447d5 Allow ConnectivityServiceTest to change the calling UID. 
Allow ConnectivityServiceTest to change the UID by replacing
static calls to Binder.getCallingUid() with a method that can
be mocked.

Add registerNetworkCallbackAsUid as an initial way to exercise
this, and add some test coverage to the always-on lockdown test
to confirm that things are working as expected.

Bug: 173331190
Test: new unit tests
Change-Id: Ie0b32460e20e5906a0f479191e11a062f21cc608
 2020-12-15 21:10:36 +09:00
Lorenzo Colitti
42a97894cd Add a test for getDefaultNetworkCapabilitiesForUser. 
Bug: 173331190
Test: test-only change
Test: new test passes 100 times in a row
Change-Id: I210284578e38cd25b8b95235d3390d5bd66a5a70
 2020-12-15 21:08:21 +09:00
Lorenzo Colitti
4d3a0c2435 Add tests for always-on VPN lockdown mode. 
This requires mocking lots of new things that weren't mocked
before but is otherwise fairly straightforward.

A few changes to MockVpn are needed as well:

1. Set the VPN's NetworkInfo to CONNECTED, so methods such as
   isBlockingUid will work. While I'm at it, set the interface on
   the LinkProperties as well to make things a bit more
   realistic.

2. Constructs the VpnConfig when registering the agent, not when
   the MockVpn is created. This is needed because starting and
   stopping lockdown VPN calls prepare, which nulls out mConfig.
   But constructing the VpnConfig when registering the agent is
   more realistic anyway. The production code does that in
   establish, but we can't do that in ConnectivityServiceTest
   because some of the test cases don't call establish and call
   registerAgent directly.

Bug: 173331190
Test: atest FrameworksNetTests
Change-Id: I827543751dbf5e626a24ec02cd6f50b423f5f761
 2020-12-15 21:08:20 +09:00
Charles Chen
c3c6148928 Merge "Make everyone able to modify mock package" 2020-12-15 11:02:16 +00:00
Adrian Roos
c8a88daa25 Merge "Add fonts/OWNERS for font-related files." am: 1ab0fea04b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529699

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4625a36a820261d9b687b668364077965ea537c
 2020-12-15 10:16:10 +00:00
Adrian Roos
1ab0fea04b Merge "Add fonts/OWNERS for font-related files." 2020-12-15 10:00:56 +00:00
Remi NGUYEN VAN
a0038ffa9d Merge changes from topic "tcp_keepalive_fix" am: eada640d5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9e330a2bd8dbb701db0e5b73c1954670d4988fc
 2020-12-15 09:41:42 +00:00