Commit Graph

640958 Commits

Author SHA1 Message Date
Tianjie Xu
a90fe61200 Merge "Check null for before using LockSettingsService" am: 964fccfefd am: e3e7ed125e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674887

Change-Id: Ic7fab8afb1e55038e86f224b5cebf55cee5d8bc3
2021-05-11 05:53:07 +00:00
Benedict Wong
62135157e0 Merge "Add log prefixes to uniquely identify each VCN/gwConn" am: fae9ba6535 am: af9b507963
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700307

Change-Id: Ibb41f5d50b446c9718f3a3b9b862b5b158988876
2021-05-11 05:52:50 +00:00
Benedict Wong
600401154a Merge changes from topic "vcn-fwd" am: d7d2d2a15b am: f980436b32
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I4e11bdfa3e887103673a354aad7f9b5fa746ac9e
2021-05-11 05:52:26 +00:00
lpeter
e0fafd2146 Use binder thread instead of main thread in HotwordDetectionService
Bug: 180945857
Test: atest CtsVoiceInteractionTestCases
Test: atest CtsVoiceInteractionTestCases --instant
Change-Id: Ib3424b49eb3ae15dbddf6126ae296bcaf7d6b73b
2021-05-11 13:46:43 +08:00
Tianjie Xu
e3e7ed125e Merge "Check null for before using LockSettingsService" am: 964fccfefd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674887

Change-Id: I90dee9936f4ad8ef17fcb4850e0e29de63411416
2021-05-11 05:43:25 +00:00
Benedict Wong
af9b507963 Merge "Add log prefixes to uniquely identify each VCN/gwConn" am: fae9ba6535
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700307

Change-Id: I7096daeb9d45dcedbebf5c95b9c681c1e1c78935
2021-05-11 05:37:35 +00:00
Benedict Wong
f980436b32 Merge changes from topic "vcn-fwd" am: d7d2d2a15b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I7f02785727c73c27ac498ad4663f25252242c6e0
2021-05-11 05:26:46 +00:00
Nader Jawad
fdccce02ba Merge "Updated StretchEffect types" into sc-dev 2021-05-11 05:22:15 +00:00
liuxiaoyu7
82c6cbd595 audio:fix STREAM_SYSTEM_ENFORCED index when camera sound forced
set index to indexMax

Signed-off-by: liuxiaoyu7 <liuxiaoyu7@xiaomi.com>
Change-Id: I542a4e7c8b2465a496055e0f65aacd470388384c
2021-05-11 13:02:40 +08:00
Winson Chung
d011237d39 Merge "Add test api to gc system and sysui" into sc-dev 2021-05-11 05:02:35 +00:00
Tianjie Xu
964fccfefd Merge "Check null for before using LockSettingsService" 2021-05-11 04:50:15 +00:00
Bill Yi
a3142d3c7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa5779f75a -s ours am: ea08e99a83 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41da300d1dd4eea915a19aadaf21bd346cb7c779
2021-05-11 04:38:33 +00:00
Ady Abraham
b154792a39 HWUI: mSerialContext needs to outlive other serializing members
mSerialContext is used as the serialization context, and need to
outlive mOpenMultiPicStream and mMultiPic and those are referencing
it in SkSharingSerialContext SkSharingSerialContext::serializeImage

Test: https://buganizer.corp.google.com/issues/182710292#comment16
Bug: 183049238
Change-Id: I25842e492d5efd7a7532964bddca61559d50ebe1
2021-05-11 04:27:54 +00:00
TreeHugger Robot
38e5def5ce Merge "Modify error codes and improve descriptions" into sc-dev 2021-05-11 04:22:40 +00:00
Chris Li
e870d13d34 Fix NPE for checking immersive confirmation window root feature
This may happen when the immersive mode change is triggered from
the window removal. In this case, it will not be attached to a root.

