Commit Graph

565314 Commits

Author SHA1 Message Date
Tianjie Xu
bc71ae1489 Merge "Delay loadEscrowData from locksettings" am: 60edeec07e am: cd9d960d23
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ea608a47dc07a2cd96b5c6d1e9dfd4c42f366df
2021-02-11 22:57:36 +00:00
Tianjie Xu
cd9d960d23 Merge "Delay loadEscrowData from locksettings" am: 60edeec07e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ef3ce66e9771bc8864c84c91330c2947a74c673
2021-02-11 22:35:37 +00:00
Tianjie Xu
60edeec07e Merge "Delay loadEscrowData from locksettings" 2021-02-11 21:52:11 +00:00
Tianjie
1c98980d00 Delay loadEscrowData from locksettings
For server-based ror, we want to deplay loadEscrowData until
1. Binding to Gmscore works
2. Network is available

So we factor out the loadEscrowData to be called later in the
start sequence of system server. Also make the function async
so that we can retry on temporarily failures.

Bug: 172780686
Test: run server based ror

Change-Id: If71f8974f94eb1be2ab896e95601377196e01790
2021-02-11 21:52:01 +00:00
Janis Danisevskis
9112917eb8 Merge "Adding device ID attestation to KeyGenParameterSpec" am: 3faed136d5 am: 0072df0d03
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2847baa64bdc5c2b949c5e87f6bffb1ad4986bea
2021-02-11 21:08:55 +00:00
Janis Danisevskis
0072df0d03 Merge "Adding device ID attestation to KeyGenParameterSpec" am: 3faed136d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2736d762f4b3675a2c6471c07ec79e0fd09c2864
2021-02-11 20:27:17 +00:00
Janis Danisevskis
3faed136d5 Merge "Adding device ID attestation to KeyGenParameterSpec" 2021-02-11 20:03:01 +00:00
Winson
68c83e6346 Parcel queriesProviders in ParsingPackageImpl am: 985d71551d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I346dbe05f1319f24af7b8fd36ebc26eee1e379bc
2021-02-11 19:42:12 +00:00
Winson
985d71551d Parcel queriesProviders in ParsingPackageImpl
This was broken in the original migration, causing this field to be
dropped on reboot.

Bug: 178209505

Test: TODO, separate change will include comprehensive parceling test

Change-Id: I67219fe00c7b92677391fd46305bf0424d74e5f3
(cherry picked from commit 00f69942be)
2021-02-11 16:57:08 +00:00
Roland Levillain
c455df115b Merge changes from topic "int32ref" am: 2d29d2d82b am: 4212e4479f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8511efa59e8d8617f48d62ee52d9e7ae15458253
2021-02-11 13:06:09 +00:00
Daulet Zhanguzin
be67bbad65 Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of am: 3f22cb1106 am: 612b33fa9a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8fbbbc5f4f25998fb2ae8c42c5e0392c18f9510
2021-02-11 13:06:03 +00:00
Roland Levillain
4212e4479f Merge changes from topic "int32ref" am: 2d29d2d82b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86dde2fef971759b4720cfb242e8954baacf9d84
2021-02-11 12:43:56 +00:00
Daulet Zhanguzin
612b33fa9a Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of am: 3f22cb1106
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab4679528ce95ee246b6f2ff0dd0038b6e6a4b35
2021-02-11 12:42:35 +00:00
Roland Levillain
2d29d2d82b Merge changes from topic "int32ref"
* changes:
  [Mainline] android.system package APIs migration
  Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of libcore
