687807 Commits

Author SHA1 Message Date
Ken Chen
9c315eb11f Update data type and comments on tagSocket/untagSocket APIs
- Fix comment in version script to say LL-NDK, not NDK
- Use uint32_t for tag

Bug: 223423155
Test: CtsNetTestCases:android.net.TrafficStatsTest
Test: CtsNativeNetPlatformTestCases
Change-Id: Ifb819ed0adeb8f173b98c3f131a4bf2e0715dd4e
2022-03-31 00:28:15 +08:00
Treehugger Robot
2e6b40a883 Merge "WrappedApplicationKey: Remove superfluous branch in deserialization." 2022-03-25 00:16:25 +00:00
Janis Danisevskis
ffba3e7ac9 WrappedApplicationKey: Remove superfluous branch in deserialization.
The metadata field is written unconditionally and will be represented at
least by a -1 if it is null.

Bug: 210655898
Test: N/A
Change-Id: Iad85dbec916a2d51523b81b594b66b9518811d27
2022-03-24 15:28:15 -07:00
Rambo Wang
d25623ae62 Merge "Clear up CarrierPrivilegesListener APIs" 2022-03-24 19:48:30 +00:00
Hui Yu
8f321a616b Merge "[Bugfix] Don't delete mPendingUids if PendingTopPid is added later than updateOomAdj started" 2022-03-24 15:33:22 +00:00
Bernardo Rufino
e521edc4d1 Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" 2022-03-24 11:19:48 +00:00
Robert Horvath
7695e38ec7 Merge "Annotate setUidFirewallRule with @GuardedBy" 2022-03-24 10:50:27 +00:00
Bernardo Rufino
05ebe2894f Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE
As part of go/untrusted-touches for S, we blocked touches from passing
windows of different UIDs regardless of targetSdk. For SAWs, we applied
an opacity rule where apps would be able to let touches pass through
(usually via FLAG_NOT_TOUCHABLE) as long as their cumulative opacity in
the touch area wasn't greater than 0.8.

This resulted in some overlay apps being broken, which we expected and
saw to some extent in df/dp/beta, but we had reached out and some apps
fixed the issue. But the issue seems to be more widespread and OEM has
escalated the issue, reporting it to be affecting them more severely
(see bug).

So, we automatically make SAW + FLAG_NOT_TOUCHABLE windows have 20%
transparency to try to honor FLAG_NOT_TOUCHABLE and let touches pass
through. Note that if the app has overlapping windows the cumulative
opacity would be taken into consideration and the touch could still be
blocked, but none among the apps I checked did that.

Test: atest -d android.server.wm.WindowUntrustedTouchTest
Test: Install and enable you.in.spark.energy.curved, verify touches work
      in the top part of the screen.
Bug: 218777508
Merged-In: I3a74e1cc43a36171ee10fbf68c4bfff538eee661
Change-Id: I3a74e1cc43a36171ee10fbf68c4bfff538eee661
2022-03-24 09:24:14 +00:00
Patrick Rohr
df3406499c Merge "Add getInterfaceList module-lib API in EthernetManager." 2022-03-24 06:15:43 +00:00
Patrick Rohr
5099eb16c0 Merge "Fix ethernet enable / disable API" 2022-03-24 06:09:28 +00:00
Charles Chen
992d43abd4 Merge "Add OWNERS file for WM Jetpack library tests" 2022-03-24 03:00:31 +00:00
huang chaopeng
2da542d368 [Bugfix] Don't delete mPendingUids if PendingTopPid is added later than updateOomAdj started
Analysis:
1.Doing updateOomAdjInnerLSP in backgroud, and it would last for a long
time
2.Now start a new Activity, windowManager save the latest topUid into PendingStartActivityUids
3.updateOomAdj task in step.1 done, and then delete all uids in PendingStartActivityUids
4.The topApp will be rejected by AppOps due to the deleting in step.3