Bug: 186072738
Test: manual
Change-Id: I546f9f651e3f6a26f506ed7269683b9bffa32926
2021-05-11 04:22:39 +00:00
Bill Yi
ea08e99a83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa5779f75a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9638abc00fb62c580444eecde93062d847e59e3a
2021-05-11 04:20:52 +00:00
Chris Li
43d99647e4 Determine whether to support activities in multi window (5/n)
Update Task/ActivityRecord to use the new elgibility check and update
tests

Bug: 176061101
Test: pass existing
Change-Id: Ibb78a43d5901a604b02904be0a0bfdc6da0eb421
2021-05-11 04:20:49 +00:00
Roshan Pius
f4d57c090d Add a UWB subsystem uid
Bug: 186788640
Bug: 187766150
Test: Compiles
Change-Id: I6b67c2f7243c50c83cb159c50519a318892f6941
Merged-In: I6b67c2f7243c50c83cb159c50519a318892f6941
(cherry picked from commit 3d8a9d18a7)
2021-05-11 04:16:45 +00:00
Riddle Hsu
81e85863e5 Merge "Skip creating config context if it is the same as current" into sc-dev 2021-05-11 04:15:57 +00:00
Charles Chen
c8bf38ce25 Merge "Fix IME switch dialog crash on Dual rootDA display" into sc-dev 2021-05-11 04:08:49 +00:00
TreeHugger Robot
66fcb0d72d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-11 04:01:00 +00:00
TreeHugger Robot
55bd70ffe1 Merge "Support global key can be dispatched from non-interactive" into sc-dev 2021-05-11 03:46:50 +00:00
Hongwei Wang
57618b94ef Merge "Unify round corner radius in PipSurfaceTransactionHelper(s)" into sc-dev 2021-05-11 03:23:11 +00:00
Hongwei Wang
40c2601ec5 Merge "Pass the float9 values in PictureInPictureSurfaceTransaction" into sc-dev 2021-05-11 03:20:17 +00:00
Edgar Wang
ab7c9a5d79 Merge "Rename resource name to avoid build conflict in another path." into sc-dev 2021-05-11 02:28:08 +00:00
TreeHugger Robot
793ae837f5 Merge changes from topic "ClusterState.displayId" into sc-dev
* changes:
  Adds car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL to CarSystemUI.
  Removes car.permission.ACCESS_PRIVATE_DISPLAY_ID from ClusterHome.
2021-05-11 02:20:28 +00:00
shubang
5afdd12cfe Modify error codes and improve descriptions
Bug: 167036690
Test: atest MediaMetricsAtomTests
Change-Id: Ib34f402d29043cdda839340e23e26a40e82e57f2
2021-05-10 19:10:35 -07:00
Jeff DeCew
7996c44352 Increase the max height of Heads Up notifications.
143dp = 88dp (standard notif height) + 55dp (single line remote input height)

Fixes: 184715845
Test: manual
Change-Id: I74b83f78b1dc0b859b512db46163f67bca9e7053
2021-05-10 21:59:17 -04:00
Michael Wachenschwanz
fa2a4f44bd Wipe BatteryStats on Custom Power Bucket change
If the supported OTHER EnergyConsumers change after a reboot, the
MeasuredEnergyStats from the reboot can no longer be considered valid.

Bug: 178504428
Test: atest FrameworksCoreTests:com.android.internal.power.MeasuredEnergyStatsTest
Change-Id: I2561c459c0b2a881661bd2913f9413a2cbd96abb
2021-05-10 18:55:47 -07:00
Jeff DeCew
df7223b8e0 Simplify SmartReplyView padding layout logic
The horizontal padding used to be dynamic based on the number of lines, but that hasn't been true for a while.  The new goal is for padding to always be 16dp, except that the action icon is in the middle of that.

Fixes: 78876518
Test: manual visual inspection with notify
Test: atest SmartReplyViewTest
Change-Id: I11400a552cab99d9f0ae31024d5973772e8ea300
2021-05-10 21:55:05 -04:00
Jeff DeCew
0ffd1564d1 Smart action buttons now have 8dp corner radius
Bug: 187533622
Test: manual/visual testing

