Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640,958 Commits 3 Branches 0 Tags
477fdc1a3ba2a820544bbe61dc638bcd8ebd64ce
Commit Graph

640958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hu
fe7e35ea07 Merge "Add RESTRICTED_ALLOWED_APPS setting" am: e6d2b4663e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689208

Change-Id: I93c004e7356559436c7dbd95716e52db8fc1ba0d
 2021-05-13 05:54:31 +00:00
Linzhao Ye
8bee21a405 Merge changes Id9a9451a,Idf113709 am: 03a24f50cc am: 0e751cd213 am: f47925ad3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702072

Change-Id: I483cfc93af04830ff50dfec5bfadf71c7578fd90
 2021-05-13 05:48:25 +00:00
Alexander Dorokhine
332dd22ff9 Merge "Refactor VisibilityStore's docs and maps to separate objects." into sc-dev 2021-05-13 05:33:54 +00:00
Paul Hu
e6d2b4663e Merge "Add RESTRICTED_ALLOWED_APPS setting" 2021-05-13 05:32:19 +00:00
Linzhao Ye
f47925ad3e Merge changes Id9a9451a,Idf113709 am: 03a24f50cc am: 0e751cd213 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702072

Change-Id: I7f50f681febf76724eac83508af6101a412deacd
 2021-05-13 05:16:00 +00:00
Linzhao Ye
0e751cd213 Merge changes Id9a9451a,Idf113709 am: 03a24f50cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702072

Change-Id: Ie027778a90deb5a3956f0e1dc9cbf462c9a4b50e
 2021-05-13 04:53:17 +00:00
Linzhao Ye
03a24f50cc Merge changes Id9a9451a,Idf113709 
* changes:
  Change the brackets in Persian keyboard layout.
  Change the brackets in Hebrew keyboard layout.
 2021-05-13 04:33:11 +00:00
Treehugger Robot
5ac4488fec Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 am: ad73e362f0 am: 41d04381e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447

Change-Id: I3247db1b8db8691705a3a7856d696a84f0fd1413
 2021-05-13 03:00:40 +00:00
Ken Chen
92bc335785 Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c am: 3ae939569e am: 233682e675 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: I53d58c5b2277ba2d88a848ed3e6d6269b4b886b3
 2021-05-13 03:00:17 +00:00
Ken Chen
523019423b Merge "Better log in createNativeNetwork" am: bd0ba5d94b am: d0ab30add0 am: 4be8e66448 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925

Change-Id: I963967771fff102b25ce102c56789904d5e3c342
 2021-05-13 02:59:56 +00:00
Ken Chen
2216da85aa Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: c9d5cd9fbc am: 62258932ff am: a4d53bfa6d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648

Change-Id: I3475e674c3914c4c61fd0a4246c9ee3e7e02c4fb
 2021-05-13 02:59:30 +00:00
Treehugger Robot
41d04381e9 Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 am: ad73e362f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447

Change-Id: I13644c975e38ef52635c9e55cc4ccca2b96902fd
 2021-05-13 02:45:15 +00:00
Ken Chen
233682e675 Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c am: 3ae939569e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: Id2e9d16c88088ef5d3ffe6f698af5ee8201c7716
 2021-05-13 02:45:06 +00:00
Ken Chen
4be8e66448 Merge "Better log in createNativeNetwork" am: bd0ba5d94b am: d0ab30add0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925

Change-Id: If8c106b8d0f2f71e47942a151de49daf1b65b852
 2021-05-13 02:44:48 +00:00
Ken Chen
a4d53bfa6d Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: c9d5cd9fbc am: 62258932ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648

Change-Id: Iec819a213f8c0daf50cdfdd5d580234ee5f8de68
 2021-05-13 02:44:30 +00:00
Minche Li
cf75811945 Merge "Adjusts measurement for magnification switch and drag handle" into sc-dev 2021-05-13 02:38:33 +00:00
Jeff Chang
5c62d1f9d6 Merge "Make no-history activity be finished with different tasks" into sc-dev 2021-05-13 02:35:37 +00:00
Treehugger Robot
ad73e362f0 Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447

Change-Id: I1e18b1b6c51ea0bb4c9db9623259161a75781f29
 2021-05-13 02:11:32 +00:00
paulhu
5ee5670cc1 Add RESTRICTED_ALLOWED_APPS setting 
This setting is OEM upstream requirement for third party apps
using restricted networks.

