Commit Graph

571364 Commits

Author SHA1 Message Date
Kalesh Singh
b5e1145b17 Merge "Add API to get GPU private memory" am: e84ebfc0fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1764047

Change-Id: Id2f283abf8cb2c06b1aaec7ee7723e063f03ee5f
2021-07-16 13:09:37 +00:00
Kalesh Singh
e84ebfc0fc Merge "Add API to get GPU private memory" 2021-07-16 12:57:49 +00:00
Treehugger Robot
cb477fc498 Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." am: 584003dd0d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768612

Change-Id: I189d728ae8f385f82bb66d244dac37f02f2edf42
2021-07-16 12:20:49 +00:00
Treehugger Robot
584003dd0d Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." 2021-07-16 12:05:52 +00:00
Benedict Wong
4d16027790 Merge "Limit VCNs to one running at a given time" am: 9e6e3ce643
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767050

Change-Id: I4add4dc57ac3c49ebd66da460dd42f54f880d079
2021-07-16 03:05:30 +00:00
Benedict Wong
9e6e3ce643 Merge "Limit VCNs to one running at a given time" 2021-07-16 02:48:06 +00:00
Treehugger Robot
55bf147f6a Merge "Avoid sampling outside BQ crop rect" am: 4fd405dfe7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768168

Change-Id: Ifbfc59fed8e28cd5e2f4ca165e582f4031381b8f
2021-07-15 22:06:28 +00:00
Treehugger Robot
4fd405dfe7 Merge "Avoid sampling outside BQ crop rect" 2021-07-15 19:59:11 +00:00
Grace Jia
a5e7d3cdf9 Add a lock for call add/remove operations to avoid
ConcurrentModificationException.

Bug: 189816293
Test: InCallService cts tests
Change-Id: I123b2de55b856d12ee2a5e6d2fa49c15a74592fc
2021-07-15 12:20:59 -07:00
Benedict Wong
3433a8e5d9 Limit VCNs to one running at a given time
This change ensures that there is only ever one VCN running at a given
point in time, and that if the device has switched to using a
subscription in a different subscription group, the VCN will immediately
tear down.

This ensures that when on a DSDS device, when the VCN-enabled
subscription is not the default/active subscription, the other
subscription's network will never be outscored by the VCN, and thus get
torn down.

Bug: 190761448
Test: atest FrameworksVcnTests
Test: Manual testing to ensure common functionality
Change-Id: I8031fab7502880d38420058451df41f47567c458
2021-07-15 12:04:05 -07:00
John Reck
f13447030d Avoid sampling outside BQ crop rect
The region outside of the BQ crop rect is potentially
garbage. Avoid sampling from it.

Fixes: 189656466
Bug: 193378020
Test: CTS PixelCopyTests & DecodeAccuracyTest
Change-Id: I2910d93471f08aaf807ac9f87fdf84cf29cf4143
Merged-In: I2910d93471f08aaf807ac9f87fdf84cf29cf4143
2021-07-15 18:48:20 +00:00
Benedict Wong
cda8a7ec57 Merge "Clear binder calling identity before calling callback" am: 483a604f27
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767051

Change-Id: Id86c781734be94d4e7f3c8c0c89a9298beb46099
2021-07-15 18:38:27 +00:00
Benedict Wong
483a604f27 Merge "Clear binder calling identity before calling callback" 2021-07-15 18:20:14 +00:00
Chalard Jean
75e9f0806c Merge "Add doc explaining PAC proxies are not supported over VPNs" am: 2f3d6bc593
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767430

Change-Id: I0502a72110078e40fc1181be06f7d428e550e790
2021-07-15 09:10:09 +00:00
Yifan Hong
4bff996531 Merge "Revert "AndroidRuntime: Expose javaAttachThread / javaDetachThread."" am: f5c3de0dbd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767688

Change-Id: I57ff040f84f765718fcb32710603726ce9746bad
2021-07-15 09:09:18 +00:00
Chalard Jean
2f3d6bc593 Merge "Add doc explaining PAC proxies are not supported over VPNs" 2021-07-15 06:59:58 +00:00
Benedict Wong
bc02830a59 Clear binder calling identity before calling callback
This change clears calling identities before the
onSubscriptionsChangedListener.onSubscriptionsChanged() callback is
made.

Bug: 193731920
Test: atest TelephonyRegistryManagerTest
Change-Id: I21f14e40a05f76346eb90b8f36608b4d6bdf1a29
2021-07-15 06:58:12 +00:00
Yifan Hong
f5c3de0dbd Merge "Revert "AndroidRuntime: Expose javaAttachThread / javaDetachThread."" 2021-07-15 05:48:57 +00:00
Yifan Hong
22fb2aff4d Revert "AndroidRuntime: Expose javaAttachThread / javaDetachThread."
Revert "RpcSession attaches/detaches JVM for Java thread"