Change-Id: I49461363ca5171ff6346b602bf9e90e4bab92c53
2021-05-10 21:55:05 -04:00
Jeff DeCew
c6d567d239 Fix measure logic so that priority children can have more than 1/N space.
The priority previously just put the view at the front of the list, which ensured that super long user-provided actions couldn't cause the priority action at the end to be truncated.  However, this still meant that a priority action at the start whose text would have it be longer than 1/3 of the action space would be capped at 1/3 instead of taking on some of the user-defined child's space.

Bug: 187533622
Test: Post Notify2 app's Call style w/ Screen action; notice that "Decline" is not truncated.

Change-Id: Ia18b2dc366ba7cac13ed845acac59d89206e7d5e
2021-05-10 21:55:04 -04:00
TreeHugger Robot
a5d90cd21a Merge "Fix NPE in AppExitInfo statsd logging" into sc-dev 2021-05-11 01:43:50 +00:00
Jeff DeCew
2ca6b4399a Update the style of emphasized notification actions.
* This removed many of the differences between CallStyle and emphasized actions.
* These actions are now pill shaped with a solid bg color, no stroke, less height, less spacing between, and wrapping content instead of splitting space equally.

Fixes: 187533622
Test: manual testing with Notify, Notify2, and Clock (using timers and alarms)
Change-Id: I8c554755755c59f2756870f7cd2e0c533d22d823
2021-05-10 21:41:52 -04:00
Benedict Wong
fae9ba6535 Merge "Add log prefixes to uniquely identify each VCN/gwConn" 2021-05-11 01:34:58 +00:00
Shuo Qian
68417637dd Revert "Use TelephonyManager#isEmergencyNumber() instead"
Revert submission 1453740-replace_with_isEmergencyNumber

Reason for revert: <Telephony service may not up while calling this, causing failures.>

This also cherry picks ag/14444738

Change-Id: I5aa71917ce1b2abcdfcf78b8988d128982a6b3ec
Bug: 132703886
Bug: 181062609
Bug: 187720309
Merged-In: I5df03a61f55f863e17594aa3239433a5048a4890
2021-05-11 01:32:44 +00:00
Benedict Wong
d7d2d2a15b Merge changes from topic "vcn-fwd"
* changes:
  Apply transform to FWD policy if configured to provide tethering
  Add internal support for IPsec forward policies
2021-05-11 01:30:31 +00:00
Benedict Wong
9bde08840f Add clarifying comments on for IPsec forward policies
This change adds clarifying comments for the usage of the forward
policies in IPsec, and corrects a comment to properly specify the
permissions allowed.

Bug: 185495453
Test: Comment-only changes
Change-Id: I6d36522c344c41b0ebd90d46b216d115b678dd31
2021-05-10 18:26:02 -07:00
lucaslin
bfb3e5088f Remove sendNetworkConditionsBroadcast
sendNetworkConditionsBroadcast is removed, so
TestNetworkStackService.kt cannot override it anymore,
otherwise there will be a build break when running this
test.
Also add a comment for NETWORK_CONDITIONS_MEASURED in
AndroidManifest.xml.

Bug: 124415874
Test: atest FrameworksNetIntegrationTests
Change-Id: I7b43940dc32826c70fa82f471b35bc5cb8394aad
Merged-In: I7b43940dc32826c70fa82f471b35bc5cb8394aad
2021-05-11 09:25:54 +08:00
Dmitri Plotnikov
7b32d78264 Merge "Convert BatteryStats.dumpLocked from BatteryStatsHelper to BatteryUsageStats" into sc-dev 2021-05-11 01:24:56 +00:00
Li Li
b6691f191b Fix negative freezer timeout
Bug: 183735766
Test: Manually feed negative timeout and verified it's set to default
Change-Id: I8cbf9d543d2b23720541994857a1fda689313826
2021-05-10 18:22:48 -07:00
lucaslin
c737926795 Remove sendNetworkConditionsBroadcast
sendNetworkConditionsBroadcast is removed, so
TestNetworkStackService.kt cannot override it anymore,
otherwise there will be a build break when running this
test.
Also add a comment for NETWORK_CONDITIONS_MEASURED in
AndroidManifest.xml.