Bug: 185149952
Test: atests FrameworksNetTests
Change-Id: I5e16b46cf2935f38ee1e516bb8b85fa487cf9f61
 2021-05-13 10:09:31 +08:00
Ken Chen
3ae939569e Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: I18b5716252efc4f7c33ec8263c09df1f9396d1fe
 2021-05-13 02:05:37 +00:00
Ken Chen
d0ab30add0 Merge "Better log in createNativeNetwork" am: bd0ba5d94b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925

Change-Id: Ic8afb71d7ac099f6c492dda8f9f54a5da3c79649
 2021-05-13 02:01:21 +00:00
Joe Hsu
c73c098665 Merge "Check FontFamily null before adding it." into sc-dev 2021-05-13 01:59:02 +00:00
Treehugger Robot
fa8d51d5a6 Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." 2021-05-13 01:57:26 +00:00
Ken Chen
601eb97832 Reference unreachable netId from INetd 
Bug: 181579204
Test: m; atest FrameworksNetTests
Change-Id: I7b59483d888e556ae50a37da539501b046295c16
 2021-05-13 09:45:18 +08:00
Wei Sheng Shih
a9cbf391e0 Merge "Enable app reveal animation after splash screen." into sc-dev 2021-05-13 01:40:49 +00:00
Wei Sheng Shih
0287fee40f Merge "Fix ActivityRecord leak if starting window was transferred." into sc-dev 2021-05-13 01:37:10 +00:00
Ken Chen
62258932ff Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: c9d5cd9fbc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648

Change-Id: Ia7b8d56ee75194cfe289dbb3e73667f43344cda3
 2021-05-13 01:34:23 +00:00
Ken Chen
785dc4871c Merge "Add testVpnTypesEqual to verify consistency" 2021-05-13 01:22:08 +00:00
Dmitri Plotnikov
b5d43c6b71 Merge "Do realistic data mocking in BluetoothPowerCalculatorTest" into sc-dev 2021-05-13 01:22:04 +00:00
Ken Chen
bd0ba5d94b Merge "Better log in createNativeNetwork" 2021-05-13 01:21:47 +00:00
Ken Chen
c9d5cd9fbc Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" 2021-05-13 01:20:39 +00:00
Joe Bolinger
7d19b1ef7a Add extra flags to biometrics proto for tests. 
Bug: 185290945
Test: atest android.server.biometrics.fingerprint.FingerprintServiceTest#testRejectThenErrorFromForegroundActivity
Change-Id: I10cfdf0a2183643f9957b2a6f8a9448a8de858a0
 2021-05-12 18:08:20 -07:00
TreeHugger Robot
1e1c864bc1 Merge "Fix BatteryStats Screen On timer reset" into sc-dev 2021-05-13 00:55:43 +00:00
TreeHugger Robot
5c681088e4 Merge "More benchmark tweaks" into sc-dev 2021-05-13 00:53:03 +00:00
Janis Danisevskis
bebe5b7c52 Fixed KeyGenParameterSpecTest 
Test: atest KeystoreTests
Change-Id: If663677b01738025dca01bf209b634c1d04c6be4
 2021-05-12 17:29:26 -07:00
Janis Danisevskis
738e422b00 Keystore 2.0 SPI: Fix NPE in getUniqueAliases. 
getUniqueAliases may return a null if an error occurred. This would lead
to a NPE in engineAliases.

This patch makes getUniqueAliases return an empty HashSet instead.

Test: atest KeystoreTests

Change-Id: I387d90ea851a8b9c18bb2b20d1a0bfc1ab76c99f
 2021-05-12 17:29:26 -07:00
TreeHugger Robot
ef36e9f960 Merge "Move boot test to postsubmit" into sc-dev 2021-05-13 00:13:07 +00:00
Joe Bolinger
7f40c4b4ef Merge "Respond to lockout reset requests from the HAL." into sc-dev 2021-05-13 00:12:53 +00:00
Adam He
bddf9536c7 Remove onTranslationResultCallback and use a Consumer instead. 
* Deprecated old apis, changed private class CallbackWrapper to
implement consumer instead.

Fixes: 187872807
Test: atest CtsTranslationTestCases
Change-Id: Ie70ad2166a72ec34947266a137d0c382ffb35575
 2021-05-12 17:09:53 -07:00
