Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
566,008 Commits 3 Branches 0 Tags
9f8fd4040714ab5cf806e15f66336b996f2c7425
Commit Graph

566008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
9f8fd40407 Merge changes from topic "bluetooth_oob_api" am: 55fe87b2f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640633

Change-Id: I1881ca6a693ec27e78e3f781d87858f27858efbc
 2021-03-19 21:44:45 +00:00
Martin Brabham
b4f9ff1810 Bluetooth: Modify and append to the Out-of-Band API am: 96e6e4a0b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556758

Change-Id: I25e393b48f0598834196c970be4d29f20216af97
 2021-03-19 21:37:27 +00:00
Christian Wailes
4f5e3b92f7 Merge "Update OWNERS file" am: d6c3dfb3ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640627

Change-Id: Ibfb0fa8b55f2a5bdb7d732287d246729bdd3b576
 2021-03-19 21:32:14 +00:00
Treehugger Robot
55fe87b2f6 Merge changes from topic "bluetooth_oob_api" 
* changes:
  Fix CTS Failure
  Bluetooth: Modify and append to the Out-of-Band API
 2021-03-19 21:13:18 +00:00
Christian Wailes
d6c3dfb3ff Merge "Update OWNERS file" 2021-03-19 20:59:11 +00:00
Jeff Sharkey
32e4b44b47 Merge "OWNERS for a few Voice Interaction files." am: d702544c9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643650

Change-Id: Ic7929a7dea98f94a3e3d4082eeace63d6c6fe714
 2021-03-19 19:56:11 +00:00
Jeff Sharkey
d702544c9f Merge "OWNERS for a few Voice Interaction files." 2021-03-19 19:21:48 +00:00
Shuzhen Wang
f1f504042a Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I537e8fab411b8134cf43d71790ebe62d238a71b6
 2021-03-19 18:58:14 +00:00
Shuzhen Wang
171249e857 Merge "Camera: Fix a removal-while-iterate bug" 2021-03-19 18:34:00 +00:00
Yan Wang
4f17d64ff8 Merge "Remove the reading of APK file." am: 08d5380762 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646327

Change-Id: Ie918cc22711f4ccc03e0619868f303e4be0d25d1
 2021-03-19 17:27:58 +00:00
Treehugger Robot
3df03a83af Merge "Fix InetAddressCompat exception handling" am: cd37173df6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645300

Change-Id: I1d65d6b011e5ce585835e1c9df9eea0afb74b0f4
 2021-03-19 17:21:29 +00:00
Yan Wang
08d5380762 Merge "Remove the reading of APK file." 2021-03-19 16:55:54 +00:00
Treehugger Robot
cd37173df6 Merge "Fix InetAddressCompat exception handling" 2021-03-19 16:38:54 +00:00
Treehugger Robot
1941a16671 Merge "Keystore 2.0: Enable by default." am: a5e337b0b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640622

Change-Id: I89221d632a20d176b2aa358ce7b7a3749c85661d
 2021-03-19 16:25:27 +00:00
Treehugger Robot
a5e337b0b3 Merge "Keystore 2.0: Enable by default." 2021-03-19 16:06:00 +00:00
Remi NGUYEN VAN
9767b681e3 Fix InetAddressCompat exception handling 
Fix InetAddressCompat exception handling to throw the original exception
in case of InvocationTargetException, rather than wrapping in a generic
IllegalStateException.

Bug: 183198868
Test: Test device with and without connectivity
Change-Id: Idc4d678afe9f20f920d7061790af4203ab75be26
 2021-03-19 23:56:27 +09:00
SongFerng Wang
74de537b56 Merge "Implementation of "Enable 2G" for Settings." am: 3ccc2738e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641783

Change-Id: Iece18c00a337bcadcb82c7239ea6575ad158048c
 2021-03-19 13:46:27 +00:00
SongFerng Wang
3ccc2738e2 Merge "Implementation of "Enable 2G" for Settings." 2021-03-19 13:09:55 +00:00
Treehugger Robot
80ff97c8a5 Merge "Reset min_sdk_version of libmedia_jni" am: 0afaa9d9f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640145

