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

563320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Ioffe
e93d80498e Merge "Add more owners for tests/StagedInstallTest" am: 4632bfaa01 am: 2de006fded 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549972

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I625dd1f4c67e7fb0b08874c63279bc0ecd9d3881
 2021-01-14 14:53:18 +00:00
Nikita Ioffe
2de006fded Merge "Add more owners for tests/StagedInstallTest" am: 4632bfaa01 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549972

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc3f16250c9662dd3b87b4a5199cab163a540f83
 2021-01-14 13:58:25 +00:00
Nikita Ioffe
4632bfaa01 Merge "Add more owners for tests/StagedInstallTest" 2021-01-14 13:38:52 +00:00
Lorenzo Colitti
869987f60a Merge changes I28e39400,Ibada8b42 am: c5f2057d02 am: 98802d08bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548870

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a086ef5602d1823ca582894f8fddd138ce6080c
 2021-01-14 11:34:15 +00:00
Mathew Inwood
a07e6debf0 Merge "Move temp blocklist APIs to max-sdk-r list." am: f5f4d792cf am: 0815bbc480 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cc168834f1071f807fd403b9a9e770095b4ae06
 2021-01-14 11:33:55 +00:00
Lorenzo Colitti
98802d08bf Merge changes I28e39400,Ibada8b42 am: c5f2057d02 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548870

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59bcae23f71d57715845b1f613c0733a04725763
 2021-01-14 11:00:43 +00:00
Mathew Inwood
0815bbc480 Merge "Move temp blocklist APIs to max-sdk-r list." am: f5f4d792cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0376c4825c8ef7577be1192069e465167affdcd
 2021-01-14 10:56:59 +00:00
Lorenzo Colitti
c5f2057d02 Merge changes I28e39400,Ibada8b42 
* changes:
  UserManager restricted profile SystemApis
  Improve testing of CONNECTIVITY_ACTION broadcasts.
 2021-01-14 10:39:48 +00:00
Mathew Inwood
f5f4d792cf Merge "Move temp blocklist APIs to max-sdk-r list." 2021-01-14 10:23:13 +00:00
Aaron Huang
ee60d070c4 Merge "Migrate Slog usage in MultinetworkPolicyTracker to Log" am: 570985a03e am: 5fe62a1765 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide31b81db2a41c4ea60783195bff3d9bb8ff5440
 2021-01-14 09:39:26 +00:00
Treehugger Robot
bf9b50a80b Merge "Additional SysUI leads in OWNERS for resources in frameworks/base/core." am: 8d01f4d407 am: 2c653860ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9debf2241b317fd20f04251fc3d8ba61da948b71
 2021-01-14 09:38:56 +00:00
Aaron Huang
5fe62a1765 Merge "Migrate Slog usage in MultinetworkPolicyTracker to Log" am: 570985a03e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id726928bd9363d01de8aaafd19e07db8498897c7
 2021-01-14 09:23:25 +00:00
Treehugger Robot
2c653860ae Merge "Additional SysUI leads in OWNERS for resources in frameworks/base/core." am: 8d01f4d407 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73a3ccadfff9ddadf9deefc3bfcc593b5193b8c0
 2021-01-14 09:19:48 +00:00
Aaron Huang
570985a03e Merge "Migrate Slog usage in MultinetworkPolicyTracker to Log" 2021-01-14 09:10:17 +00:00
Treehugger Robot
8d01f4d407 Merge "Additional SysUI leads in OWNERS for resources in frameworks/base/core." 2021-01-14 09:02:16 +00:00
Adam Bookatz
81762facae UserManager restricted profile SystemApis 
Makes two new SystemApis:
getRestrictedProfileParent()
canHaveRestrictedProfile()

Temporarily disables VPN Tests that rely on the old APIs until those
tests are updated (b/175883995).

Bug: 171529940
Test: atest FrameworksNetTests:com.android.server.connectivity.VpnTest
Test: Tests for UserManager SystemApis are TODO awaiting completion of new user test infrastructure (b/163890431)
(cherry picked from commit 20ba13f5bc)
Change-Id: I28e39400039631e7d391dc7b0d003e8a38d1f06a
 2021-01-14 17:39:13 +09:00
Junyu Lai
1f1e9e481d Merge "[VCN05] Pass request type when requesting network" am: 539dbe61c5 am: e7e0e5b7ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545846

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If712966563911065873c8933557921a20c9dca0e
 2021-01-14 08:17:00 +00:00
