Chiachang Wang
e1874186ba
Merge "Update jni to get int descriptor in native layer" am: 1bd8cd59a5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553967
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd8dbb868577eb071f950c7e9afb25b929e9441c
2021-01-27 03:10:44 +00:00
Benedict Wong
278b748966
Merge "Prep VCN files for exposing APIs" am: f0aa57318d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554718
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e2313b1c5a19f0bb218a15f6708f23288434a5b
2021-01-27 02:48:55 +00:00
Treehugger Robot
d16fff5b00
Merge changes I8fffd952,Ief6690bb am: b4203793bf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550435
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7a3d4db0692b9266992386916bbae57b360e703f
2021-01-27 02:45:39 +00:00
Chiachang Wang
1bd8cd59a5
Merge "Update jni to get int descriptor in native layer"
2021-01-27 02:44:29 +00:00
Chiachang Wang
db2cec6024
Update jni to get int descriptor in native layer
...
ConnectivityService is going to become a mainline module which
can not access the hidden APIs. The int descriptor of a
FileDescriptor is hidden for internal use only. The Network and
NetworkUtls will be parts of CS module. The corresponding usage
should be removed. There is no way in a module to access the
descriptor, so update the jni to set a FileDescriptor to native
to get the int descriptor inside the platform.
Also, update the other references in android_net_NetUtils for
getting fd to use the NDK functions in the libnativehelper.
Bug: 170598012
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Test: manually connect to a VPN
Change-Id: I2143c079feac53917a6e7bf7422f3180f51437fb
2021-01-27 02:44:14 +00:00
Benedict Wong
f0aa57318d
Merge "Prep VCN files for exposing APIs"
2021-01-27 02:34:09 +00:00
Treehugger Robot
b4203793bf
Merge changes I8fffd952,Ief6690bb
...
* changes:
Add shell commands for app hibernation service
Add basic hibernation state management
2021-01-27 01:36:43 +00:00
Paul Hu
d8d1d3e2b3
Merge "Fix FrameworksNetIntegrationTests failure" am: 5d496eb9b3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559105
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e43ec9f2061e4a67c5d78a3cab331ed8b13b991
2021-01-27 00:38:32 +00:00
Paul Hu
57084714d4
Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: 742ec924e8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bd4c977d13d2328cab480ca27c59de6fc4856a6
2021-01-27 00:33:36 +00:00
Paul Hu
5d496eb9b3
Merge "Fix FrameworksNetIntegrationTests failure"
2021-01-27 00:04:09 +00:00
Paul Hu
742ec924e8
Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()""
2021-01-27 00:04:09 +00:00
Treehugger Robot
050882545c
Merge "Keystore 2 SPI: Fix KeyStorePublicKey getEncoded()." am: 9e5385798e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559984
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0facd7c3f068f3923887b0484442e09712ef360
2021-01-27 00:01:48 +00:00
Josh Gao
81830b2d5f
Merge "Thread.sleep takes milliseconds, not seconds." am: b79bd2867f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560108
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a3d67346b44782a6afc61c062336adeb39ff06e
2021-01-26 23:51:26 +00:00
Treehugger Robot
9e5385798e
Merge "Keystore 2 SPI: Fix KeyStorePublicKey getEncoded()."
2021-01-26 23:45:52 +00:00
Josh Gao
b79bd2867f
Merge "Thread.sleep takes milliseconds, not seconds."
2021-01-26 23:36:05 +00:00
Benedict Wong
44192ee464
Prep VCN files for exposing APIs
...
Add @hide to methods to clearly show what is being exposed and cleanup
some visibilty/final modifiers.
Bug: 168833866
Test: atest FrameworksVcnTests
Test: atest android.net.vcn
Change-Id: I8e03133053b59fd5b8df640e4b22761f572f9548
2021-01-26 15:28:24 -08:00
Hall Liu
a083efc121
Merge "Correct name of roaming RTT config" am: b6622aeeb6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560151
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If7ee0d6cab7fe781a05de2a87a86cf716d6e6a76
2021-01-26 23:03:50 +00:00
Treehugger Robot
d131f3737d
Merge "Add app hibernation service stubs" am: d7bac025fb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1544924
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1845d739853aede368ff130d54c88925ea545f50
2021-01-26 22:56:14 +00:00
Treehugger Robot
371eea87de
Merge "Add enforcement parameter to RequiresFeature" am: dd438b73cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560535
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1dd3455a808aa2373270295ffbd9a01f1b4a1845
2021-01-26 22:27:56 +00:00
Hall Liu
b6622aeeb6
Merge "Correct name of roaming RTT config"
2021-01-26 22:26:56 +00:00
Treehugger Robot
d7bac025fb
Merge "Add app hibernation service stubs"
2021-01-26 22:23:13 +00:00
Treehugger Robot
dd438b73cc
Merge "Add enforcement parameter to RequiresFeature"
2021-01-26 22:03:53 +00:00
Treehugger Robot
c0f1148dc6
Merge "Set OWNERS for core/java/android/app/VoiceInteractor" am: ad1dde5594
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557029
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7555bf00689b0cce6f5017492118c7ac935b70cb
2021-01-26 20:47:31 +00:00
Treehugger Robot
ad1dde5594
Merge "Set OWNERS for core/java/android/app/VoiceInteractor"
2021-01-26 20:24:04 +00:00
Daniel Bright
109454a1f9
Add enforcement parameter to RequiresFeature
...
* Allows for a broader range of enforcement checks
* Designed to match androix so that it can be easily slotted into
Android Studio lint checks
Test: Built
Bug: 173735303
Change-Id: Ia4cc8be8fdccbdeeecee956e4ccf02bda6d91845
Merged-In: Ia4cc8be8fdccbdeeecee956e4ccf02bda6d91845
2021-01-26 12:20:32 -08:00
Treehugger Robot
e1c8e59876
Merge "Add visibility for new location of permission apex." am: 3525be2175
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560528
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7f2084f37e592c774325d4c7290ec99195505cb2
2021-01-26 19:53:31 +00:00
Treehugger Robot
3525be2175
Merge "Add visibility for new location of permission apex."
2021-01-26 19:13:05 +00:00
Hall Liu
7a18070979
Correct name of roaming RTT config
...
Add _bool to the end
Bug: 168676696
Test: manual
Change-Id: Ifa14d742d40a585ecc1e041088f49aa5d13df07b
2021-01-26 10:51:11 -08:00
Treehugger Robot
7a2d9d0613
Merge "Add toddke to owners for system server" am: 4ddafbf58f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559283
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I03bb6588b7b5a9fdb93f7bdc2db50ef25cf96eea
2021-01-26 18:42:15 +00:00
Treehugger Robot
4ddafbf58f
Merge "Add toddke to owners for system server"
2021-01-26 18:11:44 +00:00
Treehugger Robot
a2e9b7cd63
Merge "CEC : Add test to check ARC status" am: 2338a4df6b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a3815df5eb8154d947e6a2ef1a1072e6dee4c75
2021-01-26 16:40:05 +00:00
Todd Kennedy
b285d2ff2c
Add toddke to owners for system server
...
Change-Id: I16251c6d90d676b3baf8163b53f584c7134697dc
2021-01-26 16:36:18 +00:00
Janis Danisevskis
a7303378bc
Keystore 2 SPI: Fix KeyStorePublicKey getEncoded().
...
AndroidKeyStorePublicKey now returns the encoded key instead of the
encoded certificate.
Test: Keystore CTS tests.
Bug: 178456047
Change-Id: I2c9b44bd13c702545b33ed0fb4c7e802c13851f6
2021-01-26 08:14:00 -08:00
Treehugger Robot
2338a4df6b
Merge "CEC : Add test to check ARC status"
2021-01-26 16:02:37 +00:00
Treehugger Robot
81ff12d6c1
Merge "Change order of owners." am: 0d72e983ce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556131
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I982967d4c4c9e3ad94558dd0df76ed626352d489
2021-01-26 15:45:48 +00:00
David Zeuthen
6252f82f61
Merge "Identity Credential: API changes for Android 12" am: 40d6635701
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1464362
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iefd4c9ff03bcb208c0817f144aabec19b887708f
2021-01-26 15:40:03 +00:00
Treehugger Robot
0d72e983ce
Merge "Change order of owners."
2021-01-26 15:16:45 +00:00
David Zeuthen
40d6635701
Merge "Identity Credential: API changes for Android 12"
2021-01-26 14:50:27 +00:00
Baligh Uddin
d4a52c97ee
Add visibility for new location of permission apex.
...
This is prep. work for f/b/apex/permission migraton to
packages/modules/Permission. The Build System does not
enforce location checks within visibility, which allows
us to add the new location post migration and ensure
migration process does not run into visibility related errors.
BUG: 167963264
Test: TH
Change-Id: I765b73bb8e0f377ef03805423807e720f1e90582
2021-01-26 13:50:56 +00:00
Treehugger Robot
d8b7ab2076
Merge changes I713bc2ec,Ib9ab07c9 am: 3795a7d1d2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I27116d11a4a61c2ca76f687d8d47a4a973ae1e77
2021-01-26 13:49:20 +00:00
Corina
911c2e8bed
Change order of owners.
...
Some tools use the first owner as default assignee for automatically
file bugs.
Bug: no
Test: no
Change-Id: Iad216857e9b8de705a4a0c4f09389a0efe7aca18
2021-01-26 13:31:56 +00:00
Treehugger Robot
3795a7d1d2
Merge changes I713bc2ec,Ib9ab07c9
...
* changes:
[FUI05] Remove wimax data usage unit test
[FUI14] Get SSID from NetworkCapabilities
2021-01-26 13:13:24 +00:00
Andrei-Valentin Onea
8fabad25ca
Merge "Improve flakiness of PlatformCompatGating test" am: d500b8afd6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9dfe826f3686ea3173a3dd300b2c837b4dd736ec
2021-01-26 13:11:54 +00:00
Andrei-Valentin Onea
d500b8afd6
Merge "Improve flakiness of PlatformCompatGating test"
2021-01-26 12:36:58 +00:00
Yo Chiang
5d4aa4a1de
Merge "Fix dynsystem.BootCompletedReceiver" am: cc0ece4108
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555905
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I115a4e9788c57161185087cf4a9fcd0021704a72
2021-01-26 11:38:21 +00:00
Yo Chiang
3048afdb0a
Merge "Remove feature flag "settings_dynamic_system"" am: 7b84f49b41
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541210
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icd0dff843d550fefd50a5b71d198be52ced7669f
2021-01-26 11:34:53 +00:00
Yo Chiang
cc0ece4108
Merge "Fix dynsystem.BootCompletedReceiver"
2021-01-26 10:58:02 +00:00
Yo Chiang
7b84f49b41
Merge "Remove feature flag "settings_dynamic_system""
2021-01-26 10:53:54 +00:00
Benedict Wong
bf0a284f4e
Merge "Remove usage of NetworkInfo" am: bd65203feb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559684
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I79f4091d937dd9a223df89752600319c2c307459
2021-01-26 07:32:48 +00:00
Benedict Wong
bd65203feb
Merge "Remove usage of NetworkInfo"
2021-01-26 06:49:32 +00:00