Signed-off-by: huang chaopeng <huangchaopeng@oppo.corp-partner.google.com>
Change-Id: I52c7c2a8d6cb86b27b1f008cb56f670ce7698dc9
2022-03-24 10:47:35 +08:00
Chen Xu
d9e8a4f5ff Merge "Add portIndex for switch subscription API" 2022-03-23 22:51:40 +00:00
Rambo Wang
e72e4ca85b Merge "[MEP] adding portindex to sim access APIs" 2022-03-23 21:42:56 +00:00
Rambo Wang
0aff5099d5 Clear up CarrierPrivilegesListener APIs
CarrierPrivilegesListener has been replaced with
CarrierPrivilegesCallback. With all clients has been migrated, it is
time to remove the obsoleted APIs

Bug: 216549778
Test: atest CarrierPrivilegesTrackerTest CarrierServiceTest
Test: atest WifiCarrierInfoManagerTest TelephonyRegistryManagerTest
Test: atest TelephonySubscriptionTrackerTest
Change-Id: I89df21764d3b9945219d810d0dd9bfe3cf5fbea4
Merged-In: I89df21764d3b9945219d810d0dd9bfe3cf5fbea4
(cherry picked from commit 5a4bcc0a9c1f656bd87e2830e56dea37197fdd2b)
2022-03-23 14:30:43 -07:00
Treehugger Robot
3b4812350f Merge "Add setEthernetEnabled and its listener API" 2022-03-23 19:40:19 +00:00
Rambo Wang
f146ee5a1b Merge "Update TelephonySubscriptionTracker to use new CPCallback interface" 2022-03-23 19:37:59 +00:00
Rambo Wang
8ec6343dfb Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" 2022-03-23 19:34:02 +00:00
Charles Chen
451e2ee39d Add OWNERS file for WM Jetpack library tests
Test: presubmit
Bug: 219652919
Change-Id: I95c609eeff47bef9ae45a5e9847eb56efc622b83
2022-03-24 00:11:32 +08:00
John Wu
b8ebf69571 Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" 2022-03-23 16:06:00 +00:00
Rambo Wang
476574dfc8 Optimize TM#getCarrierServicePackageName[ForLogicalSlot]
Instead of querying package manager every time which is
quite expensive, the new implementation will improve
the performance by query the cache in CarrierPrivilegesTracker.

Bug: 217442920
Test: atest CarrierPrivilegesTrackerTest
Change-Id: I29df8599bdfc84cab330fa7056a228997a4bac0f
Merged-In: I29df8599bdfc84cab330fa7056a228997a4bac0f
(cherry picked from commit 28b2ee8ec0314c1f77d92017de24c0d3df003aff)
2022-03-23 08:11:30 -07:00
Remi NGUYEN VAN
9860ef9b01 Merge "Add OWNERS block for code move" 2022-03-23 14:19:10 +00:00
Jon Eckenrode
7ac639b11b Merge "Revised the API documentation of the getMetrics and getSize methods to account for differences in API levels." 2022-03-23 14:16:19 +00:00
Rambo Wang
cabb6b9362 Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" 2022-03-23 13:44:09 +00:00
Robert Horvath
e66b3dc8a2 Annotate setUidFirewallRule with @GuardedBy
This method is only called with the lock held.
Annotating it helps ErrorProne verify calls to other methods that
require the lock to be held are okay.

Test: Build
Bug: 220270435
Change-Id: I1f6c3c9e339935c06b3edd5436b2b1a7922a67ed
Merged-In: I1f6c3c9e339935c06b3edd5436b2b1a7922a67ed
2022-03-23 12:15:10 +00:00
Virkumar Karavate
14087b39d1 Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" 2022-03-23 11:58:56 +00:00
Jerome Gaillard
329f25d91a Merge "Read-only properties can have values of arbitrary length" 2022-03-23 10:21:15 +00:00
Treehugger Robot
b344dfaee9 Merge "JavaBBinder::onTransact - log if env null" 2022-03-23 04:40:54 +00:00
Rambo Wang
73e1555fea Update TelephonySubscriptionTracker to use new CPCallback interface
CarrierPrivilegesListener is renamed as CarrierPrivilegesCallback.
The previous callback onCarrierPrivilegesChanged is also
reshaped to provide Set of package names and UIDs.

