Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
654,870 Commits 3 Branches 0 Tags
868634f0bbbada99eb4a86ea274a8f0a0115273f
Commit Graph

16707 Commits

Author SHA1 Message Date
Orion Hodson
868634f0bb Merge "Drop system_server dexopt in ZygoteInit" am: 5e1c9fe7fc am: b55a7938a6 am: f08df3a589 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1806016

Change-Id: I344c6a25a3a0f20bdc825107c4bc11142713b2ea
 2021-08-26 15:21:28 +00:00
Orion Hodson
f08df3a589 Merge "Drop system_server dexopt in ZygoteInit" am: 5e1c9fe7fc am: b55a7938a6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1806016

Change-Id: I4101218b669feb79235c469013693752c9bca8f8
 2021-08-26 15:08:11 +00:00
Orion Hodson
b55a7938a6 Merge "Drop system_server dexopt in ZygoteInit" am: 5e1c9fe7fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1806016

Change-Id: Icf16da811d100df9dcc6c91a2fa9b2e4a76f9654
 2021-08-26 14:51:20 +00:00
Orion Hodson
5e1c9fe7fc Merge "Drop system_server dexopt in ZygoteInit" 2021-08-26 14:35:24 +00:00
Jooyung Han
8643edb8f2 Merge "telephony: suppress warnings in AIDL" am: 6dff9dce0f am: 7c15aa4254 am: 43fa5417b7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1808127

Change-Id: I217cca39ff0466e8c99115745335c6cc4effc96b
 2021-08-26 00:44:51 +00:00
Jooyung Han
43fa5417b7 Merge "telephony: suppress warnings in AIDL" am: 6dff9dce0f am: 7c15aa4254 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1808127

Change-Id: I222e33a7e88f0301f2b357197d34bddd95132d19
 2021-08-26 00:32:01 +00:00
Jooyung Han
7c15aa4254 Merge "telephony: suppress warnings in AIDL" am: 6dff9dce0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1808127

Change-Id: I26c3e6899c9126f54e8914997f347ebb34654ef6
 2021-08-26 00:15:42 +00:00
Jooyung Han
e53a76adec telephony: suppress warnings in AIDL 
This was missed in 133879b683.

Emergency number list is internally represented as Map<Integer,
List<EmergencyNumber>>, which is not supported by AIDL.

Bug: 192615532
Test: m
Change-Id: I5dc8b0f94b13b6625bb31933c6488dc87c9db713
 2021-08-25 15:17:56 +09:00
Neha Jain
5de7be4e77 Merge "ims: Version support for uce feature tags" into sc-dev am: d446e80289 am: a3c93f8051 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515803

Change-Id: I17d920ef3a0b62cbbd3ba58a05370116f17f21aa
 2021-08-24 18:21:18 +00:00
Neha Jain
a3c93f8051 Merge "ims: Version support for uce feature tags" into sc-dev am: d446e80289 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515803

Change-Id: If8bd68e45a257fbc97df53392db9ddeba784df03
 2021-08-24 18:20:22 +00:00
Jeff DeCew
2f1354521a Merge "Add notifications team as OWNERS of notification-related utilities and their tests" am: 39366563d3 am: bce9262c0d am: a9185e3a4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796768

Change-Id: If65518b6c220614e35bd8e873facd66c13a89c76
 2021-08-24 17:45:45 +00:00
Jeff DeCew
a9185e3a4f Merge "Add notifications team as OWNERS of notification-related utilities and their tests" am: 39366563d3 am: bce9262c0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796768

Change-Id: I30d28b693988ab1234dc951ff3a7ca7fc1640ac9
 2021-08-24 17:34:07 +00:00
Jeff DeCew
bce9262c0d Merge "Add notifications team as OWNERS of notification-related utilities and their tests" am: 39366563d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796768

Change-Id: I6bd3759e5e7e37aaa1a2dbcda3b0ecba073a67a0
 2021-08-24 17:13:15 +00:00