2021-02-11 12:05:36 +00:00
Grace Jia
b609dab7b7 Merge "Set default value of EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE true." am: f67a99fe60 am: a8cafc65ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571460

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I487626731aed71285fa359470b01e4227f5162c4
2021-02-11 03:48:52 +00:00
Grace Jia
a8cafc65ff Merge "Set default value of EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE true." am: f67a99fe60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571460

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a7a05d26765f15a07f8882def2cfffdc613fd81
2021-02-11 03:36:32 +00:00
Treehugger Robot
8b5269dd90 Merge "Add OWNERS file for provider tests" am: 8aad810051 am: 1b31fd8a96
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1576395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I548c61d860441c5028de5b58e9e4e3750fcdaef2
2021-02-11 03:36:20 +00:00
Grace Jia
f67a99fe60 Merge "Set default value of EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE true." 2021-02-11 03:23:42 +00:00
Treehugger Robot
1b31fd8a96 Merge "Add OWNERS file for provider tests" am: 8aad810051
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1576395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2dc2080fa07b91855d3ee41e11f26f391a7a60ff
2021-02-11 02:47:57 +00:00
Calin Juravle
cfdc5df93c Merge "Use the same reason for OTAs and First Boots" am: 274d200460 am: dbbebbe0a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc7ef2f65ed04ddc97c5fe27f33f5b2a5a23f127
2021-02-11 02:47:25 +00:00
Treehugger Robot
8aad810051 Merge "Add OWNERS file for provider tests" 2021-02-11 02:28:40 +00:00
Calin Juravle
dbbebbe0a1 Merge "Use the same reason for OTAs and First Boots" am: 274d200460
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7886572a64c84161273ed8c01d6c511265a784dc
2021-02-11 02:23:10 +00:00
Calin Juravle
274d200460 Merge "Use the same reason for OTAs and First Boots" 2021-02-11 02:07:59 +00:00
Tim Murray
8cacd6d97e CachedAppOptimizer: don't take AM lock when freezer is not enabled am: 8f5e000257
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13546408

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d203ea2c92a77d155a30cf797dd75dd5cc0a918
2021-02-11 00:19:55 +00:00
Kholoud Mohamed
3b96b5cb0d Merge "Add new permission KEEP_UNINSTALLED_PACKAGES" am: 141033c6cc am: b185d3d024
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id55a2dc25a0537635606a286d9d197e7bc7e5960
2021-02-10 22:23:37 +00:00
Tianjie Xu
a3f211f409 Merge "Add shell command to set package" am: 11b13adfb7 am: 44593bf4ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560109

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6dc2be939bee9193c8de853ed3db7d977129a1e
2021-02-10 22:22:47 +00:00
Tim Murray
8f5e000257 CachedAppOptimizer: don't take AM lock when freezer is not enabled
Freezing and unfreezing don't reqiure the AM lock when freezer is not
enabled.

Test: boot, no lock contention on unfreezeTemporarily
Bug: 161866124

Change-Id: Ic650456aa8938db38b368042ce3f42fa43e7a130
Merged-In: Ic650456aa8938db38b368042ce3f42fa43e7a130
2021-02-10 22:12:12 +00:00
Kholoud Mohamed
b185d3d024 Merge "Add new permission KEEP_UNINSTALLED_PACKAGES" am: 141033c6cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf56fd7d4db81abc8622a72752268925c4c23060
2021-02-10 22:02:12 +00:00
Tianjie Xu
44593bf4ac Merge "Add shell command to set package" am: 11b13adfb7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560109

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55b5612e4b93039718e13b8ef08165f156708099
2021-02-10 21:56:26 +00:00
Kholoud Mohamed
141033c6cc Merge "Add new permission KEEP_UNINSTALLED_PACKAGES" 2021-02-10 21:35:03 +00:00
Tianjie Xu
11b13adfb7 Merge "Add shell command to set package" 2021-02-10 21:23:53 +00:00
Tianjie Xu
ae40794528 Merge "Reset binder during unbinding" am: eda5da6b92 am: 03b0f9ca87
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fbf4bd553453537d45afdd5553dd7839df95238
2021-02-10 19:52:06 +00:00
Yan Yan
26bceb2583 Merge changes from topic "ike-bcp" am: 073c6fa957 am: 32420c3397
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2422b977fafa2382960cd769bab1380ca5b138e5
2021-02-10 19:37:26 +00:00
Yan Yan
39390a1561 Add IKE stub to main Android SDK am: f8b973c3f6 am: b587eebfee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e93aedc63d97cdff91895d5102bcd1035ad2dc2
2021-02-10 19:37:22 +00:00
Tianjie Xu
03b0f9ca87 Merge "Reset binder during unbinding" am: eda5da6b92
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51950d4e58ded2218a317b7a3ad1983bd6986bed
2021-02-10 19:28:37 +00:00
Yan Yan
32420c3397 Merge changes from topic "ike-bcp" am: 073c6fa957
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05a7cc5ac68c6fa1c552ae0276e5019f9e94daed
2021-02-10 19:24:05 +00:00
Yan Yan
b587eebfee Add IKE stub to main Android SDK am: f8b973c3f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4316d201a5c253ef9c73505943b21e1d0141bbb9
2021-02-10 19:20:15 +00:00
Tianjie Xu
eda5da6b92 Merge "Reset binder during unbinding" 2021-02-10 18:46:50 +00:00
Tianjie
dc2b792589 Reset binder during unbinding
On some rare case, we may encounter a DeadObjectException on wrap()
when a new test app is installed. This happens because we reuse the
binder from the previous bindToService() call. Always reset the
binder to make sure this doesn't happen.

