Commit Graph

18565 Commits

Author SHA1 Message Date
Chiachang Wang
4319575deb Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399 am: 2194a62f15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: I494bcbae0a8ba83d8950db060c8f0fb3447ed050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:37:31 +00:00
Chiachang Wang
2194a62f15 Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: I7d3a2631cd70a342e7f224fcd99ec8eb1e2c77d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:13:54 +00:00
Chiachang Wang
3caa3cf399 Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: I3595e032cff0b18959150139d9f84cb817784fb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:38:03 +00:00
Calvin Pan
1e5ed56a17 Merge "Adding empty locale-config case" into tm-dev 2022-04-07 06:18:25 +00:00
TreeHugger Robot
182dd36b27 Merge "Show check icon on current locale preference" into tm-dev 2022-04-07 05:48:08 +00:00
David Anderson
0cd984fbad Merge "Optimize EROFS detection code." into tm-dev 2022-04-07 04:17:17 +00:00
Calvin Pan
fdb896a972 Adding empty locale-config case
Allows developers to set an empty locale in locale-config to disable
configuring the app's language

Bug: 224850207
Test: Manual
Change-Id: I8b06a61fb0e4ab253723850cf83d881d3e150638
2022-04-07 04:13:38 +00:00
Shawn Lin
5e21516057 Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal res" into sc-v2-dev-plus-aosp 2022-04-06 15:52:33 +00:00
Calvin Pan
286d948ebf Show check icon on current locale preference
Bug: 226894992
Test: manual
Change-Id: I449ccaaacb3cef4eabc141b5b81ee3a1ba4207c0
2022-04-06 13:44:20 +00:00
Pedro Loureiro
a40064f2a7 Use strings in shared library updatability attributes
Migrate from ints to Strings so we can pass codenames. Otherwise we
can't use these attributes representing a release in progress until that
release is finalized. I.e. if release T is in progress, we don't get the
correct behaviour if we use "T" in those attributes.

Also added some more tests which found some edge cases that weren't
properly handled: tests for when the shared libraries are first removed
from bootclasspath and moved to a module and then added again to the
bootclasspath via a mainline update;

In turn those tests found a bug where we would apply the logic for
onBootclasspathBefore X on devices before X which is not required.

Bug: 191978330
Test: atest
com.android.server.pm.parsing.library.ApexSharedLibraryUpdaterTest
com.android.server.systemconfig.SystemConfigTest

Change-Id: I85a3287422877a95394153b575ae422745fda27d
2022-04-06 12:52:11 +00:00
Chiachang Wang
3cb07d737d Ignore other IKE options if IkeTunnelConnectionParams is set
Stop parsing the IKE options from the input IkeTunnelConnectionParams
if exists. The caller shuould get the relevant infortation the
params.

The field is also stored in the VpnProfile if it built from an
Ikev2VpnProfile.

Bug: 184750836
Test: atest FrameworksNetTests HostsideVpnTests
Test: build ; flash ; connect VPN successfully
Change-Id: Id05c17285915462c7a6cd51d5fb4ee5da7f465ba
2022-04-06 17:25:58 +08:00
David Anderson
135ac09990 Optimize EROFS detection code.
The EROFS detection code is rather expensive. On Android 13 kernels we
can use a faster detection using /sys/fs/erofs.

Bug: 225092276
Test: erofs detected on android13-5.10
Change-Id: I0f1c2975f1de7810ee2334d2f09c9fa3722d0174
2022-04-06 02:25:24 +00:00
Grace Cheng
c96bd77dd1 Merge "Switches ADAS allowlist away from string resources" into tm-dev 2022-04-05 01:21:34 +00:00
Mark Renouf
18ce89e978 Merge "Remove remaining references to 'delegate chooser'" into tm-dev 2022-04-04 20:30:41 +00:00
Joe Bolinger
b46b98ee48 Merge "Prevent multiple calls to handleOnDialogAnimatedIn." into tm-dev 2022-04-04 17:48:41 +00:00
Grace Cheng
dea5248299 Switches ADAS allowlist away from string resources
Bug: 226440115
Test: manually

Change-Id: I3d1434c405a1babee999533afa10710a06f635a1
2022-04-04 15:38:00 +00:00
shawnlin
e901942281 [DO NOT MERGE] Fixed status bar glitch for apps that access internal res
In 12L, to support mulit-display devices, we changed the way to get the
status bar height by adding an API to calculate instead of directly
reading the resource of status_bar_height.

However, some apps still using Resources.getIdentify() to get this
internal resources dimen as status bar height to layout their UI which
cause status bar glitch in their app.

For compatibility purpose:
1. Create a new dimen res status_bar_height_default which will be used
   by framework to determine the status bar heigth
2. For status_bar_height
   - Set the value to the size which already consider the cutout size
     for defualt display as before so that it won't breaking existing
     app.
   - It is only used for apps using Resources.getIdentifier()

