Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
564,621 Commits 3 Branches 0 Tags
be473bf819b8570945b0d238beaaa2fa63e60c02
Commit Graph

564621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
be473bf819 Merge ab/7061308 into stage. 
Bug: 180401296
Merged-In: I4bf82035631ccff6d5a6144d6d9b1d203b076851
Change-Id: I1b5f3a672a55eaabba0f5389bab110b395553559
 2021-02-21 09:39:53 -08:00
James Mattis
6cc86364fb Merge "Using defensive copy for default request remove" am: 1444e3eea1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f49286ef328f95212fec94a5d747aa2936a88ef
 2021-02-21 05:15:14 +00:00
James Mattis
1444e3eea1 Merge "Using defensive copy for default request remove" 2021-02-21 04:28:13 +00:00
James Mattis
ff5fb79411 Using defensive copy for default request remove 
Passing in a defensive copy for the default requests in
ConnectivityService prior to updating that collection so as to not have
issues when removing elements as part of the per-app preference update
flow.

Bug: 176494815
Bug: 178632672
Test: atest FrameworksNetTests
atest FrameworksNetTests:com.android.server
.ConnectivityServiceTest#testSetOemNetworkPreference
ClearPreviousOemValues --iterations

Change-Id: Ia683d5035dda2be35fd2f2b7ee038e806caab6f9
 2021-02-20 15:51:24 -08:00
James Mattis
762fabc387 Merge "Unit test automation for Multilayer Evaluation" am: c1115803bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I888bc951d1e54d4773f06fa9b61eefe815eb5462
 2021-02-20 22:10:34 +00:00
Treehugger Robot
fe60537082 Merge "Keystore 2.0: Revisite Authorization.java" am: 08bf2e8f49 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I152776851eaed8754e4ea6033d5606da99e4ae1a
 2021-02-20 22:07:27 +00:00
James Mattis
c1115803bc Merge "Unit test automation for Multilayer Evaluation" 2021-02-20 21:23:45 +00:00
Treehugger Robot
08bf2e8f49 Merge "Keystore 2.0: Revisite Authorization.java" 2021-02-20 19:26:58 +00:00
Junyu Lai
f5fbe10aa7 Merge "[FUI15] Remove networkId in NetworkState" am: 3237216211 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9243f1cc94c73e3312f3a85fa34d3499bc92accd
 2021-02-20 15:51:56 +00:00
Junyu Lai
3237216211 Merge "[FUI15] Remove networkId in NetworkState" 2021-02-20 14:00:19 +00:00
Treehugger Robot
7fa15840a8 Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." am: bfc1f6b382 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578423

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2551fe11fa77c342264a199b9509c6f1551ece9
 2021-02-20 08:35:27 +00:00
Treehugger Robot
bfc1f6b382 Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." 2021-02-20 06:57:04 +00:00
Chiachang Wang
7fcc3efb9c Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771 am: 63bc7bd3c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573943

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20a0f2d4a59222083d1c17a7732b7fe0b8461502
 2021-02-20 03:41:04 +00:00
James Mattis
372d3e6868 Merge "Unit tests for Multi-Default with Existing APIs" am: ed4288b164 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579208

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc47b166c6ea68ef0c059edfd1a0aa93c0aa1fc3
 2021-02-20 02:04:02 +00:00
Chiachang Wang
63bc7bd3c2 Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771 
* changes:
  [IT06]Move INetworkActivityListener into connectivity module
  [IT05] Remove the unused network activity logic out from NMS
  [IT4.7] Add network activity info into dumpsys for debugging
  [IT4.6] Unbundle NMS out from ConnectivityManager
  [IT4.5] Update radio power from CS directly
 2021-02-20 02:02:46 +00:00
James Mattis
a917e5a283 Unit test automation for Multilayer Evaluation 
Unit test automation for multilayer network hierarchy evaluation
when using the setOemNetworkPreference() API ConnectivityService.

Bug: 178632672
Bug: 176494815
Bug: 170068946
Test: atest FrameworksNetTests
Change-Id: Ia9b76f49a07eff6a3977faaa41fc67a10f307841
 2021-02-19 17:41:01 -08:00