Revert submission 1751551-rpc_binder_java_threads

Reason for revert: breaks build
Reverted Changes:
Ifedd34a8c:AndroidRuntime: Expose javaAttachThread / javaDeta...
I23f171dd1:RpcSession attaches/detaches JVM for Java thread

Fixes: 193742361
Fixes: 193742372

Change-Id: I979f676fe17227eefa630e2a169b4f45862f2ae3
2021-07-15 04:49:03 +00:00
Chalard Jean
3eac2ebe4d Add doc explaining PAC proxies are not supported over VPNs
Test: Comment-only change
Bug: 181600172
Change-Id: I3049fa7eafed04858711f8dee0c11dd4656f9106
2021-07-15 13:45:51 +09:00
Xiaoyu Jin
1fe72ee2be Merge "Add OWNERS file in mockingservicetests for AppSearch" am: 26cb3817e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1764065

Change-Id: Icbf582bddb0fbd520d37dac1343d1668ed6fd389
2021-07-15 03:25:23 +00:00
Xiaoyu Jin
26cb3817e2 Merge "Add OWNERS file in mockingservicetests for AppSearch" 2021-07-15 01:35:15 +00:00
Kalesh Singh
ecec60e0e1 Add API to get GPU private memory
Remove getGpuDmabufUsageKb since the kernel no longer
supports the sysfs nodes that this depends on.

Add getGpuPrivateMemoryKb which uses the memtrack hal
to report the system-wide GPU private memory.

Bug: 193226716
Bug: 193465681
Bug: 192621117
Test: dumpsys meminfo
Change-Id: Ib90505ec184339d5acbcd42c67dad3ad65dbd933
Merged-In: Ib90505ec184339d5acbcd42c67dad3ad65dbd933
2021-07-14 21:18:40 +00:00
Jakub Pawlowski
aee55feaa6 Merge changes from topic "cherrypick-BT-result-storage-descriptor" am: 245ce4d049
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765907

Change-Id: Ifd5482b6d0bfc5d185608ca113490704644405af
2021-07-14 20:45:29 +00:00
Jakub Pawlowski
9cf37f5fe7 Get rid of ResultStorageDescriptor in startScan am: 5aa40b903a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765906

Change-Id: I9b2bcb02cfd4954f6cd5671dba60916631575f7b
2021-07-14 20:45:27 +00:00
Jakub Pawlowski
245ce4d049 Merge changes from topic "cherrypick-BT-result-storage-descriptor"
* changes:
  Bluetooth: deprecate TruncatedFilter and ResultStorageDescriptor
  Get rid of ResultStorageDescriptor in startScan
2021-07-14 20:21:36 +00:00
Yifan Hong
1149562e10 Merge "AndroidRuntime: Expose javaAttachThread / javaDetachThread." am: 6b45a9a7b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751551

Change-Id: I40162e6db55320f1c3f0b27768b42a6dbe10e323
2021-07-14 18:37:01 +00:00
Yifan Hong
6b45a9a7b9 Merge "AndroidRuntime: Expose javaAttachThread / javaDetachThread." 2021-07-14 18:16:57 +00:00
Frank Li
a8b2994fc9 Merge "Cleanup the public API getActiveNetworkForUid on AOSP" am: 06c19fa5d4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749660

Change-Id: I0bb6bf4e077cc26ffba9e608ce83fd32f56de9fc
2021-07-14 16:39:48 +00:00
Frank Li
06c19fa5d4 Merge "Cleanup the public API getActiveNetworkForUid on AOSP" 2021-07-14 16:23:20 +00:00
Jakub Pawlowski
6ea20906f3 Bluetooth: deprecate TruncatedFilter and ResultStorageDescriptor
It's not used anywhere, and the implementation actually never do
anything.

Bug: 192615539
Merged-In: Icf8906c972cf18d65a22d30c3a628fd54db59179
Change-Id: Icf8906c972cf18d65a22d30c3a628fd54db59179
2021-07-14 17:16:19 +02:00
Jakub Pawlowski
5aa40b903a Get rid of ResultStorageDescriptor in startScan
It's never used

Bug: 192615539
Merged-In: Ia2d65def69b13150a20e8a2077c3fe630f8ec86e
Change-Id: Ia2d65def69b13150a20e8a2077c3fe630f8ec86e
2021-07-14 16:58:20 +02:00
Treehugger Robot
a164bdedb6 Merge "Delete the unused netlink-client lib from service.net." am: 64d9c2c25b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1754027