Change-Id: Ifaf9cf35a6a675b1d13e958d4476c8d07eb35029
 2021-03-19 12:12:41 +00:00
Chiachang Wang
1cd0e8f0fc Merge "Add startCaptivePortalApp to system API" am: b53aeb4682 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639899

Change-Id: I2efbc3276ccce8df4d77c06dc2d50bd4d2bed9b5
 2021-03-19 11:59:16 +00:00
Treehugger Robot
4247c39cd5 Merge changes I18d2ccea,I4e80a75d,Ib8ea2a17,Iaba678ed am: 79d2054b14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645296

Change-Id: I065412121b0282de2d3f09a72b13249d07359557
 2021-03-19 11:56:21 +00:00
junyulai
95d55e71af Remove reference of NetworkAgent#unwanted() am: 705370a231 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645295

Change-Id: I8cd0f3ccebb2f6a81582700c3a2d5a844bfe590f
 2021-03-19 11:53:15 +00:00
junyulai
ddc41d43c7 Remove references of NetworkAgentConfig constructor am: a1a61cde9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645294

Change-Id: Ie21e01a3a60947f9a91e1d157c8ee00598146222
 2021-03-19 11:51:07 +00:00
junyulai
1dd354e2d7 Remove reference of @ValidationStatus annotation am: 557797e32c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645293

Change-Id: I7e87fbb4d78f56c63614f9b1aaf49940f47df64e
 2021-03-19 11:49:00 +00:00
Treehugger Robot
0afaa9d9f6 Merge "Reset min_sdk_version of libmedia_jni" 2021-03-19 11:41:03 +00:00
Chiachang Wang
b53aeb4682 Merge "Add startCaptivePortalApp to system API" 2021-03-19 11:30:20 +00:00
Treehugger Robot
79d2054b14 Merge changes I18d2ccea,I4e80a75d,Ib8ea2a17,Iaba678ed 
* changes:
  Remove hidden API usage of RouteInfo
  Remove reference of NetworkAgent#unwanted()
  Remove references of NetworkAgentConfig constructor
  Remove reference of @ValidationStatus annotation
 2021-03-19 11:23:18 +00:00
Chalard Jean
33bed02738 Merge "[NS03] Mix in other CS-managed properties" am: e07e3856da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101

Change-Id: I7b904af6c34190f53378cc1acc518840b527d434
 2021-03-19 10:52:23 +00:00
Lucas Lin
beea63a64f Merge "Expose getCapabilities" am: 46e3f1822d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641919

Change-Id: Ie524f7538aa7a7048c55097c0995d8c6194dc682
 2021-03-19 10:49:12 +00:00
Treehugger Robot
10f14e41be [automerger skipped] Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" am: 66794f915f -s ours 
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 7dc302d612 is already in history

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

Change-Id: I19a6e876187a5cf64a00c3f2dac15c8bec8f2911
 2021-03-19 10:46:12 +00:00
Chalard Jean
e07e3856da Merge "[NS03] Mix in other CS-managed properties" 2021-03-19 10:32:46 +00:00
Lucas Lin
46e3f1822d Merge "Expose getCapabilities" 2021-03-19 10:24:25 +00:00
Treehugger Robot
66794f915f Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" 2021-03-19 10:12:15 +00:00
Zoey Chen
51f11f9b0b Merge "[Telephony] Return if context is null when register TelephonyCallback" am: a805d39229 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644386

Change-Id: I3290feb8ffea6f18240995c6d96c3893e2fa4b51
 2021-03-19 09:59:22 +00:00
Zoey Chen
a805d39229 Merge "[Telephony] Return if context is null when register TelephonyCallback" 2021-03-19 09:28:41 +00:00
Yo Chiang
d68724597d Merge "Keystore 2.0: Fix infinit recursion." am: 544f3d5211 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645913

Change-Id: I647135ccc2f45b50e828dbd4e0f1f2cfea1cef00
 2021-03-19 08:31:03 +00:00