Pavan Kumar M
6624e2aa57 ims: Version support for uce feature tags 
Add version support for uce feature tags

Bug: 175092320
Bug: 193992611
Bug: 193543670
Change-Id: I8b62b9b9d7ae271bc623764d545db1320b4dc64f
 2021-08-24 01:39:55 +00:00
Orion Hodson
c3e8e916eb Drop system_server dexopt in ZygoteInit 
system_server artifacts should be present in the system image or
generated by on-device signing.

Bug: 187711479
Fix: 163019104
Test: m & boot
Change-Id: I19094e1a60b903d04cf7ba23e65cc9ef10f7f243
 2021-08-23 10:52:41 +01:00
Jeff DeCew
2de4373e93 Merge changes I09b3999a,I590be0ba into sc-qpr1-dev am: 10c7e2b811 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549414

Change-Id: I09ff92b8debe78859e621fd6ac013d8281959d07
 2021-08-16 19:38:06 +00:00
Jeff DeCew
10c7e2b811 Merge changes I09b3999a,I590be0ba into sc-qpr1-dev 
* changes:
  Use tertiary accent color for expander with unread count.
  Fix ContrastColorUtil.findContrastColorAgainstDark to return the valid color
 2021-08-16 19:21:18 +00:00
Jeff DeCew
1cbc573b93 Add notifications team as OWNERS of notification-related utilities and their tests 
Change-Id: I153ab4e182a0843706c25f03c891a92eb48eea9c
 2021-08-16 14:56:48 +00:00
Jeff DeCew
4c0e8a62e6 Fix ContrastColorUtil.findContrastColorAgainstDark to return the valid color 
Fixes: 196600502
Test: atest ContrastColorUtilTest
Change-Id: I590be0ba30c03e867bf08558483239818b3aff82
 2021-08-16 14:14:53 +00:00
Xin Li
773a9dfba7 Merge sc-dev-plus-aosp-without-vendor@7634622 
Merged-In: I661f5fb6b1f3f6ce4322fab8fa84a7ab364c65b1
Change-Id: I16482b494ff4821016aabbb646e495d616c630ac
 2021-08-14 07:23:27 +00:00
Jeff DeCew
e30260aa9a Merge "Collapse the CallStyle buttons to just an icon instead of truncating text." into sc-qpr1-dev am: 44527690ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15559241

Change-Id: Ib93a57b8bd4e2158f2edbd87a552de2db49d8032
 2021-08-14 02:17:17 +00:00
Jeff DeCew
7ce358c005 Collapse the CallStyle buttons to just an icon instead of truncating text. 
Fixes: 195019654
Test: post CallStyle notification without custom action; observe text
Test: post CallStyle notification with custom action; observe buttons shrink to icon only.
Test: repeat tests using various font and screen sizes.
Change-Id: Icbd6189a1e03494e481e8672263570ae2657f946
 2021-08-13 15:52:48 +00:00
Nate Myren
9d1a9399b8 Merge "Add attribution info to start callbacks" into sc-dev am: 5d97f29218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15446590

Change-Id: I42bdf188ec74c9d3a7179f717a08c7fec7f33833
 2021-08-03 20:06:34 +00:00
Nate Myren
06d07d54db Add attribution info to start callbacks 
Add attribution flags and chain IDs to start callbacks, and have the
PermissionUsageHelper listen for starts. This ensures that, if another
start happens while an op is already running, and has chain information,
then this chain information will be recorded.

Test: manual
Bug: 194198234
Change-Id: I0ab1aa0969b70e18001f4a814ea5689f9329a019
 2021-08-03 08:25:31 -07:00
Li Li
f97b1decee Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am: ef12967b75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15395534

Change-Id: I997b46822bd83f9c9f7dc6a02e9514a95b3758a1
 2021-07-30 16:49:33 +00:00
Li Li
ef12967b75 Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev 2021-07-30 16:35:16 +00:00
lucaslin
4396c1b244 Fix Ikev2 vpn cannot establish through startLegacyVpn() 
Settings will also call startLegacyVpn() to bring up Ikev2 VPN,
so it's needed to add a vpn type check in startLegacyVpn().
Otherwise, UnsupportedOperationException will be thrown when
Settings tries to bring up Ikev2 VPN.