Bug: 172780686
Test: run storeRebootEscrowKey twice

Change-Id: I36150ef39f870e38a5f1b4bd814465d70f8dbf85
2021-02-10 18:46:42 +00:00
Yan Yan
073c6fa957 Merge changes from topic "ike-bcp"
* changes:
  Ignore "android.net.ipsec.ike" <uses-library> tag
  Add IKE stub to main Android SDK
2021-02-10 18:41:41 +00:00
Treehugger Robot
df594989e6 Merge changes from topic "b/167709539" am: ad688d3e8c am: 7d360a08a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564601

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib162f0d936d4876987dbc2beceb570955bd9530d
2021-02-10 18:32:15 +00:00
Hridya Valsaraju
5e4dadb0a0 Add total size of DMA-BUFs exported to 'dumpsys meminfo' am: 363d44d7a0 am: 8bff83e9ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564878

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I785980e4fffc757be8ee269adf0b8e6e151e8dc9
2021-02-10 18:32:12 +00:00
Hridya Valsaraju
6320b051a7 Rename getIonMappedSizeKb to getDmabufMappedSizeKb am: 6ae0be89b9 am: 8ce7111610
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1576749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2037b8b38eeac285f54973f1287494b146710539
2021-02-10 18:32:08 +00:00
Treehugger Robot
7d360a08a0 Merge changes from topic "b/167709539" am: ad688d3e8c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564601

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b479ecc6524c0c1ba24bee365ccc07a7e88d1f7
2021-02-10 18:09:05 +00:00
Hridya Valsaraju
8bff83e9ff Add total size of DMA-BUFs exported to 'dumpsys meminfo' am: 363d44d7a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564878

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17fd9f11e20e1c1ac216cff4224298d7fd7c2a00
2021-02-10 18:06:27 +00:00
Hridya Valsaraju
8ce7111610 Rename getIonMappedSizeKb to getDmabufMappedSizeKb am: 6ae0be89b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1576749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I892f92e8fa37d0f71f679c633b59b5c9523547ff
2021-02-10 18:03:59 +00:00
kholoud mohamed
9b6b3d9445 Add new permission KEEP_UNINSTALLED_PACKAGES
Created a new permission KEEP_UNINSTALLED_PACKAGES and
granted it to shell, this new permission will be used to expose
PM#setKeepUninstalledPackages as a testAPI, this is needed
to enable the new testing infrastructure to reinstall
removed packages between test runs as part of the state resetting.

Bug: 179682115
Test: atest PermissionPolicyTest#platformPermissionPolicyIsUnaltered
Merged-In: I2b262f3694478631d657cdbf088b6511072d4ff3
Change-Id: I2b262f3694478631d657cdbf088b6511072d4ff3
2021-02-10 17:58:50 +00:00
Treehugger Robot
ad688d3e8c Merge changes from topic "b/167709539"
* changes:
  Add total DMA-BUF heap pool size information to dumpsys meminfo
  Add total size of DMA-BUFs exported to 'dumpsys meminfo'
  Rename getIonMappedSizeKb to getDmabufMappedSizeKb
2021-02-10 17:37:30 +00:00
Calin Juravle
2fcf50c8ed Use the same reason for OTAs and First Boots
Quicken is now deprecated and there is no good reason to have OTAs
handled differently then first boots when it comes to the compiler
filter.

With this changes we will have:
- OTA and FirstBoot using pm.dexopt.first-boot reason
- BackgroudDexOptService# post-boot job using pm.dexopt.boot reason

Also, clean dalvik-cache pruning which is no longer a thing.

Test: m
Bug: 172114559
Change-Id: I75b388b211314bcc7cfee8d8394c3d81ffef2cc7
2021-02-10 09:30:29 -08:00
Benjamin Franz
6d10995b52 Merge "Add OWNERS file to core/java/android/app/compat" am: efea156fe5 am: ebb589a5a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10c2ecf0eb054adc8b0973b1937771288c879e86
2021-02-10 16:42:03 +00:00