Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
566,126 Commits 3 Branches 0 Tags
08f03dc59cc35d016c05081619c7fd99882f8afe
Commit Graph

566126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Almaz Mingaleev
08f03dc59c Merge "Re-throw system server exception." am: 112cd8df86 am: c76d1a4c26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25dc972b3303e1950eb8a7192852876e2e1fad5b
 2021-02-26 10:05:16 +00:00
Dmitry Dementyev
25de7c49b8 Merge "Migrate recoverablekeystore to KeyStore V2." am: dbf8a7c1bd am: 26085ee2ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1603470

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5931135d2d5d4acdfe18284344f99775f64ce44
 2021-02-26 10:03:11 +00:00
Almaz Mingaleev
c76d1a4c26 Merge "Re-throw system server exception." am: 112cd8df86 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39697856d7fee18200e7405d84a45add58d60921
 2021-02-26 09:19:15 +00:00
Dmitry Dementyev
26085ee2ff Merge "Migrate recoverablekeystore to KeyStore V2." am: dbf8a7c1bd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1603470

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f96343c65df7accaae3fb5032771dbcd05191f5
 2021-02-26 09:14:43 +00:00
Almaz Mingaleev
112cd8df86 Merge "Re-throw system server exception." 2021-02-26 08:42:36 +00:00
Dmitry Dementyev
dbf8a7c1bd Merge "Migrate recoverablekeystore to KeyStore V2." 2021-02-26 06:13:35 +00:00
Junyu Lai
bc88904010 Merge "Fix copyright license of VpnTransportInfo" am: 594e8def4c am: 9044d1e472 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1172acbf1f7cb693dd06db368fe5fe70dcc11858
 2021-02-26 04:35:13 +00:00
Janis Danisevskis
36dfffbdbe Merge "Keystore 2.0: Clear Uid/Namesapce" am: a51a74a8c5 am: 6413a11508 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604089

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99a812efeb0ad269f59118cecee7cae183bac041
 2021-02-26 04:33:55 +00:00
Daniel Bright
b50587319e Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: cc318221a5 am: 9c4102e2a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib29e39622ec998bc911cdd5ec220692c7b6f5ea0
 2021-02-26 04:17:06 +00:00
Remi NGUYEN VAN
b6f07bbf46 Merge "Fix CaptivePortalDataTest on R" am: fada307ddf am: 04dd0eb01a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605013

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib748e01e114866042996e61383151c2500fa8868
 2021-02-26 04:16:35 +00:00
Remi NGUYEN VAN
e456ac2061 Merge "Add public alternative for protectFromVpn" am: 2c49d21ce1 am: 25a7767cc7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95739021d8f70ce1d5371b21ab4357061082bf16
 2021-02-26 04:16:21 +00:00
Junyu Lai
9044d1e472 Merge "Fix copyright license of VpnTransportInfo" am: 594e8def4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifed529b4a91bb3c52acb3d1ce708a5999a2bb595
 2021-02-26 03:56:16 +00:00
Janis Danisevskis
6413a11508 Merge "Keystore 2.0: Clear Uid/Namesapce" am: a51a74a8c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604089

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1457c57433442dfa02810b7253682f6f8c9344f2
 2021-02-26 03:39:27 +00:00
Junyu Lai
594e8def4c Merge "Fix copyright license of VpnTransportInfo" 2021-02-26 03:38:59 +00:00
Daniel Bright
9c4102e2a1 Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: cc318221a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d895a966dfc6501435503516f08c1b7c5a73f17
 2021-02-26 03:35:59 +00:00
Remi NGUYEN VAN
04dd0eb01a Merge "Fix CaptivePortalDataTest on R" am: fada307ddf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605013

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbfed272ece8e1f4c437281fc6ca46de793520fe
 2021-02-26 03:25:46 +00:00
Remi NGUYEN VAN
25a7767cc7 Merge "Add public alternative for protectFromVpn" am: 2c49d21ce1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I759af534bdf50f647351056275857c056998bf14
 2021-02-26 03:22:03 +00:00
Janis Danisevskis
a51a74a8c5 Merge "Keystore 2.0: Clear Uid/Namesapce" 2021-02-26 03:04:30 +00:00
Louis Chang
0492435ea2 [automerger skipped] Merge "Stop keeping freeform activities visible." into rvc-qpr-dev am: f0bd7906d0 -s ours 
am skip reason: Change-Id Ibeeba5ca8b6b60583eec9cbee9b7209ee17b1037 with SHA-1 1bb6900a61 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90aa7044066cfe15ee894c8323b76ef9ec0deecd
 2021-02-26 02:44:38 +00:00
Daniel Bright
cc318221a5 Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" 2021-02-26 02:34:42 +00:00
Calin Juravle
6c05b32085 Merge "Migrate deleteOdex functionality to DexManager" am: 41207e284c am: 5383d7a776 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52838e77164a45ed0509c471a49d349884c406f2
 2021-02-26 02:01:33 +00:00
Tianjie Xu
1ff02233c5 Merge "Fix a typo for the server blob timeout" am: 5c9ebe31ab am: afb76f685c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607353

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80a7951db38ddcf0c8a7d73cbd6eec9887f00505
 2021-02-26 02:00:16 +00:00
Remi NGUYEN VAN
fada307ddf Merge "Fix CaptivePortalDataTest on R" 2021-02-26 01:51:14 +00:00
Remi NGUYEN VAN
2c49d21ce1 Merge "Add public alternative for protectFromVpn" 2021-02-26 01:50:32 +00:00
Louis Chang
f0bd7906d0 Merge "Stop keeping freeform activities visible." into rvc-qpr-dev 2021-02-26 01:38:43 +00:00
Dmitry Dementyev
16491e1316 Migrate recoverablekeystore to KeyStore V2. 
Test: manual
Bug: 171305545
Change-Id: Id415be48cab6852df155b5b2dbaf941ef54cd5a4
 2021-02-25 16:42:15 -08:00
