Jeff Sharkey
41b860ee63
Merge "Add OWNERS file for content tests." am: 82ac7c4eeb am: 2b047210ff am: 3e41a528f4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650090
Change-Id: Ica04999f8b95f5be9706114ce33e5f41879faaac
2021-03-23 14:02:20 +00:00
Rajeev Kumar
24c97c9f6a
Merge "Move disk reads to background" am: 6d7c90717a am: f60e5d331e am: 44b72882b0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626341
Change-Id: Id00efc69e73e0376f3508b89cad86f60c77efab0
2021-03-23 14:01:47 +00:00
Lorenzo Colitti
915460fff3
Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 892589c514 am: 3df38d48ae am: 114c3e3038
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648068
Change-Id: I6d897cdcfb5b0e4809a32312071eb77623754f94
2021-03-23 14:01:19 +00:00
Cody Kesting
a8456883f5
Merge "Cache correct calling UID for VcnStatusCallbacks." am: 7510bf5e99 am: ff05984891 am: d7c4c0cf12
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649649
Change-Id: Ifc9c9a6cbbcdc415899b3fee0ce8601e0107aab7
2021-03-23 14:00:35 +00:00
TreeHugger Robot
86364aaba9
[automerger skipped] Merge "Return copy of pending token list" into rvc-qpr-dev am: 9dce064283 am: bd99a1dc0f -s ours
...
am skip reason: skip tag Change-Id I59d159d792a3d9e2a79ea521d6f01a5cb7c65695 with SHA-1 cbe48d9496 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13806835
Change-Id: If6eb082433574015e5e61586beb79c657135a153
2021-03-23 14:00:13 +00:00
Tianjie Xu
bc8336b77f
Merge "Report more metrics in RecoverySystem" am: d880cf50a5 am: 637cd18231 am: cb8e274fea
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622203
Change-Id: Ie0aa402be5adfb8b7f15e8212e274cc53e186b57
2021-03-23 13:59:53 +00:00
Treehugger Robot
2e30dda488
[automerger skipped] Merge "Use source for keystore/keymint interfaces." am: 8d79d2824c am: 4ea150e172 am: 1dd19c4912 -s ours
...
am skip reason: skip tag Change-Id Ia7fc2403cfe6dece86ed0ab9d6f415be2a2726b8 with SHA-1 2390267db8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642744
Change-Id: Ie4ca6eba187dff70779fc0666cf680d9f95107d8
2021-03-23 13:59:11 +00:00
Treehugger Robot
05197b64d1
[automerger skipped] Merge "Fix the case where blocked reasons for dataSaver are not considered." am: 24b9401c61 am: a1a58daa43 am: 0d2e89aeba -s ours
...
am skip reason: skip tag Change-Id I3c90c3849261df4c289c398f22661f91f7cf4994 with SHA-1 49ffed5759 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648787
Change-Id: I87acc20a52e6bb1e64f19fca79d0961ae63c84db
2021-03-23 13:58:20 +00:00
Treehugger Robot
860c3a8ea3
Merge "Keystore: Fix Device ID attestation test." am: c56709a2c4 am: 738d6b3be4 am: e3409f7af4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646359
Change-Id: I7382cd13ac4cfc99f2b72b7185fa4af8152bedb9
2021-03-23 13:57:30 +00:00
SongFerng Wang
5e4093ed3f
[automerger skipped] Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: b24ba9d52f am: 2d45d999be am: 3daf8b8947 -s ours
...
am skip reason: skip tag Change-Id Ica29b8aee243168bb7719f01972075d54ff763e9 with SHA-1 c42f2697d0 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645304
Change-Id: I706f9304f2f336ae06a8cd4ecec4ac3015b5fa40
2021-03-23 13:56:48 +00:00
Aaron Huang
720ebdc401
Merge "Remove Network, NetworkRequest metrics from jobscheduler" into sc-dev
2021-03-23 13:22:32 +00:00
Jeff Sharkey
9f5392e8b7
Merge changes from topic "nearby-bluetooth-permission-group" into sc-dev
...
* changes:
Request new Bluetooth runtime permissions.
Default grants for "Nearby devices" permission.
Add BLUETOOTH_SCAN and BLUETOOTH_CONNECT app ops
Split new NEARBY_DEVICES permissions
Define new NEARBY_DEVICES permission group
2021-03-23 12:56:30 +00:00
Aaron Huang
68d118e3c6
Merge "Move deduceRestrictedCapability to libs/net and rename it" into sc-dev
2021-03-23 12:50:40 +00:00
TreeHugger Robot
d3a7d7d98d
Merge "Expose NetworkAgent constructor taking a NetworkScore parameter" into sc-dev
2021-03-23 12:45:24 +00:00
Guillaume Chelfi
4f576188b4
Merge "Add tunnel mode video peek related APIs" into sc-dev
2021-03-23 12:30:33 +00:00
Lucas Lin
6c5499ecc6
Merge "Expose NetworkScore to external caller" into sc-dev
2021-03-23 12:18:23 +00:00
Jordan Demeulenaere
56b48b176f
Merge "Do not collapse the shade when clicking the last notification." into sc-dev
2021-03-23 12:06:47 +00:00
TreeHugger Robot
da809dde02
Merge "System MR2: Add MediaRouter2#registerRouteCallback(executor, callback)" into sc-dev
2021-03-23 12:03:36 +00:00
Riddle Hsu
8b1c1ac7c1
Merge "Take snapshot when device becomes dozing and pulsing" into sc-dev
2021-03-23 11:25:49 +00:00
TreeHugger Robot
49148d762d
Merge "Move 'notifyFinishedSignal' into a separate function" into sc-dev
2021-03-23 11:18:33 +00:00
Saumya Pathak
780bb56f9b
Merge "Bind to the existing ExternalStorageService of the parent user for a clone profile." into sc-dev
2021-03-23 11:15:59 +00:00
Saumya Pathak
cbe66b17b9
Merge "Add app clone profile and APIs." into sc-dev
2021-03-23 11:15:59 +00:00
Saumya Pathak
5a4fc52fc7
Add app clone profile and APIs.
...
This change adds a new hidden user type "android.os.usertype.profile.CLONE"
and two new system APIs "isCloneProfile" and "hasSharedMedia". To support App cloning, we need to support sharing media between the owner user and the clone user. Adding this as a property in UserTypeDetails.
Bug: 182396009
Test: atest android.multiuser.cts.UserManagerTest#testCloneUser, atest com.android.server.pm.UserManagerTest#testCloneUser and manually ran shell commands on the clone user.
Change-Id: I49ddcbd499944ca9ec05ef4dc10d2e2b231d8b88
(cherry picked from commit db930667a21dac9f0de7cb2fe99175b3b4545bf4)
2021-03-23 11:15:09 +00:00
TreeHugger Robot
4df0561763
Merge "Fix cannot find removeUnwantedCapability on R device" into sc-dev
2021-03-23 11:03:43 +00:00
Frank Li
635fafcda9
Merge "[JS02]Remove hidden API usage of NetworkRequest.networkCapabilities" into sc-dev
2021-03-23 10:22:28 +00:00
Frank Li
f33a205229
Merge "[JS01]Remove hidden API usage of Connectivity Sevice" into sc-dev
2021-03-23 10:22:28 +00:00
Aaron Huang
8aeeb33803
Remove Network, NetworkRequest metrics from jobscheduler
...
These metrics are deprecated so remove them from jobscheduler.
Also remove dumpDebug method from Network, NetworkRequest and
NetworkCapabilities because there's no caller anymore.
This change also for connectivity mainline module. These
three classes are inculded in framework-connectivity so
external module cannot have dependencies on its hidden API.
With this change, the dependencies can be removed.
Bug: 178777253
Test: FrameworksNetTests
JobStoreTest
adb shell dumpsys jobscheduler --proto
CtsIncidentHostTestCases:JobSchedulerIncidentTest
Change-Id: Ie0c540303ba06b8fba029d2b98ae753afb08c963
2021-03-23 10:19:41 +00:00
Kholoud Mohamed
e7e5563e96
Merge "Properly expose LockTypes constants as systemAPIs" into sc-dev
2021-03-23 10:17:03 +00:00
Hyundo Moon
96ab01b44f
System MR2: Add MediaRouter2#registerRouteCallback(executor, callback)
...
This CL adds registerCallback(executor, callback) as @SystemApi
for system MediaRouter2.
Bug: 183453134
Test: Passed CTS
Change-Id: I50e942714946ae8af7ad69432cefcd8015040d4d
2021-03-23 09:46:54 +00:00
junyulai
ffc922fe2a
Fix cannot find removeUnwantedCapability on R device
...
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Fix: 183473863
Change-Id: Icf2cda325795acee22a6c634e8d978f64c5ac3cb
2021-03-23 17:21:34 +08:00
Remi NGUYEN VAN
17ea6fcab5
Merge "Build service-connectivity with system_server API" into sc-dev
2021-03-23 09:18:53 +00:00
Remi NGUYEN VAN
8080246d2c
Merge "Add OsCompat" into sc-dev
2021-03-23 09:17:36 +00:00
TreeHugger Robot
222a70a77e
Merge "Remove the reference of new Network(int) in Vpn.java" into sc-dev
2021-03-23 09:06:45 +00:00
TreeHugger Robot
11d5b29d7c
Merge "Introduce VibrationEffectSegment" into sc-dev
2021-03-23 08:52:21 +00:00
Chiachang Wang
ae04f625fe
Expose NetworkAgent constructor taking a NetworkScore parameter
...
Vpn constructs NetworkAgent with this exposed NetworkAgent
constructor. Given NetworkAgent is moving into the incoming
connectivity module, Vpn which is outside the module will not
be able to access it if it's not in the API surface. Thus,
expose it to allow Vpn to use it.
Bug: 182963397
Test: make update-api
Change-Id: Ic2357dcfff3233e0dd17b48b0e376a5095ef60fa
CTS-Coverage-Bug: 172183305
2021-03-23 08:51:05 +00:00
Vadim Caen
015adeccfd
Merge "Hide branding view when empty" into sc-dev
2021-03-23 08:28:33 +00:00
Vadim Caen
884c99d065
Hide branding view when empty
...
It looks like the empty branding view was causing the underlying
view to bleed through it so ensuring that it is removed if empty.
Bug: 182708883
Change-Id: I868931768bed5b083433fd5222720724bfe3e60e
2021-03-23 08:28:14 +00:00
Jernej Virag
1e34ea397e
Merge "Add configuration to control appearance of long press power to assistant setting" into sc-dev
2021-03-23 08:24:42 +00:00
lucaslin
b90ff160cc
Expose NetworkScore to external caller
...
NetworkScore will be a part of mainline module, so the external
callers cannot call its hidden APIs. Expose needed APIs to
the external callers.
CTS-Coverage-Bug: 182963397
Bug: 182963397
Test: m
Change-Id: Iddf8c71a5f51a40bc6ff78626b3e8ee530d1b7eb
2021-03-23 16:17:37 +08:00
Siarhei Vishniakou
2cbaa91f67
Move 'notifyFinishedSignal' into a separate function
...
To reduce the size of 'receiveFinishedSignals' and to simplify the
future CLs in this area, let's move the part where the Java code is
being notified into a separate function.
The behaviour should remain the same.
Test: atest InputEventSenderAndReceiverTest
Bug: 169866723
Change-Id: If0f0d630600a754d01d761f7a3bafce342b96d26
2021-03-23 08:15:36 +00:00
TreeHugger Robot
2b153158e7
Merge "IMMS#dump() should do OOP dumps only for normal prioirty dump" into sc-dev
2021-03-23 08:15:04 +00:00
Remi NGUYEN VAN
41df46a030
Merge "Remove NetdService, NetworkStackClient dependency" into sc-dev
2021-03-23 08:08:01 +00:00
TreeHugger Robot
1bd31567f1
Merge "Update accent colors" into sc-dev
2021-03-23 07:53:07 +00:00
TreeHugger Robot
baf818032a
Merge "Rename "Network slicing" to "Enterprise network preference" in the 5G Slicing API" into sc-dev
2021-03-23 07:49:10 +00:00
junyulai
afd9acdb17
Remove the reference of new Network(int) in Vpn.java
...
Test: atest FrameworksNetTests
Bug: 182963397
Change-Id: I4176dd1298ad8d8e8407eb95b2e6cbb8faf4bc17
2021-03-23 15:28:13 +08:00
Sean Stout
1363aa9538
Merge "Allow IME hiding on displays without system decorations" into sc-dev
2021-03-23 07:23:51 +00:00
Remi NGUYEN VAN
585b50136e
Merge "Add NDK API for getprocnetwork" into sc-dev
2021-03-23 07:11:06 +00:00
TreeHugger Robot
59a8366541
Merge "Improve the documentation of getLastTimeComponentUsed() API" into sc-dev
2021-03-23 06:57:05 +00:00
Yohei Yukawa
9416d8ded2
Merge "Add "cmd input_method tracing save-for-bugreport"" into sc-dev
2021-03-23 06:27:57 +00:00
TreeHugger Robot
76f3adb44f
Merge "Refactor ServiceWatcher" into sc-dev
2021-03-23 06:23:33 +00:00