This is the minimum change to remove dependency on CPListener. A
follow-up CL can simplify the logic here with the new
onCarrierServiceChanged API if TelephonySubscriptionTracker only cares
about carrier service.

Bug: 216549778
Test: atest TelephonySubscriptionTrackerTest
Change-Id: I58dbbc4b7b135781bc5f4b5bc35b29075fc6a619
Merged-In: I58dbbc4b7b135781bc5f4b5bc35b29075fc6a619
(cherry picked from commit 374f0045baa36ec412003e9397b9a214c0684de9)
2022-03-22 21:18:00 -07:00
Rambo Wang
aa1e3b0a67 Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener
Add new interface in CarrierPrivilegesCallback to notify the registrants
that carrier service for current user has changed.

Reshape the parameters of onCarrierPrivilegesChanged callback with
both Set instead of List/Array.

CarrierPrivilegesListener is deprecated. Once all clients have migrated
to CarrierPrivilegesCallback, it will be throughly cleaned up.

Bug: 216549778
Test: atest CarrierPrivilegesTrackerTest CarrierServiceTest
Test: atest WifiCarrierInfoManagerTest TelephonyRegistryManagerTest
Test: atest TelephonySubscriptionTrackerTest

Change-Id: I18e443d91f1db951f1461511821c0f5f673da3a3
Merged-In: I38d03e3921112c313f3c1d204ed04f6e1756ff39
(cherry picked from commit b66e3e3aa87395069833307716334ff577b778a7)
2022-03-22 20:45:05 -07:00
sandeepjs
f9935cec48 [MEP] adding portindex to sim access APIs
Updated sim access API's with portIndex.
Test: atest TelephonyManagerTest#testIccOpenLogicalChannelBySlotAndPort
Test: atest TelephonyManagerTest#testIccCloseLogicalChannelBySlotAndPort
Test: atest
TelephonyManagerTest#testIccTransmitApduLogicalChannelBySlotAndPort
Test: atest
TelephonyManagerTest#testIccTransmitApduBasicChannelBySlotAndPort
Bug: 208739934

Change-Id: I32fc94f2fe98c46d8bb0120fff49e5b72df27ddf
Merged-In: I32fc94f2fe98c46d8bb0120fff49e5b72df27ddf
2022-03-23 02:56:15 +00:00
Jordan Liu
abedec1601 Add portIndex for switch subscription API
Bug: 205504646
Test: manual (builds, will not be functional until LPA implementation)
Change-Id: Ic289538f5df17c03b2f8da7f4966c583d4557586
Merged-in: Ic289538f5df17c03b2f8da7f4966c583d4557586
2022-03-22 19:26:58 -07:00
Automerger Merge Worker
bf901995db Merge changes from topic "am-33761c75a1d240df8af3b3cd1fd22513"
* changes:
  [automerger skipped] Merge "Mark ab/8191998 as merged" into android12L-tests-dev am: b503c60ae9 -s ours
  [automerger skipped] Mark ab/8191998 as merged am: b6de19fa4a -s ours
2022-03-22 23:32:19 +00:00
Xin Li
6b4a52adc9 [automerger skipped] Merge "Mark ab/8191998 as merged" into android12L-tests-dev am: b503c60ae9 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 837917a6a3 is already in history

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

Change-Id: I8812b0c4d88553ef848c64b4d91218f5996f78c6
2022-03-22 23:31:52 +00:00
Maria Yang
b3d129d636 [automerger skipped] Mark ab/8191998 as merged am: b6de19fa4a -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 837917a6a3 is already in history

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

Change-Id: I25faa6ae899b008999de3cbad950929d6388b87f
2022-03-22 23:31:14 +00:00
Automerger Merge Worker
7294249768 Merge "Replace BitmapRegionDecoder with ImageDecoder am: 837917a6a3" 2022-03-22 23:29:33 +00:00
Vincent Wang
3f50aa9829 Replace BitmapRegionDecoder with ImageDecoder am: 837917a6a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17128491