Lorenzo Colitti
755cf3be3f Improve testing of CONNECTIVITY_ACTION broadcasts. 
We currently test CONNECTIVITY_ACTION broadcasts by directly
registering BroadcastReceivers with BroadcastInterceptingContext,
and making the receivers unregister themselves when all the
broadcasts they expect have been received.

This works for current test cases, but does not work if anything
registers another receiver for CONNECTIVITY_ACTION. In that case,
when we unregister the receiver in the receiver's onReceive
method, BroadcastInterceptingContext will throw a
ConcurrentModificationException because the list of receivers is
being modified during iteration.

Fix this by adding an ExpectedBroadcast class that stores the
receiver and unregisters the receiver only when the test checks
that the broadcast was received, which happens after the receiver
runs. This is easier to use and also guarantees that the receiver
is unregistered even if the test is expecting that the broadcast
is never fired. Accordingly, remove mRegisteredReceivers and the
code that uses it; it's no longer necessary now that
ExpectedBroadcast always unregisters its receivers.

Also add a convenience expectConnectivityAction method to expect
a CONNECTIVITY_ACTION broadcast with specific contents. This
makes the test easier to read and more detailed. Convert some
existing tests to this method.

While I'm at it, fix a test that was using "mCellNetworkAgent" to
represent a wifi network.

Bug: 173331190
Test: test-only change
Change-Id: Ibada8b4215625e1016d9fd170526206920af76f5
 2021-01-14 17:11:28 +09:00
Junyu Lai
e7e0e5b7ba Merge "[VCN05] Pass request type when requesting network" am: 539dbe61c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545846

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f617b172ca17748b6e6be0afbf3474b5629dec7
 2021-01-14 07:43:35 +00:00
Junyu Lai
539dbe61c5 Merge "[VCN05] Pass request type when requesting network" 2021-01-14 06:52:46 +00:00
Aaron Huang
ce85d34306 Merge "Rename PacManager to PacProxyInstaller" am: 3b26172c84 am: 3fb8d62ea1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513130

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad81d2612d16585134028fea71cbab2f1fb13610
 2021-01-14 04:22:40 +00:00
Josh Gao
e0cbabe562 Merge changes I0f1d59ae,I2f63bffb am: 9f7a73fc21 am: 87caaf0da8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdba196ea0f31979717b6e06edc62653b2dc6d74
 2021-01-14 04:22:13 +00:00
Tianjie Xu
500579cd2b Merge changes Id0e18bef,Ie2b5f559 am: 5bf384cae9 am: e5d8f60389 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc61336580ca8b58efad146c5aebfcbbc845e78d
 2021-01-14 04:21:40 +00:00
Treehugger Robot
71badc9b5b Merge "Add feature flag for app hibernation." am: 7ae76a2f3f am: 8dece034b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542244

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I155803617d66612501297dd04131849db8c49926
 2021-01-14 04:20:51 +00:00
Benedict Wong
a363ff4070 Merge changes I915e0c4e,Iae187c0b am: c8387d8128 am: 551f4c523a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515263

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32b7147de91fa5878dbba5e95bf897912136cedf
 2021-01-14 04:20:02 +00:00
Aaron Huang
3fb8d62ea1 Merge "Rename PacManager to PacProxyInstaller" am: 3b26172c84 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513130

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf8192ca563275048acccbf6163f7effc4b04781
 2021-01-14 01:54:51 +00:00
Aaron Huang
1248c0376b Migrate Slog usage in MultinetworkPolicyTracker to Log 
Connectivity mainline module cannot use hidden API so
replace Slog with Log which is a public API.

Test: FrameworksNetTests
Change-Id: I8758079cf635ff4ab218df53c0f7bf6fc23ce476
 2021-01-14 09:53:38 +08:00
Aaron Huang
3b26172c84 Merge "Rename PacManager to PacProxyInstaller" 2021-01-14 01:52:24 +00:00
Josh Gao
87caaf0da8 Merge changes I0f1d59ae,I2f63bffb am: 9f7a73fc21 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I937c39caa5f28148279f2cc7c85c07b90eb3fac4
 2021-01-14 01:48:45 +00:00
Tianjie Xu
e5d8f60389 Merge changes Id0e18bef,Ie2b5f559 am: 5bf384cae9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbdaa08e4e467a950c21f749ea298e1182bb05b0
 2021-01-14 01:44:55 +00:00
Josh Gao
9f7a73fc21 Merge changes I0f1d59ae,I2f63bffb 
* changes:
  fdtrack: GC before checking fd count.
  Move system_server fdtrack implementation to Java.
 2021-01-14 01:22:22 +00:00