James Mattis
ed4288b164 Merge "Unit tests for Multi-Default with Existing APIs" 2021-02-20 01:38:52 +00:00
Hasini Gunasinghe
13dd61336f Integrate IKeystoreUserManager aidl with LockSettingsService. 
This CL introduces the client side for IKeystoreUserManager aidl and
integrates it with the LockSettingsService.

Bug: 171305115
Test: TBD
Change-Id: I7560e98f95aaec6b85cdcfc01ba83aea0ccc52ae
 2021-02-19 15:34:10 -08:00
Janis Danisevskis
377370cce8 Keystore 2.0: Revisite Authorization.java 
Test: N/A
Change-Id: I4da26175741c5313aec17d30a3e534a2172d87b4
 2021-02-19 15:31:15 -08:00
Makoto Onuki
1c691ff753 Merge "Add a missing NULL check for postActivityStartTokenRemoval()" am: 5fea1d9a01 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593831

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8860761993c9a4b9ebb45c8d3f54d58b205926e4
 2021-02-19 22:34:46 +00:00
Makoto Onuki
5fea1d9a01 Merge "Add a missing NULL check for postActivityStartTokenRemoval()" 2021-02-19 21:08:30 +00:00
Jeff Sharkey
43ae72c0f2 Merge "Add OWNERS for palette library" am: 2a1600625c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c2c1e14f8190bf5dcec235a945657190ea55979
 2021-02-19 18:57:27 +00:00
Anthony Stange
16d6248bc6 Merge "Add owners for files related to the sensors framework" am: 5927064796 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5304037bbbd87f7e0bd7d0b2c337239ac782725
 2021-02-19 18:20:56 +00:00
Jeff Sharkey
2a1600625c Merge "Add OWNERS for palette library" 2021-02-19 18:07:34 +00:00
James O'Leary
2964b50d79 Add OWNERS for palette library 
- dupin@ landed the folder & code in it originally
- good idea to move review off the plates of generic frameworks/base
OWNERS

Change-Id: I03a1e8ec00d5b658ee026a44038703e5b31ca52e
 2021-02-19 18:04:06 +00:00
Anthony Stange
5927064796 Merge "Add owners for files related to the sensors framework" 2021-02-19 17:23:45 +00:00
Nataniel Borges
d88a8d2036 Merge "Revert "Delete VPN methods in ConnectivityManager."" am: 7096deadf4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596592

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3572428c0044d410055a53f4bff680c2dd474028
 2021-02-19 16:12:03 +00:00
Lorenzo Colitti
7e292e7920 Merge "Delete VPN methods in ConnectivityManager." am: e8817c1796 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1594171

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b2968f3b0c6ed9d693f56c4f4697f410c706085
 2021-02-19 16:06:51 +00:00
Nataniel Borges
7096deadf4 Merge "Revert "Delete VPN methods in ConnectivityManager."" 2021-02-19 15:32:46 +00:00
Nataniel Borges
51bf8e979e Revert "Delete VPN methods in ConnectivityManager." 
This reverts commit 279b79f062.

Bug: 180710918
Reason for revert: Broken build 

Change-Id: I6e6318b4c01ccab27ca3e9f16bb2194aa1d9ffd2
 2021-02-19 15:25:33 +00:00
Lorenzo Colitti
e8817c1796 Merge "Delete VPN methods in ConnectivityManager." 2021-02-19 14:56:04 +00:00
Lorenzo Colitti
a3bb15cb68 Merge changes I0e6df469,I3d46d5f7 am: b9c396b87a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I13daedf40a5b0569b78ace23f36ab971c45bc690
 2021-02-19 09:10:19 +00:00
Treehugger Robot
d083daabf1 Merge "Stop using ConnectivityManager for VPNs in DPMS." am: 6ec31401b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1594172

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib00a87fe258f34f17d115fffa1e00217f0f4bed0
 2021-02-19 09:05:22 +00:00
Lorenzo Colitti
279b79f062 Delete VPN methods in ConnectivityManager. 
1. Stop using ConnectivityManager for VPNs in VpnDialogs.
2. Delete updateLockdownVpn, since all callers have been migrated
   to calling VpnManager directly.
3. Delete the call to VpnManager in factoryReset, since the only
   caller (ResetNetworkConfirm) has been updated to call into
   VpnManager directly.
