Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
560,161 Commits 3 Branches 0 Tags
2de006fded94e501c19589b0a523b2557df7091c
Commit Graph

560161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
satayev
f323a0f2f0 Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" am: 805f4d7c22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03dade86df57e4728eea88ab9b148251a1097c85
 2021-01-13 18:32:31 +00:00
Treehugger Robot
72df4073ea Merge "AbsSeekBarTest: Fix dpToPixel computation" 2021-01-13 18:28:45 +00:00
satayev
805f4d7c22 Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" 2021-01-13 17:40:03 +00:00
Mathew Inwood
e329f3b03c Move temp blocklist APIs to max-sdk-r list. 
These APIs were temporarily blocked but are now being moved to the
max-sdk-r for final release. Tag these APIs as "lo-prio" since we
believe that they are unused.

Bug: 173499988
Test: m
Change-Id: Iee7b3c2d18fb9fb93ffe3fa3fca8ac6be7604673
 2021-01-13 15:48:43 +00:00
Ryan Mitchell
547beff356 Merge changes from topic "revert-1507500-oms-transactional-api-UQLIXJBEPB" am: 2c2853d09e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548921

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1a8da0d862aca3b6944c3eab58ac82dd602b594
 2021-01-13 15:15:08 +00:00
Ryan Mitchell
2c2853d09e Merge changes from topic "revert-1507500-oms-transactional-api-UQLIXJBEPB" 
* changes:
  Revert "OverlayDeviceTests: add missing TEST_MAPPING"
  Revert "OMS: replace OMSImpl.OverlayChangeListener with return v..."
  Revert "OMS: block until settings are persisted"
 2021-01-13 15:07:48 +00:00
satayev
0e9334cb80 Revert "[VCN01] Add NOT_VCN_MANAGED capability" 
This reverts commit 85e0ad7986.

Reason for revert: b/177411288 broken test

Bug: 177411288
Bug: 175662146
Change-Id: I02a25b83e62ab9a2ed22a98530d62b08de73f56e
 2021-01-13 15:04:23 +00:00
Jeff DeCew
b3deb44a56 Merge "Apply scrollable to app pinning text area" am: 7f3a7daaf5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537210

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa70f235fc1cadd5cb4441de61d4b03f645b6504
 2021-01-13 15:01:33 +00:00
Alison Cichowlas
62572cf783 Merge "Add test OWNERS referencing src owners." am: b189d811e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543316

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d3b199f395dd7e14543043ac5665800f35e8157
 2021-01-13 14:59:34 +00:00
Lorenzo Colitti
be0a5157a4 Merge "Stop using VPNs in getActiveNetworkForUidInternal." am: d25da5eb90 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529106

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e0de3f3cd9762feecf5dda5a40bb50791f17654
 2021-01-13 14:54:40 +00:00
Jeff DeCew
7f3a7daaf5 Merge "Apply scrollable to app pinning text area" 2021-01-13 14:38:23 +00:00
Alison Cichowlas
b189d811e9 Merge "Add test OWNERS referencing src owners." 2021-01-13 14:33:31 +00:00
Lorenzo Colitti
d25da5eb90 Merge "Stop using VPNs in getActiveNetworkForUidInternal." 2021-01-13 13:52:56 +00:00
Junyu Lai
075f097e82 Merge "Align coding style of line-wrapping in NetworkCapabilities" am: 357893095f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e1146c6e374a0e7b31d8a8615545f4486fcd4ba
 2021-01-13 11:32:40 +00:00
Junyu Lai
357893095f Merge "Align coding style of line-wrapping in NetworkCapabilities" 2021-01-13 10:40:43 +00:00
Mathew Inwood
9e27f89092 Merge "Derestrict some non-SDK APIs." am: 29bf6e8443 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a073e1413b1e7bd62be3a865230d19db81b4726
 2021-01-13 09:45:50 +00:00