Bug: 191937302
Bug: 188749090
Bug: 189808606
Test: 1. make gts && gts-tradefed
      2. run gts --module GtsNetworkStackHostTestCases
Change-Id: I752c39bd1bf953a11bdf62e6f02f99f48fef23c4
Merged-In: I752c39bd1bf953a11bdf62e6f02f99f48fef23c4
 2021-07-30 06:25:21 +00:00
Li Li
bbe06e7b59 Freezer: fix exception when parsing /proc/locks 
The original code is based on /proc/locks manpage. Unfortunately, that
manpage is never correctly updated to include the new field for blocked
locks. The new code detects the extra field. As StringTokenizer is too
heavy, ProcFileReader is used for better performance.

Bug: 194756340
Test: FrameworksUtilTests com.android.internal.util.ProcFileReaderTest
Test: FrameworksCoreTests com.android.internal.os.ProcLocksReaderTest
Test: No /proc/locks parsing exception with blocked locks
Change-Id: I4c9763f9d3091f7d84d2e4b672d7e5cb78b33f59
 2021-07-29 09:18:53 -07:00
Daniel Solomon
ae50161de8 Merge "Revert "SCREEN_BRIGHTNESS - map 255 to current max"" into sc-dev am: d5e1458566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404418

Change-Id: I7782fd8704f1b7c2444b6630ce001875b19d6931
 2021-07-28 17:58:09 +00:00
Daniel Solomon
d5e1458566 Merge "Revert "SCREEN_BRIGHTNESS - map 255 to current max"" into sc-dev 2021-07-28 17:42:43 +00:00
Daniel Solomon
792229b553 Revert "SCREEN_BRIGHTNESS - map 255 to current max" 
This reverts commit 002e656a51.

Reason for revert: Setting brightness using adb (adb shell settings put system screen_brightness ...) results in different brightness being set by DisplayPowerController each time.

Bug: 194791517
Test: atest HighBrightnessModeControllerTest
Test: manually test `settings put system screen_brightness 23` yields
      consistent results
Change-Id: I6b49253b46e4d09a1f4129d3df950c9d36eb6ede
 2021-07-28 17:17:15 +00:00
Hai Zhang
831f5db04f Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302018

Change-Id: I2afc85c266bebcb88848c57a094ed0af757b277e
 2021-07-28 01:41:05 +00:00
Hai Zhang
af04dd2ad5 Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev 2021-07-28 01:23:12 +00:00
Siim Sammul
b77fb08506 Merge "Do not make a getThreadTimeMicro() call when it is not needed. This was accidentally changed with https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080830" into sc-dev am: 6c852aeabc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15346904

Change-Id: I73089da899cfe25a90f5d52d894ab3ba0291ef1b
 2021-07-26 09:25:51 +00:00
Siim Sammul
6c852aeabc Merge "Do not make a getThreadTimeMicro() call when it is not needed. This was accidentally changed with https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080830" into sc-dev 2021-07-26 09:14:43 +00:00
Alison Cichowlas
fa25c27e48 Merge "Sharesheet: remove 2 separators, restyle the 3rd." into sc-dev am: 832779a555 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377016

Change-Id: I0c1df12a77fdfafe0ab87d28400a77c84b42ceb6
 2021-07-24 06:06:52 +00:00
Alison Cichowlas
832779a555 Merge "Sharesheet: remove 2 separators, restyle the 3rd." into sc-dev 2021-07-24 05:53:04 +00:00
Alison Cichowlas
6e6455518c Sharesheet: remove 2 separators, restyle the 3rd. 
Test: Manual
Bug: 178619070
Change-Id: I9a6797863be2d0220fb71b2b9ca1d04c1f279b02
 2021-07-23 21:43:22 +00:00
Alison Cichowlas
ddbade4025 Merge "Sharesheet: be more defensive about un-unparcelable intents." into sc-dev am: a1d1a38269 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374840