Siarhei Vishniakou
85d8f5c669 Do not recreate ImeInputEventSender for the same channel 
InputEventSender is used to send events to an InputChannel. On the other
side, InputEventReceiver receives the events and processes them.

There's no good way to synchronize InputEventSender and
InputEventReceiver today. If the InputEventSender object changes in the
middle of interaction with the InputEventReceiver, it will confuse the
receiver. Recently added strict checking of state in InputEventReceiver
causes the other side to crash.

In the IME case, there are dup'ed InputChannel being compared to each
other by object. Since the objects are different, the equality check
fails, even though they represent the same connection. This causes the
InputEventReceiver to receive a sequence of events like this:

incoming event seq = 1
incoming event seq = 2
incoming event seq = 3
incoming event seq = 1
incoming event seq = 2
...

If the InputEventReceiver is slow, it might only send finished signal
after it processed first event with seq = 2, but the sender has already
changed, and has already sent a new event with seq = 2. This would cause
the receiver to overwrite the state of the second event with the first
event, thus later causing a crash when it tries to ack the second event.

The events received by the InputEventReceiver should all have unique
seq. The pattern of re-creating InputEventSender breaks this contract.

To fix this issue, we check whether the provided InputChannel represents
the same connection. If the connection is the same, we do not re-create
the InputEventSender, and just keep using the same object. This ensures
that InputEventReceiver is always communicating with only one
InputEventSender and the state remains consistent.

In this CL, only a minimal change is made, and it is not rootcaused why
the 'setInputChannelLocked' call is being made for the same connection.

Bug: 183434055
Test: adb shell monkey 10000; run this test several times until it
crashes. No more crashes observed with "Abort message: 'Could not find consume time for seq=2'"
Test: use soft keyboard on device

Change-Id: If8317941dd1c6d5db77f1239b9a9f45d49997df9
 2021-05-13 00:06:28 +00:00
Janis Danisevskis
04d5622233 Keystore 2.0 SPI: Silence warning about blocking calls to Keystore. 
Test: N/A
Bug: 184108046
Change-Id: I7401b88e5055cb781113656021f3ec274d1951a4
 2021-05-12 16:53:14 -07:00
Cody Kesting
be6088d11c Merge changes I4b135749,If4fcaa52 am: 576dad4673 am: cd4e6ae6d6 am: 5cdc27d2ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704175

Change-Id: I7d636497dbc26008e659495e4236f161c90599ab
 2021-05-12 23:40:05 +00:00
Linzhao Ye
5423b6dfc2 Merge "Change the '[]' and '<>' brackets in Arabic keyboard layout." am: 5c1879cb60 am: 27095d7536 am: c985b4066c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702070

Change-Id: I72dbe8a141f29c4621bc6036a8aff39eb04e79a8
 2021-05-12 23:39:30 +00:00
TreeHugger Robot
bf25b68828 Merge "mLocalDeviceIdleController could be null." into sc-dev 2021-05-12 23:33:51 +00:00
Jeff DeCew
cd86f38402 Merge "Allow populating left_icon independently of right_icon." into sc-dev 2021-05-12 23:32:35 +00:00
John Reck
3920768c72 More benchmark tweaks 
Bug: 187718492
Test: this
Change-Id: Ie0cad91e1c7d1a02704fc4b1007ba2c28cb2b3e7
 2021-05-12 19:29:03 -04:00
TreeHugger Robot
85dda65c28 Merge "Clarify the semantics of ACTION_SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" into sc-dev 2021-05-12 23:28:51 +00:00
Nate Myren
4f15c208b4 Ensure paused ops are finished correctly 
Fixes: 187976515
Test: atest SensorPrivacyCameraTest,SensorPrivacyMicrophoneTest
Change-Id: I0f9a752d30a3330e58ff85396130d07297350533
 2021-05-12 16:26:01 -07:00
TreeHugger Robot
bb793e1b1f Merge "Exclude scrim padding when calculating stack height on lockscreen" into sc-dev 2021-05-12 23:22:01 +00:00
Michael Wachenschwanz
96906f72e3 Fix BatteryStats Screen On timer reset 
StopwatchTimer reset uses elapsedRealtime not uptime

Bug: 187844042
Test: builds + boots
Change-Id: I82286d74fef6256971361e70a787a2b39a7cbba4
 2021-05-12 16:19:02 -07:00