Calin Juravle
5383d7a776 Merge "Migrate deleteOdex functionality to DexManager" am: 41207e284c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c9b75a7d254c2140ad7ff2b04191a877bee57ad
 2021-02-26 00:30:58 +00:00
Tianjie Xu
afb76f685c Merge "Fix a typo for the server blob timeout" am: 5c9ebe31ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607353

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8344f14a1cc68a5bbf743a7f42ed1db1ccf4b174
 2021-02-25 23:48:00 +00:00
Calin Juravle
41207e284c Merge "Migrate deleteOdex functionality to DexManager" 2021-02-25 23:42:53 +00:00
Chris Weir
d7b355bf4c Merge "Update tests for PANS network usage metrics" am: b1cba34bfd am: 3d6031160f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic312169c70b34bb8a834efae5ebb6b1a6cbb0296
 2021-02-25 22:27:54 +00:00
Chris Weir
e30a010ca3 Merge "Add support for tracking PANS data usage" am: 90261da202 am: eebeb725a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffa334fef43ad248173703d34864d859668225a1
 2021-02-25 22:27:50 +00:00
Collin Fijalkovich
93b0c8574e Merge "Avoid TransferPipe for local dumpCacheInfo calls" am: d43c415293 am: cbeda8a777 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595394

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9614628a8ea1672e16c085cf403c24acd376b768
 2021-02-25 22:27:20 +00:00
Tianjie Xu
5c9ebe31ab Merge "Fix a typo for the server blob timeout" 2021-02-25 22:20:05 +00:00
Chris Weir
3d6031160f Merge "Update tests for PANS network usage metrics" am: b1cba34bfd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ac8031b7e405226a1b055be3c80eb902d48338b
 2021-02-25 21:52:40 +00:00
Chris Weir
eebeb725a8 Merge "Add support for tracking PANS data usage" am: 90261da202 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If14211a988289a217c9eabb3cd43bc41959de346
 2021-02-25 21:50:22 +00:00
Collin Fijalkovich
cbeda8a777 Merge "Avoid TransferPipe for local dumpCacheInfo calls" am: d43c415293 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595394

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I729802dba729501c639cd018b6c4d650fb48c44f
 2021-02-25 21:41:44 +00:00
Chris Weir
b1cba34bfd Merge "Update tests for PANS network usage metrics" 2021-02-25 21:37:42 +00:00
Chris Weir
90261da202 Merge "Add support for tracking PANS data usage" 2021-02-25 21:37:42 +00:00
Collin Fijalkovich
d43c415293 Merge "Avoid TransferPipe for local dumpCacheInfo calls" 2021-02-25 21:03:15 +00:00
Brian Stack
a4c042dc10 Merge "Remove unnecessary UWB functions" am: 752aee7e04 am: ce702151e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595291

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00b0cec989adda880b767fca9014d01a0c83eec1
 2021-02-25 20:24:33 +00:00
Brian Stack
ce702151e8 Merge "Remove unnecessary UWB functions" am: 752aee7e04 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595291

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ba56120d6b63a0ec4e50c3c1c6f2fe64906c308
 2021-02-25 19:44:19 +00:00
Brian Stack
752aee7e04 Merge "Remove unnecessary UWB functions" 2021-02-25 19:16:03 +00:00
Danny Epstein
eed3786c2c Merge "Configure privapp perms for car activity resolver" into rvc-qpr-dev am: ad312a6c1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13587640

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5076885ec223e164e7526cbc30c1ac8c7d8ac4be
 2021-02-25 19:06:55 +00:00
Jeff Sharkey
7427154889 Merge "update owner for shortcut related test cases" am: ff07d10d0f am: b560df126c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fe428227f06e68774eb32036ab526ef8c66a1e5
 2021-02-25 19:06:28 +00:00
Daniel Bright
c018a8ce65 Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" 
0acda00463

Change-Id: Ia55b965fc43efa239ec6d502f37fc8ef6b6bb916
Merged-In: Ie31d32a08b10b8c125f27832e81a3e65b6d8767a
 2021-02-25 18:50:56 +00:00
Danny Epstein
ad312a6c1d Merge "Configure privapp perms for car activity resolver" into rvc-qpr-dev 2021-02-25 18:15:54 +00:00
Danny Epstein
528f19fa8b Configure privapp perms for car activity resolver 
(Cherry picked from change b04a4567a141d6f82fe1df6d0fb8baf4369eb8a6.)

Test: Use KitchenSink's activity resolver fragment with touch and
      rotary.
Bug: 173543124
Change-Id: If7e5d48ce5d897a2cd90a02eaeda59e71d164520
Merged-In: If7e5d48ce5d897a2cd90a02eaeda59e71d164520
 2021-02-25 18:15:01 +00:00
Jeff Sharkey
b560df126c Merge "update owner for shortcut related test cases" am: ff07d10d0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35d21ff281953df49e36d9ccbd4c02fa4a0f6a37
 2021-02-25 18:05:04 +00:00
Jeff Sharkey
ff07d10d0f Merge "update owner for shortcut related test cases" 2021-02-25 17:32:54 +00:00
Janis Danisevskis
d5dd5ebaed Keystore 2.0: Clear Uid/Namesapce 
Implement uid/namespace clearing for Keystore 2.0.

Test: Verified that keys get deleted when an app gets uninstalled.
Change-Id: I1b0b65e977177a6e34c500b00b5070ec18be2671
 2021-02-25 09:30:44 -08:00