Bug: 175213041
Test: atest FrameworksNetIntegrationTests
Change-Id: I7b43940dc32826c70fa82f471b35bc5cb8394aad
Merged-In: I7b43940dc32826c70fa82f471b35bc5cb8394aad
2021-05-11 01:12:56 +00:00
Arthur Hung
169f362e1c Support global key can be dispatched from non-interactive
Add adddional element 'dispatchWhenNonInteractive' in global key xml to
allow it could be dispatched from non-interactive mode if the key is a
wake key. That could help user press button to wake device and send the
global button broadcast without pressing the same button twice.

The receiver could use 'GlobalKeyIntent.from(Intent)' to get the
detail global key information from the received Intent.

Bug: 183071267
Test: manual
Change-Id: I4eef4a5fd92baece995fa7ddf535f0791923f694
Merged-In: I4eef4a5fd92baece995fa7ddf535f0791923f694
2021-05-11 01:10:38 +00:00
Tianjie
31b3cbf029 Check null for before using LockSettingsService
If the locksettings service fails to start, the resume on reboot
APIs will throw a nullptr exception in RecoverySystemService. Add
some check to prevent crashing the system server.

Bug: 184596745
Test: build
Change-Id: I5b1781612ec8d855d94b2828b5b5cfee9a84aebe
2021-05-10 18:01:16 -07:00
Menghan Li
f774ba0dac Merge "Apply dark theme for volume key shortcut warning dialog" into sc-dev 2021-05-11 00:57:44 +00:00
John Li
ebad1be9bb Merge "Add javadoc for Secure.UI_TRANSLATION_ENABLED" into sc-dev 2021-05-11 00:45:55 +00:00
TreeHugger Robot
661c982576 Merge "Try to create Typeface before writing to config file" into sc-dev 2021-05-11 00:24:44 +00:00
Vova Sharaienko
a89d79ba31 AMS: added caching DataInputStream object
DataInputStream is cached for the lmkd socket communication
Since the LmkdConnection ByteBuffer is allocated once,
no need to dynamically allocate DataInputStream,
just do a reset() before using

Bug: 184698933
Test: lmkd_unit_test - test check_for_oom tests lmkd message send to AMS
Test: statsd_testdrive 51 54 to inspect statsd logged atoms data
Change-Id: I9b65d82618654d59236c79be8cd8da66bc90c91c
Merged-In: I9b65d82618654d59236c79be8cd8da66bc90c91c
2021-05-11 00:22:58 +00:00
Ryan Mitchell
2fedba9a32 Add <staging-public-group-final> to aapt2
To allow apps that compiled against a pre-release SDK to continue
working for a period of time after API finalization, a new tag,
<staging-public-group-final>, has been added to aapt2.

When finalizing the framework resource API, converting
<staging-public-group> tags to <staging-public-group-final> will
cause aapt2 to generate the resource table so that there is a resource
entry for the old non-finalized (staged) resource ID and another entry
for the finalized resource ID of newly finalized resources. This allows
an application that compiled against the pre-release SDK to continue
resolving resources using pre-release resource IDs.

All references to pre-release resource IDs will be rewritten to their
finalized resource IDs through the information stored in the new staged
alias chunk. This allows applications compiled against
<staging-public-group> resources to use the newly finalized
resource ID without re-compilation.

When an application is re-compiled against the SDK with
<staging-public-group-final> tags, the application will use the
finalized resource IDs.

This change limits the use of the alias chunk to the framework for S.

Bug: 183411356
Test: aapt2_test
Change-Id: Iba1c3033c3c2f32de8e4a19b58d3921c971092c4
2021-05-10 17:22:33 -07:00
Jing Ji
9a03b11636 Fix NPE in AppExitInfo statsd logging
Bug: 184859606
Bug: 154511130
Test: statsd_testdrive
Test: atest CtsStatsdAtomHostTestCases:AppExitHostTest
Change-Id: I50193d6dd734bfcc8241aa8d4edf487d742926ec
2021-05-10 17:21:42 -07:00