Bug: 216782082
Test: verified on the apps with such issue.
Change-Id: I306efa187ffa69223c06fd248cfe57d183f96c59
2022-04-04 03:21:03 +00:00
Shan Huang
bf8817d3f0 Merge "Remove OnBackInvokedDispatcherOwner interface." into tm-dev 2022-04-02 01:29:52 +00:00
Joe Bolinger
7880a86f50 Prevent multiple calls to handleOnDialogAnimatedIn.
This also adds the request id to the methods that hide the prompt to prevent stale requests from being handled. I wasn't able to reproduce the bug locally but it appears to be caused by these stale events.

Fix: 225275518
Bug: 213899762
Test: atest BiometricServiceTest AuthContainerViewTest
Change-Id: Iac414763dd0012e51b331abe649a50e353df5e1c
2022-04-02 00:49:53 +00:00
Mark Renouf
f44e240e95 Remove remaining references to 'delegate chooser'
Clean up some leftover references and simplify
Add positive confirmation of flag changes via logcat

Change-Id: Id21b66953bb3b7c810e9d67809a673862a7ea821
2022-04-01 17:59:05 -04:00
Xin Li
4b9118275b Fixup OWNERS file merge conflicts.
Change-Id: I8948b1361211825cc45f049f6484dc290620801b
2022-04-01 21:00:58 +00:00
Dmitri Plotnikov
431f988122 Merge "Truncate battery history tags and remove Log.wtf" into tm-dev 2022-04-01 20:54:17 +00:00
Xin Li
0bb254bd3f Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: Id7458a889e8b084a260b18f56db315ee1317b3a6
Change-Id: I4819065c2c2adb24d08fb1e32eefd6f335a1ec48
2022-04-01 20:32:30 +00:00
Shan Huang
69a3984aae Remove OnBackInvokedDispatcherOwner interface.
Test: m -j update-api. Build and flash and test back behavior throughout
the system.
Bug: 227500290

Change-Id: Ibdb13d02e044741d05d99f1cad96e43dc0129fe4
2022-04-01 20:27:34 +00:00
Eric Biggers
e4dcbf5af9 Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" am: db9ea17177 am: b548de7856 am: cd42593479
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045979

Change-Id: Id302758aa15d64b8d7e00628f90b13782213fb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 19:03:39 +00:00
Eric Biggers
cd42593479 Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" am: db9ea17177 am: b548de7856
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045979

Change-Id: I3fbe51313843c63950cb0e3d8141b88f79d41d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 18:42:11 +00:00
Calvin Pan
a15af39f7f Fix fetching incorrect items after filtering
Using parent view's adapter to prevent getting incorrect item after
filtering the list.

Bug: 227447626
Bug: 227289977
Bug: 227279371

Test: By manual
Change-Id: Ic7dde57cdc0dd44adf803317f836131d578f044b
(cherry picked from commit d3df5bdf84)
2022-04-01 08:05:04 +00:00
Dmitri Plotnikov
0d1965421d Truncate battery history tags and remove Log.wtf
Bug: 216559196
Test: atest FrameworksCoreTests:BatteryStatsTests

Change-Id: I252ef24e1bbf9fb9210b3830dd37277de92c763d
2022-03-31 15:06:05 -07:00
Jernej Virag
02725bd669 Merge "Fix loaded size of BigPicture bitmap" into tm-dev 2022-03-31 18:31:37 +00:00
Jernej Virag
6a1ca2ff49 Fix loaded size of BigPicture bitmap
Right now the big picutre bitmap was loaded at 480px from URI and unrestricted from any other source. This adjusts that size to always consistently restrict it to 358dp, which is the maximum size of notifications.

Bug:210690571
Bug:218845090

Test: Manually on device
Change-Id: I9586488ba307e19bdc8c1af6f8c99cd369cd94c9
2022-03-31 15:51:40 +00:00
Jernej Virag
0c36369480 Merge "Fix handling of negative size request for Bitmaps in LocalImageResolver" into tm-dev 2022-03-31 11:29:01 +00:00
Pablo Gamito
033ac7f454 Merge changes from topic "presubmit-am-0ceaf5de4b364feeaa00d2d1e8e8414b" into tm-dev
* changes:
  Revert "Revert "Use new T activity transitions in legacy""
  Remove edge extension surface onAnimationLeashLost
2022-03-31 08:46:59 +00:00
Hiroki Sato
2c06ff3da8 Merge changes from topics "presubmit-am-166ca8e59ac8499bb6b4f4cad6aae045", "presubmit-am-1a825bf4d182432b91541a8629e0e351" into tm-dev
* changes:
  Add private API InputMethodManager#reportVirtualDisplayGeometry
  Reland CursorAnchorInfo#createForAdditionalParentMatrix()