4. Delete getVpnManager, since it is now unused.

Test: m
Bug: 173331190
Change-Id: I5d071281c0e36f6523fea10671a9abf994c66d66
 2021-02-19 17:34:30 +09:00
Lorenzo Colitti
d5333b7255 Merge "Fix all Log.wtfs in FrameworksNetTests." am: 6c77e14663 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591458

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iedc95830b855eb2da7a5e9b9f7da2fea07a88962
 2021-02-19 08:28:14 +00:00
Lorenzo Colitti
b9c396b87a Merge changes I0e6df469,I3d46d5f7 
* changes:
  Fix testMobileDataAlwaysOn flakiness
  Speed up NetworkFactory tests.
 2021-02-19 08:13:38 +00:00
Treehugger Robot
6ec31401b4 Merge "Stop using ConnectivityManager for VPNs in DPMS." 2021-02-19 08:09:56 +00:00
Lorenzo Colitti
6c77e14663 Merge "Fix all Log.wtfs in FrameworksNetTests." 2021-02-19 07:49:27 +00:00
Treehugger Robot
b70ef11f73 Merge "Use formal API for ActivityThread to set proxy" am: 394170f9cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I917bf20c932395ac07089059e1c46fe46de4d1f4
 2021-02-19 06:47:31 +00:00
Josh Gao
bfe2b8f496 Merge "NativeTombstoneManager: catch ProtoParseException." am: ecc474af3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia22a9cfdd73b1b8ad937d9561458e509aba9b23e
 2021-02-19 05:50:03 +00:00
Treehugger Robot
394170f9cc Merge "Use formal API for ActivityThread to set proxy" 2021-02-19 05:42:06 +00:00
Josh Gao
ecc474af3b Merge "NativeTombstoneManager: catch ProtoParseException." 2021-02-19 05:02:16 +00:00
Remi NGUYEN VAN
72887073f2 Use formal API for ActivityThread to set proxy 
Add setHttpProxyConfiguration to the public API, and use
ConnectivityManager APIs from ActivityThread (instead of hidden APIs) to
get/set the proxy for an app process.

The default proxy is now initialized with getDefaultProxy instead of
getProxyForNetwork(null); this should not make a difference, as nothing
should have called bindProcessToNetwork at that point yet.

Bug: 174436414
Test: m; device boots
Merged-In: Ifb516194ecde1567cea4b6806946091cdcf2f015

Change-Id: I06b797eeae54609aecdc0afe1df4e6c602a17a69
 2021-02-19 13:53:56 +09:00
Remi NGUYEN VAN
2971a5e8ba Merge "Split parcelable .aidl files to aidl-export" am: 09bbad130d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35bcfe8b6861b1fbf7eb7c7f43dafe84ec364634
 2021-02-19 03:46:20 +00:00
Treehugger Robot
7a278ceb40 Merge "Fix OverlayDeviceTests for un-rooted devices" am: 41663a0eb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595791

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e579f828a14909d5dba4492358d673790b2d41e
 2021-02-19 03:31:49 +00:00
Remi NGUYEN VAN
09bbad130d Merge "Split parcelable .aidl files to aidl-export" 2021-02-19 02:21:25 +00:00
Treehugger Robot
41663a0eb6 Merge "Fix OverlayDeviceTests for un-rooted devices" 2021-02-19 01:12:21 +00:00
Yan Yan
7cccd926a9 Merge "API: Expose VcnControlPlaneConfig" am: bf16b6d399 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583247

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cb2e3adc988cbdb97d771b45eda9fdecf2b6383
 2021-02-19 00:32:30 +00:00
Ryan Mitchell
de8d74fb77 Fix OverlayDeviceTests for un-rooted devices 
The AndroidText.xml needs the root preparer to run on non-rooted
devices.

Bug: 177115481
Bug: 180623619
Test: adb unroot && atest OverlayDeviceTests
Change-Id: I4377207428182fbb76c09abef248b69eeae6acf5
Merged-In: I4377207428182fbb76c09abef248b69eeae6acf5
 2021-02-18 23:56:24 +00:00
Yan Yan
bf16b6d399 Merge "API: Expose VcnControlPlaneConfig" 2021-02-18 23:00:56 +00:00