Commit Graph

18565 Commits

Author SHA1 Message Date
Eric Biggers
53c5aead70 Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8 am: 4d4ababae0 am: 256a0b563f am: 81a31082a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: I1d699ad1e3be192c95f974bab2a582656b67d8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 02:21:46 +00:00
Ryan Lin
564f909a60 Merge "Disable volume-key-accessibility shortcut upon exiting setup wizard" into tm-dev am: 6fcd7dd723 am: 571c9e2d1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17463205

Change-Id: I4b2ea8ce0fa8dd58ff39d70b6a6e7937a80586d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 02:20:27 +00:00
Eric Biggers
256a0b563f Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8 am: 4d4ababae0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: I6c0ee77edf164ecf5a285afe4dff7cec85e9d668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 02:11:26 +00:00
Ryan Lin
6fcd7dd723 Merge "Disable volume-key-accessibility shortcut upon exiting setup wizard" into tm-dev 2022-04-08 01:58:45 +00:00
Eric Biggers
4d4ababae0 Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: Ib029dddb2fd26fa33f231b7ae87c3a1fee737a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 01:36:12 +00:00
Eric Biggers
fb4c1822a8 Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: I92b1cfccfc0bb657d9d5e1958c5e3e2d4ffc3794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 00:36:33 +00:00
Eric Biggers
7e3c5382cc Merge changes Idc218e5f,I26c3fafc
* changes:
  Remove more FDE methods from StorageManager
  Drop FDE status checks from DevicePolicyManagerService
2022-04-08 00:09:30 +00:00
Eric Biggers
bd13f84152 Remove more FDE methods from StorageManager
Now that these methods are no longer called, and none of them are a
public API or have @UnsupportedAppUsage, they can be removed.

inCryptKeeperBounce() actually had one known app user via reflection,
despite the method not having @UnsupportedAppUsage.  However, that user
only made the call if Build.VERSION.SDK_INT < VERSION_CODES.P, so it is
not being used anymore.

Bug: 208476087
Change-Id: Idc218e5f355bb61257b07cf5b5b6df5f4c6ece11
2022-04-07 16:38:36 +00:00
Yuri Lin
5abe07c37f Add strings & channel to be used for notification to review permissions.
Also changes the SYSTEM_CHANGES notification channel to be IMPORTANCE_DEFAULT (by deprecating the existing, unused one).

Bug: 225373531
Test: manual by forcing the notification to show

Change-Id: I9743fe08cccbd8b6a9e7b367e32fe3e597b81ec4
Merged-In: I9743fe08cccbd8b6a9e7b367e32fe3e597b81ec4
2022-04-07 14:53:52 +00:00
Chiachang Wang
f25f8b2f53 Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399 am: 2194a62f15 am: 4319575deb am: ab94544825
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: I6a60483698d733c2f55ca947b7b8039484ab2502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 12:09:20 +00:00
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
1f4bb60335 Merge "Adding empty locale-config case" into tm-dev am: 1e5ed56a17 am: f6299b30db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607969

Change-Id: Ifa45eea3a0212371cad66dbe3076e7f25e4566de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 06:43:11 +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
TreeHugger Robot
31d7d856be Merge changes from topic "presubmit-am-5fd34e1f58044cf4a175d5b16b26a765"
* changes:
  [automerge] Show check icon on current locale preference 2p: 286d948ebf 2p: 9f1bfe569a
  [automerge] Show check icon on current locale preference 2p: 286d948ebf
  Show check icon on current locale preference
2022-04-07 05:48:07 +00:00
David Anderson
d786d68765 Merge changes from topic "presubmit-am-2355cba6040b4ac28f66e83feb674a33" into tm-mainline-prod am: 12670f2bca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17546797

Change-Id: I18ebac21a0381c3e265b69ecfb48593de09973d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 04:36:53 +00:00
David Anderson
0cd984fbad Merge "Optimize EROFS detection code." into tm-dev 2022-04-07 04:17:17 +00:00
David Anderson
12670f2bca Merge changes from topic "presubmit-am-2355cba6040b4ac28f66e83feb674a33" into tm-mainline-prod
* changes:
  [automerge] Optimize EROFS detection code. 2p: 135ac09990
  Optimize EROFS detection code.
2022-04-07 04:17:16 +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
Yuri Lin
06599a015b Merge "Add strings & channel to be used for notification to review permissions." 2022-04-06 19:55:37 +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
Yuri Lin
ed57d6ccf1 Add strings & channel to be used for notification to review permissions.
Also changes the SYSTEM_CHANGES notification channel to be IMPORTANCE_DEFAULT (by deprecating the existing, unused one).

Bug: 225373531
Test: manual by forcing the notification to show

Change-Id: I9743fe08cccbd8b6a9e7b367e32fe3e597b81ec4
2022-04-06 15:51:50 +00:00
Presubmit Automerger Backend
7f5f894a40 [automerge] Show check icon on current locale preference 2p: 286d948ebf 2p: 9f1bfe569a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536671

Bug: 226894992
Change-Id: I5bc2b13073435c33d9b93d6a7c62a71b95325111
2022-04-06 13:45:04 +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
945e23541d [automerge] Use strings in shared library updatability attributes 2p: a40064f2a7 2p: ea22a5a5e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17201283

Bug: 191978330
Change-Id: I64fcd919c82a176d9c9616035bd672e8c102460b
2022-04-06 12:53:39 +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
Joshua Trask
2d10fd65f9 Remove unused ChooserUtil.java
The helper methods provided by this class have been unused
since ag/13807667 (part of removing the old ChooserTargetService
functionality).

Test: http://cs/search?q=chooserutil&sq=package:android-internal
Bug: 148416928
Change-Id: I0aaaa5f597ef72097f1847a3187b335791287a60
2022-04-05 14:01:36 +00:00
Grace Cheng
03968522d5 Merge "Switches ADAS allowlist away from string resources" into tm-dev am: c96bd77dd1 am: 315c7378dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17425852

Change-Id: Iabb7a13fc136c160a5f2139e964a4f2d2ada91ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 02:01:04 +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
825dec9d20 Merge "Remove remaining references to 'delegate chooser'" into tm-dev am: 18ce89e978 am: 37596a2e41
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17505445

Change-Id: I77d2af029857c039c762afc214780750f993fc6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 21:16:45 +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
f34d220c74 Merge "Prevent multiple calls to handleOnDialogAnimatedIn." into tm-dev am: b46b98ee48 am: 2850f046be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17509982

Change-Id: I0b2266031941dbecb0c8d96ec70617353a295337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 18:19:46 +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
36045cc7d7 Merge "Remove OnBackInvokedDispatcherOwner interface." into tm-dev am: bf8817d3f0 am: 617ad4e4d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17511152

Change-Id: Id9b349e0e2b02783de8c75c553488df0f61c7294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-02 01:57:08 +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
Dmitri Plotnikov
9d19f5800c Merge "Truncate battery history tags and remove Log.wtf" into tm-dev am: 431f988122 am: 91450e3adf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17528689

Change-Id: I3c0d23d3a1e27a9c30abd139671bb21f512d4915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 21:36:34 +00: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
fde92f4fba Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" am: db9ea17177 am: b548de7856 am: cd42593479 am: e4dcbf5af9 am: 74416abf96
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045979

Change-Id: I802f93e1b97694ed3d3966d3cd4cb5adb890b488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 19:34:22 +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