Commit Graph

14527 Commits

Author SHA1 Message Date
Tianjie Xu
f3bde71026 Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da am: cd4836d197
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649651

Change-Id: I6aabf1250d67f6a79711e89fb05c68bf84849656
2021-04-14 06:32:31 +00:00
Tianjie Xu
246c14d6da Merge "Improve the error handling for armRebootEscrow" 2021-04-14 05:23:07 +00:00
Bill Yi
4167bf213c Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE
Merged-In: I735b41ed53ce7d374b5d36c4aee79f73d0334234
Merged-In: I9999bfe514fffa9f300643e74942db5ae556670a
Change-Id: If4b670a158e561d8feb03e12aef2d295c5109d43
2021-04-13 19:36:45 -07:00
Roland Levillain
1e3aafb013 Merge "Fix typo in documentation of ZygoteCommandBuffer.nativeForkRepeatedly." am: 304329d202 am: 87744c8b58
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673345

Change-Id: I09389f60afbcf40532e140ce42e27f8ef9576ff6
2021-04-12 17:00:40 +00:00
Roland Levillain
904ec85b61 Fix typo in documentation of ZygoteCommandBuffer.nativeForkRepeatedly.
Test: none (documentation change)
Change-Id: I3373f33b1d3a292f79129048733f7ecacb5c4907
2021-04-12 13:37:03 +00:00
Tianjie
6066898f42 Improve the error handling for armRebootEscrow
The change including the following items
1. Add error code for armRebootEscrow
2. Fail the armRebootEscrow for mismatching ror providers.
3. clear the escrow data for fatal armRebootEscrow
4. clear the RoR preparation state in recovery system for fatal
   armRebootEscrow

Bug: 183140900
Test: atest FrameworksServicesTests:RebootEscrowManagerTests;
      atest FrameworksServicesTests:RecoverySystemServiceTest;
      Change provider before reboot, reboot-and-apply failed;
Change-Id: I266ea6f2e1c77994d5cc8c2713106c527c4e0722
2021-04-09 13:18:18 -07:00
Siim Sammul
a1a4e83e95 Merge "Add dplotnikov@ and gaillard@ as owners for Binder related files" am: dea9900796 am: 4bb24cce53
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663985

Change-Id: Iba4ffa2f74d4fa04889f9e05dbf1e7462cfce4e9
2021-04-07 21:36:06 +00:00
Siim Sammul
756e87e336 Add dplotnikov@ and gaillard@ as owners for Binder related files
Change-Id: Ib3db46b8f0840780bb06090ec46005e5ab392343
2021-04-07 07:08:31 +00:00
Janis Danisevskis
66ead4fb0b Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" am: a8b1b1a2e6 am: 08945c21ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624872

Change-Id: I9efb4419a7dac6e1bb7d99f31e7776759cea9491
2021-04-03 01:16:07 +00:00
Janis Danisevskis
a8b1b1a2e6 Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" 2021-04-03 00:21:18 +00:00
Hans Boehm
d5301eb3bf Merge "Rename to isIndefiniteThreadSuspensionSafe" am: 0bf32e7e7b am: b7f0eacf8f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662663

Change-Id: Id06325d1294f14f65795488d3ebe00dc7ccd0f4c
2021-04-02 18:16:03 +00:00
Hans Boehm
0bf32e7e7b Merge "Rename to isIndefiniteThreadSuspensionSafe" 2021-04-02 17:29:53 +00:00
Janis Danisevskis
a6dcf091f5 Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references
Bug: 171305684
Test: CtsKeystoreTestCases
Change-Id: I337515dadc9e45b909bff058d4e13371b4fa843c
2021-04-01 17:06:41 -07:00
Hans Boehm
6fbea7cbbd Rename to isIndefiniteThreadSuspensionSafe
Bug: 181707712
Test: Build and boot AOSP
Change-Id: I0d95578cf689223a75fcb132f092805d77b1805b
2021-04-01 14:10:31 -07:00
Steven Moreland
7c8edecd6d Merge "IBatteryStats.aidl update path" am: 2a27671122 am: 0fd713954b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661234

Change-Id: If052ba67117e377e1db06c1f2a19159593a73d2d
2021-04-01 19:31:07 +00:00
Steven Moreland
2a27671122 Merge "IBatteryStats.aidl update path" 2021-04-01 18:08:11 +00:00
Aaron Huang
5b1b6bf264 Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e427565991 am: 40b438abcc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861

Change-Id: Ideb5a5abbd074a8c905861e902977c442317fc02
2021-04-01 16:45:22 +00:00
Aaron Huang
e427565991 Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" 2021-04-01 15:59:39 +00:00
Aaron Huang
42951ddb37 Move some constants from TrafficStatsConstants to NetworkStackConstants
Keep the constants are only used by framework in TrafficStatsConstants
and move the others to NetworkStackConstants which is in libs/net.

Bug: 182349970
Test: FrameworksNetTests
      NetworkStackTests
      TetheringTests
