Janis Danisevskis
0f138dc0cc
Keystore 2.0: Remove attestKey from KeyChain.
...
KeyChain supports device id attestation through KeyGenParameterSpec now.
No need to call attest key individually. Also calling attest key
individually is no longer supported by Keystore 2.0 and KeyMint.
Also isBoundKeyAlgorithm returns true.
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Bug: 171305387
Change-Id: I759fe245b48fe435153fded2c74c9ae99634c146
2021-02-23 12:19:47 -08:00
Janis Danisevskis
6d23bc6d7e
Keystore 2.0: Fix correct handling of Uid/Namespace
...
AndroidKeyStoreKeyPairGeneratorSpi used the Uid as namespace which is
wrong, and ParcelableKeyGenParameterSpec inadvertently used the Uid as
namespace specifier during conversion.
Bug: 160623310
Test: com.android.keychain.tests.BasicKeyChainServiceTest#testGenerateKeyPairErrorsOnBadUid
Change-Id: I84b4c69c639e42922449e00a3708cef89b82f63e
2021-02-23 09:06:34 -08:00
Julia Reynolds
3ac3d91ffb
Add pkg target to snoozing alarm am: 88854d15ef am: dd443f19c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676685
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e0ad435f654fb7c53065e3c8e0263dbad858067
2021-02-23 17:04:12 +00:00
TreeHugger Robot
b8c58162a5
Merge "Set updatable:false explicity." into sc-dev
2021-02-23 16:46:03 +00:00
Songchun Fan
df9c8ba64b
Merge "[pm] smooth transition from install progress to incremental loading progress" into sc-dev
2021-02-23 16:36:17 +00:00
Bill Yi
d1abb4514b
Merge changes from topic "presubmit-am-7c51810dea554e608d68c4cef8661e4d" into sc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 921b7e30ef
Import translations. DO NOT MERGE ANYWHERE
2021-02-23 16:26:31 +00:00
Julia Reynolds
dd443f19c0
Add pkg target to snoozing alarm am: 88854d15ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676685
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifc44908bb9d98ae079db51b0f1278b945d63c0f4
2021-02-23 16:15:49 +00:00
Makoto Onuki
35c53e2a73
Merge "Throw more descriptive exceptions when service start isn't allowed." into sc-dev
2021-02-23 16:05:30 +00:00
TreeHugger Robot
7a3fd41443
Merge "Ensure that ProxCheck doesn't run a callback twice." into sc-dev
2021-02-23 15:54:26 +00:00
Mathew Inwood
d7bbb7a190
Set updatable:false explicity.
...
This is currently the default value but this is changing.
Bug: 180375550
Test: Treehugger
Change-Id: Ibf0523c03c3559f78f8e9f191e0487237ae44564
2021-02-23 15:13:51 +00:00
Taran Singh
6ba3501f98
Merge "Avoid IME restart for configChanges" into sc-dev
2021-02-23 15:04:42 +00:00
TreeHugger Robot
d620cd52cf
Merge "Enable PeopleSpaceActivity on services starting" into sc-dev
2021-02-23 14:33:05 +00:00
Fabian Kozynski
3a7ba7c2c2
Merge "Fix defined DrawableWrappers with proper ConstantState" into sc-dev
2021-02-23 14:29:20 +00:00
Julia Reynolds
88854d15ef
Add pkg target to snoozing alarm
...
Test: SnoozeHelperTest
Bug: 174493336
Change-Id: I6aaf80a11dcae2eca41d4647411126ed41587027
(cherry picked from commit 6b5813b1f1 )
2021-02-23 14:10:39 +00:00
Julia Reynolds
d82de4e838
Merge "Add pkg target to snoozing alarm" into sc-dev
2021-02-23 14:09:44 +00:00
TreeHugger Robot
25cc8e41e6
Merge "Disable resetting WRITE_MEDIA_IMAGES and WRITE_MEDIA_VIDEO appops" into sc-dev
2021-02-23 13:48:04 +00:00
Fiona Campbell
e34ae6b7d3
Merge "Ensure DDC is not null" into sc-dev
2021-02-23 13:20:40 +00:00
Nathalie Le Clair
972aacc02f
Merge "Always start DeviceSelectAction with <Set Stream Path>" into sc-dev
2021-02-23 12:59:22 +00:00
Jacqueline Bronger
41b553c037
Merge "Reuse phone privacy indicator impl. for tv" into sc-dev
2021-02-23 12:46:46 +00:00
JW Wang
ae91b315ee
Merge "Do proper cleanup" into sc-dev
2021-02-23 12:42:20 +00:00
Sergey Nikolaienkov
d358a9f65a
Merge "Add compat info to WindowManager proto dump" into sc-dev
2021-02-23 12:29:43 +00:00
Robert Shih
83cb9b390e
Merge "MediaCodec: comprehensive CryptoException messages" into sc-dev
2021-02-23 12:29:36 +00:00
Flavio Fiszman
499c498a1f
Enable PeopleSpaceActivity on services starting
...
Change-Id: I4b031d20230877238310be9c5b6224e92111f873
Test: manual
Bug: 180159156
2021-02-23 12:09:33 +00:00
Marin Shalamanov
82dae09201
Merge "Invalidate desiredDisplayModeSpecs when SF specs are invalid" into sc-dev
2021-02-23 12:08:13 +00:00
Sean Stout
303e58eebf
Merge "Request power state updates for individual DisplayGroups" into sc-dev
2021-02-23 11:21:15 +00:00
Sudheer Shanka
5d8fc4abae
Merge "Add new network process capability." into sc-dev
2021-02-23 11:10:57 +00:00
TreeHugger Robot
0ae316971f
Merge "Fix java crash" into sc-dev
2021-02-23 10:40:18 +00:00
Jacqueline Bronger
80d0df53a6
Reuse phone privacy indicator impl. for tv
...
The UI is TV specific
Bug: 180500214
Test: atest CameraMicIndicatorsPermissionTest
Test: atest RecognitionServiceMicIndicatorTest
Change-Id: I9fe87f838e303dcbf252a9b83a7ceddcfe3b3513
2021-02-23 10:37:24 +00:00
Xin Li
5075d304ec
[automerger skipped] Merge ab/7061308 into stage. am: be473bf819 -s ours am: 6c90c4e502 -s ours
...
am skip reason: Change-Id I4bf82035631ccff6d5a6144d6d9b1d203b076851 with SHA-1 3078660c4e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13657544
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I831ba618445a338cc57e0cdbff65e3c44aeaf93f
2021-02-23 10:35:03 +00:00
Stevie Kideckel
990269dd07
Merge "Expose tint lists and other runtime functionality to RemoteViews" into sc-dev
2021-02-23 10:18:10 +00:00
Marin Shalamanov
ae9cd8f407
Invalidate desiredDisplayModeSpecs when SF specs are invalid
...
When a display change occurs we change if the SF display specs
are different than the current. However if the SF base mode is
no longer supported we don't invalidate. This CL fixes that and
adds a test for the broken scenario.
In order to test this scenario we introduce SurfaceControlProxy,
which we mock in the unit test. This is needed because the
code under test is accessing SurfaceControl from multiple threads
and we mock static method only works for the test thread.
Bug: 179926030
Test: atest LocalDisplayAdapterTest
Change-Id: I69d4dbb1e4ae59a6a38f35d2497a85cece9f4875
2021-02-23 10:57:27 +01:00
Tony Huang
f9a0ccc0e7
Merge "Make AppTransition animations sharable (2/n)" into sc-dev
2021-02-23 09:26:05 +00:00
Bill Yi
3d3614115e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 921b7e30ef
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13671381
Change-Id: I4fdf614e7083025a4b60e479eed1c6f3026bf630
2021-02-23 09:21:54 +00:00
Bill Yi
921b7e30ef
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If6efb31ae6395b10cc23cf458319f9e57174151a
2021-02-23 09:21:21 +00:00
Xin Li
6c90c4e502
[automerger skipped] Merge ab/7061308 into stage. am: be473bf819 -s ours
...
am skip reason: Change-Id I4bf82035631ccff6d5a6144d6d9b1d203b076851 with SHA-1 3078660c4e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13657544
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie387abaa6af0c76ebd6801707d21443ebbda5c93
2021-02-23 09:05:19 +00:00
Rhed Jao
891f69f441
Merge "Reduce lock contention in the package manager dump" into sc-dev
2021-02-23 08:34:09 +00:00
Chris Ye
98580a2e82
Merge changes from topic "LightsManager" into sc-dev
...
* changes:
Support input device lights manager feature in frameworks.
Add SET_REPORT data output to hid commandline tool.
2021-02-23 08:19:13 +00:00
Sergey Nikolaienkov
b0ad9cd284
Add compat info to WindowManager proto dump
...
Bug: 168419799
Test: atest CtsWindowManagerDeviceTestCases:CompatScaleTests
Change-Id: Idc321d5f1376a32b2b1b34b1a099cf12d96c943d
2021-02-23 08:09:05 +00:00
Jin Seok Park
95e716b904
Merge "Change using Handler to using Executor" into sc-dev
2021-02-23 07:55:49 +00:00
TreeHugger Robot
1284ffd3f5
Merge "Refine the condition about force layout" into sc-dev
2021-02-23 07:52:11 +00:00
TreeHugger Robot
acd9169191
Merge "Add taskId to bubble xml" into sc-dev
2021-02-23 07:49:18 +00:00
Hugh Chen
e0881dfb3e
Fix java crash
...
This CL added a null check when getting bluetooth class
to avoid java crash.
Bug: 180019938
Test: make -j42 RunSettingsLibRoboTests
Change-Id: Id1d7c7f021edde3bbbd4f715eeabd7c468b2a794
2021-02-23 15:26:39 +08:00
Sean Stout
0e9bb71eda
Request power state updates for individual DisplayGroups
...
Update PowerManagerService to track and update the power state of
DisplayGroups individually.
This allows for different Displays to be on or off instead of needing to
all share the same power state.
Bug: 138328918
Test: atest FrameworksServicesTests:PowerManagerServiceTest
Change-Id: Ia32039415863ba745c7de2fba55bf25e68de4d15
2021-02-22 23:18:42 -08:00
Mill Chen
f026ec2dfc
Merge "Create a collapsing toolbar based activity" into sc-dev
2021-02-23 06:58:58 +00:00
TreeHugger Robot
ffb2d862e5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-02-23 06:55:44 +00:00
Louis Chang
878589db08
Merge "Log activity relaunch" into sc-dev
2021-02-23 05:58:33 +00:00
TreeHugger Robot
4a94d3965b
Merge "SurfaceControlViewHost: Always set FLAG_HARDWARE_ACCELERATED for embedded views" into sc-dev
2021-02-23 05:49:53 +00:00
Rhed Jao
ccf04851e6
Reduce lock contention in the package manager dump
...
Applications frequently anr while the bugreport is capturing.
The problem is relevant to the package manager held the lock
contention long time in its dump. This patch removes the long
lock in the dump. Instead, it adds locks to each dump section.
A new `dump` function in the ComputerEngine is added also. The
sections which could be dumped withoud a lock are moved to it.
Bug: 178304105
Test: adb bugreport
Change-Id: Id3020ce335b81d79a1ce7ecb17d5a6cc1e428560
2021-02-23 12:12:26 +08:00
TreeHugger Robot
9924535b29
Merge "3/ Add wmHelper to controll the state of test activity" into sc-dev
2021-02-23 03:20:10 +00:00
Michael Wright
3da8947ade
Merge "Add sensor for flip to screen off. See go/flip-to-screen-off-design-doc for design details." into sc-dev
2021-02-23 03:15:14 +00:00