Chiachang Wang
dd535a61fc Merge "Send a Network instead of network id for wifi no internet dialog" am: 8ce1fa2313 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644766

Change-Id: I676152104fafb5c4e1b93f0e39fa39e43dd6891c
 2021-03-19 08:27:56 +00:00
Aaron Huang
6ddd31dc3a Merge "Remove hidden API usage from ProxyTracker" am: 3f4d2a6f67 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646966

Change-Id: I2d609875a3a31586626a82dddbfcb015bf5ca0bf
 2021-03-19 08:27:14 +00:00
Lorenzo Colitti
3559535c50 Merge "Ensure all calls to getCallingUid use the version in mDeps." am: d610e43383 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635320

Change-Id: I6719b51b78ace57bc36f4dba738c0c420947a8bf
 2021-03-19 08:24:59 +00:00
Yo Chiang
544f3d5211 Merge "Keystore 2.0: Fix infinit recursion." 2021-03-19 08:10:39 +00:00
Janis Danisevskis
8758b2ceaf Keystore 2.0: Fix infinit recursion. 
Fix endless recursion when Cipher is initialized with
AndroidKeyStorePrivateKey.

Fixes: 183167349
Test: atest android.keystore.cts.AndroidKeyStoreTest#testKeyStore_Encrypting_RSA_NONE_NOPADDING
Change-Id: I5b4166fb1a4e298072f7156ba61a64966e86dc53
 2021-03-19 08:09:34 +00:00
Chiachang Wang
8ce1fa2313 Merge "Send a Network instead of network id for wifi no internet dialog" 2021-03-19 07:54:24 +00:00
Aaron Huang
3f4d2a6f67 Merge "Remove hidden API usage from ProxyTracker" 2021-03-19 07:50:27 +00:00
junyulai
bcb58a9757 Remove hidden API usage of RouteInfo 
For callers who use hidden constructor of RouteInfo, replace
them with public constructor.

Test: TH
Bug: 182963397
Merged-In: I18d2cceafad633a95bd909b7f693d45e8a861bc9
Change-Id: I18d2cceafad633a95bd909b7f693d45e8a861bc9
  (cherry-picked from ag/13925164)
 2021-03-19 15:49:38 +08:00
junyulai
705370a231 Remove reference of NetworkAgent#unwanted() 
This is hidden, use onNetworkUnwanted instead.

Test: TH
Bug: 182963397
Merged-In: I4e80a75d25cfd9ffc07aa219fff5a2604eb307f2
Change-Id: I4e80a75d25cfd9ffc07aa219fff5a2604eb307f2
  (cherry-picked from ag/13925163)
 2021-03-19 15:48:25 +08:00
junyulai
a1a61cde9c Remove references of NetworkAgentConfig constructor 
This is hidden, use public Builder instead.

Test: TH
Bug: 182963397
Merged-In: Ib8ea2a17276cfd000e7003fc86d15458e1f82b39
Change-Id: Ib8ea2a17276cfd000e7003fc86d15458e1f82b39
  (cherry-picked from ag/13925162)
 2021-03-19 15:47:24 +08:00
junyulai
557797e32c Remove reference of @ValidationStatus annotation 
This is hidden and no longer accessible after ConnectivityService
becomes mainline module.

Test: TH
Bug: 182963397
Merged-In: Iaba678ed3af92f87cfeccaacf1cc5723c8e5dcae
Change-Id: Iaba678ed3af92f87cfeccaacf1cc5723c8e5dcae
  (cherry-picked from ag/13925161)
 2021-03-19 15:45:57 +08:00
Lorenzo Colitti
d610e43383 Merge "Ensure all calls to getCallingUid use the version in mDeps." 2021-03-19 07:36:52 +00:00
Chalard Jean
4b7c64df40 Merge "Use the NetworkScore API in VPN" am: f88102ce0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645286

Change-Id: Ia7f2be585911611b3d0a807369a5ad1c3fe072a9
 2021-03-19 06:19:35 +00:00
Chalard Jean
f88102ce0e Merge "Use the NetworkScore API in VPN" 2021-03-19 06:16:37 +00:00