Change-Id: Ib667c115e5f1e01237d88b77bba753363da309cc
Merged-In: Ib667c115e5f1e01237d88b77bba753363da309cc
2021-04-01 05:10:03 +00:00
Steven Moreland
de4e95ed68 IBatteryStats.aidl update path
header moved

Bug: 183654927
Test: N/A
Change-Id: I5a74323f14da8aec636b4dea6eb22eae528556be
2021-03-31 23:46:34 +00:00
Treehugger Robot
cbbe436700 Merge "Notify CellLocation whenever ACTION_USER_SWITCHED" am: 2a5efce2d7 am: 4a73b5f3b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550658

Change-Id: I796876646ef59d15fb1d9f1bd8b751af4c0ec304
2021-03-30 19:47:51 +00:00
Treehugger Robot
2a5efce2d7 Merge "Notify CellLocation whenever ACTION_USER_SWITCHED" 2021-03-30 19:01:17 +00:00
Taesu Lee
9a218febc2 Notify CellLocation whenever ACTION_USER_SWITCHED
Notify device's cell location when ACTION_USER_SWITCHED even though no
changes.
And 1st arg of notifyCellLocationForSubscriber() shall be subId instead.

Bug: 177495399
Test: atest TelephonyRegistryTest

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Merged-In: I6761c4bb500da1748119f9917663dae0307ab437
Change-Id: I6761c4bb500da1748119f9917663dae0307ab437
2021-03-30 17:47:48 +00:00
Treehugger Robot
f555b4252e Merge "Create a new permission to override Overridable change ids" am: 44008b63fb am: a5b9c920e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1599153

Change-Id: I2f32113b8421c56ad9e0705ce240eed71c323c61
2021-03-25 18:06:23 +00:00
Treehugger Robot
44008b63fb Merge "Create a new permission to override Overridable change ids" 2021-03-25 17:35:45 +00:00
Benjamin Franz
229b809643 Create a new permission to override Overridable change ids
With this change we allow system packages with the new permission to
override ChangeIds specifically annotated as Overridable to set
overrides even on non-debuggable builds.

Bug: 174043039
Bug: 175874108
Test: atest FrameworksServicesTests:CompatConfigTest
Test: atest FrameworksServicesTests:PlatformCompatTest
Change-Id: Ib8d5d83b5fd62acb5808d10f5c413616f29ee65c
Merged-In: Ib8d5d83b5fd62acb5808d10f5c413616f29ee65c
2021-03-25 16:07:32 +00:00
SongFerng Wang
935980c740 Merge "The phone didn't reload the allowed Network Type" am: cfa02cd687 am: 3dd9c6bf01
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641903

Change-Id: I4dc32278e38dc6b3d859a9b097375618b9b3cb40
2021-03-22 03:56:37 +00:00
SongFerng Wang
cfa02cd687 Merge "The phone didn't reload the allowed Network Type" 2021-03-21 16:45:59 +00:00
Jeff Sharkey
cc506c3882 Merge "OWNERS for a few Voice Interaction files." am: d702544c9f am: 32e4b44b47
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643650

Change-Id: I60706a7e6b932a322720632017596f7e75bc9880
2021-03-19 20:36:01 +00:00
Jeff Sharkey
d702544c9f Merge "OWNERS for a few Voice Interaction files." 2021-03-19 19:21:48 +00:00
Treehugger Robot
a5e337b0b3 Merge "Keystore 2.0: Enable by default." 2021-03-19 16:06:00 +00:00
TreeHugger Robot
58710e9a15 Merge "Keystore 2.0: Enable by default." into rvc-qpr-dev-plus-aosp 2021-03-19 15:05:00 +00:00
SongFerngWang
84bced4979 The phone didn't reload the allowed Network Type
Reload the allowed Network after device insert SIM card.
Change the behavior of notifyAllowedNetworkTypesChanged.
Log print String representation of the allowed network types.
Bug: 180903931
Bug: 179814490
Test: atest cts/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java#testSetAllowedNetworkTypesForReason_moreReason
atest cts/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java#testSetAllowedNetworkTypesForReason
atest android.telephony.cts.TelephonyCallbackTest

Change-Id: Icfffea3c74ecf6938455d841da9d6175f6aa07de
Merged-In: Icfffea3c74ecf6938455d841da9d6175f6aa07de
2021-03-19 21:56:17 +08:00
Janis Danisevskis
8b15af2a92 Keystore 2.0: Enable by default.
Keystore 2.0 is to replace Keystore. This patch removes
checking the keystore2 enable property and installs the Keystore 2.0 SPI
by default.

cherry-pick from commit 7aa8d2aae2

Bug: 171563717
Test: N/A
Merged-In: I13a3db8ca736cceb06e864457046ff9ca641322d
Change-Id: I13a3db8ca736cceb06e864457046ff9ca641322d
2021-03-18 22:53:49 +00:00
Kai Shi
1224d2650b Merge "Add the LCE system API" am: 26ba4d0d09 am: 855075a2c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643471