Change-Id: I8ac4ebdaf0e64350153bb88c120bc3df990f5638
2021-07-14 13:52:25 +00:00
Treehugger Robot
64d9c2c25b Merge "Delete the unused netlink-client lib from service.net." 2021-07-14 13:36:31 +00:00
Xiao Ma
490ca21fdd Delete the unused netlink-client lib from service.net.
This cl also paves the path for netlink-client lib migration, after
moving the netlink-client library to frameworks/libs/net/common and
build it as an individual library, deprecate the netlink-client lib
and use net-utils-device-common-netlink instead.

Bug: 192535368
Test: atest FrameworksNetTests
Change-Id: Iad91562d56c503399230e1fe6a635db68e07541d
2021-07-14 08:05:53 +00:00
lifr
d44ddbdfad Cleanup the public API getActiveNetworkForUid on AOSP
Use reflection method to replace the use of public api
getActiveNetworkForUid.

Android 12 version, the public API getActiveNetworkForUid and all
(outside the module) callers of the API have been removed and replaced.

Unfortunately, the related delete/replace code cannot be synced to AOSP
,so in order to keep the public api consistent in Android 12 & AOSP,
The commit uses reflection method to replace the caller of this public
api, Then we can delete this public API in another commit in AOSP.

Bug: 183465229
Test: atest ConnectivityControllerTest
      atest CtsJobSchedulerTestCases:ConnectivityConstraintTest
Merged-In: Ie93cd22b11cc28135a385c0cf6ad6b577b61d1b7
Change-Id: Ia636480b12a9b4a9e2c5dd2ec9259af3167df909
2021-07-14 10:40:29 +08:00
Hans Boehm
6d7cf56683 Merge "Use tmpArgBuffer correctly when argBuffer is null" am: a7fbddac5f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1762425

Change-Id: Iba33ece5d6c6df050137c807f266acd1659810ca
2021-07-14 00:53:41 +00:00
Hans Boehm
a7fbddac5f Merge "Use tmpArgBuffer correctly when argBuffer is null" 2021-07-14 00:37:20 +00:00
Jack Yu
c57a926bbe Merge changes from topics "getApnTypeString", "qns_switched_pref" am: ef140360c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763946

Change-Id: If3fd168078210a902f40f568336c7357c28db4b3
2021-07-13 17:21:38 +00:00
Jack Yu
d773fb8f40 Disallow data when QNS switched the preference am: 3a72957b4b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763945

Change-Id: I4443be2e2a5a05aecbc9a17af8e211925696a906
2021-07-13 17:21:36 +00:00
Jack Yu
ef140360c3 Merge changes from topics "getApnTypeString", "qns_switched_pref"
* changes:
  [Telephony] Clean up: remove getApnTypeStringInternal
  Disallow data when QNS switched the preference
2021-07-13 17:04:23 +00:00
Jiyong Park
01dfd737f5 Merge "Implement permission check for virtualizationservice" am: 1ce000ff84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763365

Change-Id: Ic6af7d43e7abe742180413f3256eb3041c1ee575
2021-07-13 15:52:36 +00:00
Jiyong Park
1ce000ff84 Merge "Implement permission check for virtualizationservice" 2021-07-13 15:38:51 +00:00
Treehugger Robot
7a092118fc Merge "HDMICEC: Add equals test for ActiveSource" am: be87b84d3b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489237

Change-Id: I1dab9e3f2fddd83b572ca909de9bb70cd61528c9
2021-07-13 12:02:11 +00:00
Treehugger Robot
be87b84d3b Merge "HDMICEC: Add equals test for ActiveSource" 2021-07-13 11:44:16 +00:00
Treehugger Robot
0f32078b8d Merge "Allow usage of SdkLevel in the framework/wifi services" am: 25b4755974
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1759710

Change-Id: I4f74530f00952a44b1777c6ce8cbd9188c662897
2021-07-13 08:39:17 +00:00
Treehugger Robot
25b4755974 Merge "Allow usage of SdkLevel in the framework/wifi services" 2021-07-13 08:22:57 +00:00
Treehugger Robot
36b124ccb7 Merge "Update PhoneAccountHandle API docs." am: 95a0ece6cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755371

Change-Id: I3b4ea7a3f5c85a5a0c5b693ef97abf8a1e486dcd
2021-07-13 05:34:51 +00:00
Treehugger Robot
95a0ece6cc Merge "Update PhoneAccountHandle API docs." 2021-07-13 05:20:14 +00:00
Xiaoyu Jin
f407e9e880 Add OWNERS file in mockingservicetests for AppSearch
Change-Id: I8bea03ef0df8125e3504e3ed92dc0b08b694f6f3
2021-07-13 01:03:03 +00:00