Tianjie Xu
5bf384cae9 Merge changes Id0e18bef,Ie2b5f559 
* changes:
  Wrap the escrow data with key from keystore
  Load and generate key from keystore in reboot escrow
 2021-01-14 00:52:37 +00:00
Treehugger Robot
8dece034b9 Merge "Add feature flag for app hibernation." am: 7ae76a2f3f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542244

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93426f77dd93036f9a712db35e086eb11e8b627e
 2021-01-14 00:25:05 +00:00
Benedict Wong
551f4c523a Merge changes I915e0c4e,Iae187c0b am: c8387d8128 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515263

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62cc28e59b358b6f996416f7dc6b80f620e7c18a
 2021-01-14 00:21:32 +00:00
Treehugger Robot
7ae76a2f3f Merge "Add feature flag for app hibernation." 2021-01-14 00:01:19 +00:00
Benedict Wong
c8387d8128 Merge changes I915e0c4e,Iae187c0b 
* changes:
  Add utility methods for creation of NetInfo, NetCaps, and LinkProps
  Add VcnGatewayConnection state skeleton, signals and fields
 2021-01-13 23:45:17 +00:00
Nikita Ioffe
9aee90e7b1 Add more owners for tests/StagedInstallTest 
Test: n/a
Change-Id: I841bb165b4ebd2c06cc2f958dbc55a29404554c9
 2021-01-13 23:16:27 +00:00
Todd Kennedy
cceb8b5a97 Merge "add new owners for IntentFilter and Intent" am: c9e61a5c83 am: 5fcf36eefe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b89d19806bd96e3af6f8b93cb23db6faa641634
 2021-01-13 20:47:21 +00:00
Sudheer Shanka
ed31406794 Merge "Update language to comply with Android’s inclusive language guidance." am: 5eb8de6ed7 am: d8d2a05841 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5470cd0ec05cec7f43d1582876e2c6bde79acc66
 2021-01-13 20:47:11 +00:00
Sudheer Shanka
976b9f84a0 Merge "Update language to comply with Android’s inclusive language guidance." am: 569a4f746e am: 7e2c5975c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545585

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25ef621f757b9a838efc118bf4034ce429c5a6b2
 2021-01-13 20:47:00 +00:00
Alison Cichowlas
b700143d3f Additional SysUI leads in OWNERS for resources in frameworks/base/core. 
Change-Id: I496937c15b253255b258ecb5894778d2eefe2970
 2021-01-13 20:43:17 +00:00
Todd Kennedy
5fcf36eefe Merge "add new owners for IntentFilter and Intent" am: c9e61a5c83 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd029726f8465829b567baafde25c573e53a97c8
 2021-01-13 20:24:35 +00:00
Sudheer Shanka
d8d2a05841 Merge "Update language to comply with Android’s inclusive language guidance." am: 5eb8de6ed7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95e287032463bd149e484d7ce9109ced17ecefae
 2021-01-13 20:20:41 +00:00
Sudheer Shanka
7e2c5975c5 Merge "Update language to comply with Android’s inclusive language guidance." am: 569a4f746e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545585

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bd17f611f77464cc2567ee431e9309fdf12a6d2
 2021-01-13 20:16:27 +00:00
Todd Kennedy
c9e61a5c83 Merge "add new owners for IntentFilter and Intent" 2021-01-13 19:47:10 +00:00
Sudheer Shanka
5eb8de6ed7 Merge "Update language to comply with Android’s inclusive language guidance." 2021-01-13 19:44:53 +00:00
Sudheer Shanka
569a4f746e Merge "Update language to comply with Android’s inclusive language guidance." 2021-01-13 19:19:54 +00:00
Treehugger Robot
a9a80c7e7e Merge "AbsSeekBarTest: Fix dpToPixel computation" am: 72df4073ea am: f26a5b003b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie869880da1c9eb8d05fb179da946c7e29814340b
 2021-01-13 18:52:55 +00:00
satayev
226d233fb0 Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" am: 805f4d7c22 am: f323a0f2f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0fd366c8ae249072d32fafc6d70e4dc995ad7ae
 2021-01-13 18:52:27 +00:00
Treehugger Robot
f26a5b003b Merge "AbsSeekBarTest: Fix dpToPixel computation" am: 72df4073ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I002fd76c123dd52f9aa3a975d49a2b21529c1879
 2021-01-13 18:35:15 +00:00