Change-Id: Ie06e8adff8d5440ba2bf4f158cab0207ac965c66
2022-03-22 23:29:22 +00:00
Automerger Merge Worker
7398b0c65e Merge "[automerger skipped] DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync am: b373fd8f77 -s ours" 2022-03-22 23:28:50 +00:00
Mady Mellor
477f4586b6 [automerger skipped] DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync am: b373fd8f77 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6dfa54c2cee3345e4da754ff6c38b8a28e688fed
2022-03-22 23:28:43 +00:00
Automerger Merge Worker
84b6c4ac8b Merge "[automerger skipped] [DO NOT MERGE] Fix regression for enter PIP when onUserLeaveHint am: 15bcf9d7bd -s ours" 2022-03-22 23:28:31 +00:00
Chris Li
273e774f51 [automerger skipped] [DO NOT MERGE] Fix regression for enter PIP when onUserLeaveHint am: 15bcf9d7bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03d03ff8f1268f695704f2b6e2b28e4b8e059248
2022-03-22 23:28:22 +00:00
Automerger Merge Worker
1a60a17c66 Merge "[automerger skipped] Dispose of input event reciever along with monitor am: 12464ec4c1 -s ours" 2022-03-22 23:28:02 +00:00
Miranda Kephart
29dd69cafa [automerger skipped] Dispose of input event reciever along with monitor am: 12464ec4c1 -s ours
am skip reason: Merged-In Id201891ffd546119b18b18b692dd87008f6735c2 with SHA-1 7625c27193 is already in history

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

Change-Id: If6ac5338fb2df04ecb720898d8dd066fd4acfc7d
2022-03-22 23:27:54 +00:00
Automerger Merge Worker
d5240cbb8f Merge "[automerger skipped] Fix missing group alertOverride recalculation am: 2592ea1fc8 -s ours" 2022-03-22 23:27:39 +00:00
Jeff DeCew
33a03df4c8 [automerger skipped] Fix missing group alertOverride recalculation am: 2592ea1fc8 -s ours
am skip reason: Merged-In I4447810af5e2a17c3b6841dfa5cd31703e5f334d with SHA-1 38d57ffe4a is already in history

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

Change-Id: I8f1af8cdf2d363bdc06b2ce0bd636c1868c8345d
2022-03-22 23:27:23 +00:00
Automerger Merge Worker
c0b17ff878 Merge "[automerger skipped] Allow alertOverride if the summary GROUP_ALERT_ALL am: bdd4019a16 -s ours" 2022-03-22 23:27:08 +00:00
Jeff DeCew
dede6d5b1f [automerger skipped] Allow alertOverride if the summary GROUP_ALERT_ALL am: bdd4019a16 -s ours
am skip reason: Merged-In I63a51cc1d94fc8a8617ca76a0fa479e3829816c6 with SHA-1 b479d64878 is already in history

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

Change-Id: I12f8daec444a925f2f589c3c4ec9d1cd9585702e
2022-03-22 23:26:56 +00:00
Automerger Merge Worker
3c9fa4f583 Merge "[automerger skipped] Fix the animation glitch when NSSL adds and removes a HUN in the same frame. am: 5d54f3c761 -s ours" 2022-03-22 23:26:35 +00:00
Jeff DeCew
b9b0d89948 [automerger skipped] Fix the animation glitch when NSSL adds and removes a HUN in the same frame. am: 5d54f3c761 -s ours
am skip reason: Merged-In I755fff6944da0699d9cb7e6b2456e4811f7888d5 with SHA-1 878e932203 is already in history

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

Change-Id: I09c6e784e62bab2432ed1abb1ec8d4d686747898
2022-03-22 23:26:27 +00:00
Automerger Merge Worker
7f8a9ffda8 Merge "[automerger skipped] Check that PowerManager#isInteractive is false before showing the AOD UI for screen off. am: e0d326d3fd -s ours" 2022-03-22 23:26:11 +00:00