2022-03-31 00:15:59 +00:00
Jorim Jaggi
cd106a5aa7 Merge "Fix overcounting after end in case of incomplete callbacks" into tm-dev 2022-03-31 00:07:42 +00:00
Garfield Tan
3bea7df55b Merge "Hide CaptionDecorView behind CAPTION_ON_SHELL flag" into tm-dev 2022-03-31 00:03:59 +00:00
Hongwei Wang
b2a5b198cd Merge "Handle PiP shadow radius in WMShell" into tm-dev 2022-03-30 22:23:51 +00:00
Mark Renouf
3ad19f7a7c Merge "Removes unused inheritence avoidance hacks" into tm-dev 2022-03-30 17:19:43 +00:00
Jernej Virag
26e492cc4b Fix handling of negative size request for Bitmaps in LocalImageResolver
Requesting negative sized bitmap should mean "no restrictions" and not "please resize to -1x-1". This fixes the corner case for pure bitmaps.
Also reduce severity of logging when we're falling back to non-ImageDecoder load since that's not a catastrophic failure.

Bug:227103943
Bug:227008805

Test: tested on device with Notify1.apk while reproducing the issue
      atest LocalImageResolver with new tests
Change-Id: I581d3e637fcafaba68856738f90cc72c42442d60
2022-03-30 14:44:55 +00:00
Pablo Gamito
0c414c0740 Revert "Revert "Use new T activity transitions in legacy""
This reverts commit 1250be73c8.

Change-Id: Icb6902a2078feab30157ddaff8eb066133cb1384
2022-03-30 13:03:55 +00:00
Mark Renouf
ca3d495ca6 Merge "Removes unused mAwaitingDelegateResponse" into tm-dev 2022-03-30 10:21:13 +00:00
Matt Casey
cb9d8762c3 Replace USE_DELEGATE_CHOOSER with USE_UNBUNDLED_SHARESHEET
New flag will allow for control via experiment rollout.

Bug: 224544763
Test: Manual test of flag functionality.
Change-Id: I70bc79e12afe4ff629dbd3935c082c51c39a66a7
2022-03-29 23:40:09 +00:00
TreeHugger Robot
44df60c3f9 Merge "Fall back when failing to load size restricted icon" into tm-dev 2022-03-29 23:33:39 +00:00
TreeHugger Robot
93ac91554a Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev am: f709e34b90 am: 9d9976b68f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17206575

Change-Id: I9c301bd9e347fedaa1a04ce8f2e50fda402ece4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 20:54:57 +00:00
TreeHugger Robot
9d9976b68f Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev am: f709e34b90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17206575

Change-Id: I472e4dc6a9b0ae0f8f76e2b620ec59e53aba0b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 20:39:43 +00:00
TreeHugger Robot
f709e34b90 Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev 2022-03-29 20:19:40 +00:00
Garfield Tan
47acf93da2 Hide CaptionDecorView behind CAPTION_ON_SHELL flag
Also introduce a system property to facilitate debugging of caption in
shell.

Bug: 165794636
Test: Caption shows when the property is unset. Caption goes away when
the property is set.

Change-Id: I57060778c46da217a957910f0cc9d1fe1592cfa1
2022-03-29 19:59:50 +00:00
Mark Renouf
b3729dc001 Merge changes from topics "presubmit-am-0adc4a89a1534fb8873a721309ac084a", "presubmit-am-f0e20c2f5d9d42f5b21d0cb6ae2e15cd" into tm-dev
* changes:
  Removes 'mIsHeadlessSpringboardActivity'
  Remove 'startAsCallerImpl' refactoring relic
2022-03-29 19:07:20 +00:00
Eric Biggers
54bdf65cb5 Remove FDE warning from AccessibilityShortcutChooserActivity
This encryption warning is never shown, since
StorageManager.isNonDefaultBlockEncrypted() is hard-coded to return
false, since FDE (Full Disk Encryption) is no longer supported.
Therefore, remove an unused TextView and string, and stop calling
StorageManager.isNonDefaultBlockEncrypted().

Remove the word "encryption" from the layout name
"accessibility_enable_service_encryption_warning", since this layout
is still used for other, non-encryption related warnings.

Bug: 208476087
Change-Id: Ic4e9024eadd602205516aa3ba4cc01887a2a7d34
2022-03-28 23:52:06 +00:00
Hongwei Wang
2708c3a74d Handle PiP shadow radius in WMShell
Deprecate also the shadow radius for PiP in Task

Bug: 206508708
Test: Verify the PiP enter/exit/move/resize transitions
Change-Id: I8ff83dd4e626a3455373fed6c908cf131ecae8fe
2022-03-28 16:43:46 -07:00
Hiroki Sato
708c957fa3 Add private API InputMethodManager#reportVirtualDisplayGeometry
This logically relands the change [1] which added an @hide api
InputMethodManager#reportActivityView() with renaming as
reportVirtualDisplayGeometry().

Because ActivityView was removed, this API was removed [2] once.
However, because this API is useful for OEM customization, this change
adds the same API with a generalized method name.

Note that there was a change on how cross-display input connection
cursor update is blocked [3]. Thus, this CL adapts to it.

[1] Id0411a80456182111bb5b681c6d1230b58e7ec2e
[2] Idd60d96a39f827197d189beb5de016446576d9cd
[3] Iec12733d37e112b7271436bba15094ae2a55a450

Bug: 224424149
Test: manual. Cursor is updated in cross-display connection.
Change-Id: I35b491da5a340844e17542d7a6198f8152bbeda3
2022-03-28 20:03:24 +09:00