Change-Id: I86883751c47eeb4f3bc2b5ba51ff6c4a154fba69
 2021-07-23 21:42:45 +00:00
Alison Cichowlas
a1d1a38269 Merge "Sharesheet: be more defensive about un-unparcelable intents." into sc-dev 2021-07-23 21:31:40 +00:00
Santos Cordon
379e94d1da Merge "SCREEN_BRIGHTNESS - map 255 to current max" into sc-dev am: e4e836a175 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359296

Change-Id: Ic2d569cc3c914945b8fc322b920f8aa6d7f9d007
 2021-07-23 20:17:24 +00:00
Santos Cordon
e4e836a175 Merge "SCREEN_BRIGHTNESS - map 255 to current max" into sc-dev 2021-07-23 20:13:55 +00:00
Alison Cichowlas
417b15994a Sharesheet: be more defensive about un-unparcelable intents. 
Test: atest ChooserActivityTest
Bug: 194359789
Change-Id: I2fb0c0e120f048042dea499e1ffc126989e0e2d2
 2021-07-23 12:17:29 -04:00
Alison Cichowlas
34ff8cdeaf Merge "Sharesheet: action bar is independent of WP tabs, should always launch as primary user." into sc-dev am: 9197f7b260 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363687

Change-Id: Idc076592b635f7787e6b41b53755e1933ae32b45
 2021-07-23 15:08:10 +00:00
Alison Cichowlas
9197f7b260 Merge "Sharesheet: action bar is independent of WP tabs, should always launch as primary user." into sc-dev 2021-07-23 14:54:12 +00:00
Alison Cichowlas
f0657fc49e Sharesheet: action bar is independent of WP tabs, should always launch 
as primary user.

Bug: 193424706
Test: atest ChooserActivityTest; manual per bug steps

Change-Id: Ie680270fa6a62ec59f35715514bfc0232b0d12f9
 2021-07-22 20:43:21 -04:00
Santos Cordon
002e656a51 SCREEN_BRIGHTNESS - map 255 to current max 
Since the current max can change for brightness due to
high-brightnes-mode (HBM), make it so that 255 is always mapped
to the current max, which can be different when in HBM or normal
brightness mode.

Bug: 187784093
Test: atest HighBrightnessModeControllerTest
Test: manually verify 255 is used for max when in HBM or not.
Change-Id: Ib0631fc12de0e8e4c7c638901d82c362e79944c3
 2021-07-22 18:34:37 +01:00
Nikita Ioffe
6cbb784216 Restrict what APEXes different installers can update am: e501fd8379 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331871

Change-Id: I3548f8a43e237fb3e7ee3d8ccaf303239153f5c1
 2021-07-22 17:21:18 +00:00
Siim Sammul
8f31e9d663 Do not make a getThreadTimeMicro() call when it is not needed. This was 
accidentally changed with https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080830

Bug: 193543224
Test: N/A no functionality change, just avoiding a method call
Change-Id: If4579e96cd5aab41a46f60b5133938e81d608cff
 2021-07-22 09:22:56 +00:00
Nikita Ioffe
e501fd8379 Restrict what APEXes different installers can update 
* Mainline APEXes can only be updated by a modulesInstaller (an entry
in whitelisted-staged-installer.xml with isModulesInstaller="true")

* The whitelisted-staged-installer.xml file can have only one entry with
isModulesInstaller="true"

* Vendor APEXes can only be updated by an installer defined in the
corresponding entry in vendor-apex-allowlist.xml.

BYPASS_INCLUSIVE_LANGUAGE_REASON=existing occurrences

Test: atest StagedInstallInternalTest
Test: atest GtsStagedInstallHostTestCases
Test: atest CtsRollbackManagerHostTestCases
Test: atest CtsStagedInstallHostTestCases
Bug: 190802380
Change-Id: I729abb5153df079fb6885016a4b41d0acc827e3c
 2021-07-21 16:44:42 +01:00