Change-Id: I19a67dc2479548452f96c82e91c2a236ffbbf8ad
2021-03-18 22:46:08 +00:00
Ahaan Ugale
70e3812542 OWNERS for a few Voice Interaction files.
Change-Id: I8855c9bd420e0c1708ca4443e1acac038ec0082f
2021-03-18 05:14:00 +00:00
Kai Shi
857391f361 Add the LCE system API
Add the link capacity estimate system API.
Remove the system API of getCarrierBandwidth() and CarrierBandwidth as
they are replaced by the new LCE system API in PhoneStateListener.

Bug: 180434672
Bug: 176814680
Test: manual test of the new LCE system API in LinkBandwidthEstimator
Test: atest -c PhoneStateListenerTest

Merged-In: I5899acf02006a164e31f9b82aeaa7974dd6d2869
Change-Id: I5899acf02006a164e31f9b82aeaa7974dd6d2869
2021-03-17 18:56:11 -07:00
Remi NGUYEN VAN
b9a3b1b03b Merge "Remove Protocol.BASE_* usage in Connectivity" am: 5dad6d6e5b am: 1cab8428b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629266

Change-Id: Ib94847ab028a1ead9a283148206ec688ce02582e
2021-03-17 15:50:15 +00:00
Janis Danisevskis
3194dc36b5 Keystore 2.0: Enable by default.
Keystore 2.0 is to replace Keystore. This patch removes
checking the keystore2 enable property and installs the Keystore 2.0 SPI
by default.

Bug: 171563717
Test: N/A
Merged-In: I13a3db8ca736cceb06e864457046ff9ca641322d
Change-Id: I13a3db8ca736cceb06e864457046ff9ca641322d
2021-03-17 08:47:28 -07:00
Remi NGUYEN VAN
4ea08c2ab4 Remove Protocol.BASE_* usage in Connectivity
ConnectivityManager and NetworkAgent do not share their handler with any
other component, so there is no reason to use addresses that do not
overlap. Protocol.BASE_* was written to allow for interaction "between
different StateMachine implementations without a conflict", but the
classes do not use StateMachine, and they do not have such interactions.

Bug: 177046265
Test: atest FrameworksNetTests
Change-Id: I18c341d4a2c01cb9559d682a9ad1ff259e6b5855
2021-03-17 20:56:50 +09:00
Remi NGUYEN VAN
0eae8ebfd9 Merge "Move LocationPermissionChecker to libs/net" am: a89a2ae676 am: eb7e0ad2c1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618840

Change-Id: I01d73266a4b4923ab098bfb6f50155d90b1effec
2021-03-17 01:42:30 +00:00
Remi NGUYEN VAN
a89a2ae676 Merge "Move LocationPermissionChecker to libs/net" 2021-03-17 00:13:21 +00:00
Treehugger Robot
25c0656b54 Merge "Adds OWNERS file" am: fa31d37ac7 am: f690d62fa2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635326

Change-Id: I03e6053d9e30230c8d970fd25679964d671f7a2e
2021-03-15 17:26:38 +00:00
TYM Tsai
d12fef90c5 Adds OWNERS file
Those files under view/inline/ are related the Autofill inline
suggestions.

Bug: 177641730
Test: N/A
Change-Id: I0b6ac33a29757f2489441c69450ccacea4f756da
2021-03-15 17:37:16 +08:00
Andrei-Valentin Onea
3fb101a052 Merge changes Idd7d86f9,I73569744 am: 420476e0cd am: 086acc1ba8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idec178eb39c014c9817db666fd3d5b5a39be52ba
2021-03-12 14:38:40 +00:00
Andrei-Valentin Onea
420476e0cd Merge changes Idd7d86f9,I73569744
* changes:
  Do not enable changes newer than the current sdk
  Add support for loading a static overrides file located in /product.
2021-03-12 13:28:50 +00:00
Treehugger Robot
4f3026147a Merge "Added mount to OWNERS for RecyclerView and ViewPager" am: 2273adedcd am: 62aa26cacb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7b9ca5d814aa27e295c46b755af35743de5d434
2021-03-12 00:25:20 +00:00
George Mount
029208ebdd Added mount to OWNERS for RecyclerView and ViewPager
As requested, mount was added to OWNERS for RecyclerView
and ViewPager as changes are occasionally needed by UI
toolkit team.

Test: None
Change-Id: Ie3d49d0d5ddf092d2dd0680c6a067b2fe6b81f94
2021-03-11 21:27:55 +00:00
Andrei Onea
7bf80c14ac Do not enable changes newer than the current sdk
Do not allow enabling compat changes in APEX gated on an sdk version
greater than the current one.

Test: atest OverrideValidatorImplTest
Test: atest PlatformCompatTest
Bug: 175790344
Bug: 179149558
Change-Id: Idd7d86f96a380bfe01940f356d38ad49d3f27678
2021-03-10 13:36:36 +00:00
Jeff Sharkey
d2cd30f2cc Merge "Wait for installd to start to perform dexopt operation" am: 3f0f0b686a am: ee20cc3ca1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b80a78b7e017e7c8bce69d856b321de6dc9357d
2021-03-10 00:05:37 +00:00