Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
691,949 Commits 3 Branches 0 Tags
e775dcbcc49428156113cf8bf4335fd978ae82f2
Commit Graph

691949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
e775dcbcc4 Merge changes from topic "new_data_flag" am: 7c57209294 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089545

Change-Id: I46ce539034f6951b1f9fca53bcf516ce7f66c0c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 06:16:54 +00:00
Jack Yu
39e9b3347f DO NOT MERGE temporarily disabled new data stack am: cbd1ca5905 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089545

Change-Id: I18f268c400bafaa852a9ec33dbd55d2125282944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 06:16:52 +00:00
Jack Yu
c3f1e9af80 Inverted the new data stack flag am: 64b6709e80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089544

Change-Id: I9367da056dc2824a05b129f0e8597e6be1f135c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 06:16:44 +00:00
Treehugger Robot
7c57209294 Merge changes from topic "new_data_flag" 
* changes:
  DO NOT MERGE temporarily disabled new data stack
  Inverted the new data stack flag
 2022-05-06 05:51:21 +00:00
Jack Yu
cbd1ca5905 DO NOT MERGE temporarily disabled new data stack 
Temporarily disabled new data stack until all CTS fixed
on aosp_master.

Fix: 226046162
Test: atest CtsNetTestCases
Change-Id: Ie40ca14ae986192542bc1318bd345d9d31562680
 2022-05-05 21:18:38 -07:00
Jack Yu
64b6709e80 Inverted the new data stack flag 
Invert the flag so even if this flag does not exist in the
resource, the new data stack is still enabled by default.

Fix: 228813515
Test: Manual && atest FrameworksTelephonyTests
Merged-In: I75737c0ef9bce91385f815133e1878e5abea68ff
Change-Id: I75737c0ef9bce91385f815133e1878e5abea68ff
 2022-05-05 21:11:51 -07:00
Jack Yu
3a82e4fbdd Merge "Completely detach old data stack" am: f2b55a0e9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089364

Change-Id: I41add7637b6ad048a7e205247e76b5ceebb85d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 03:10:43 +00:00
Jack Yu
f2b55a0e9b Merge "Completely detach old data stack" 2022-05-06 02:52:00 +00:00
Jack Yu
ae26bc400b Completely detach old data stack 
Not create DcTracker and TransportManager instances
when new data stack is enabled.

Test: atest FrameworksTelephonyTests and manually tested on
Pixel 4 and Pixel 6.
Bug: 222323544

Merged-In: Ice595f329e2f4e531dc577cd3db7c863ba15d6d6
Change-Id: Ice595f329e2f4e531dc577cd3db7c863ba15d6d6
 2022-05-05 17:32:17 -07:00
Devin Moore
311958411a Merge "AudioService: catch RuntimeException for IServiceManager.getService" am: d884be6c10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2069476

Change-Id: I95056fc107095738710bb2e1b9f2cce80be2502c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 16:52:47 +00:00
Devin Moore
d884be6c10 Merge "AudioService: catch RuntimeException for IServiceManager.getService" 2022-05-05 15:53:17 +00:00
Jayachandran C
2437af1cb0 Merge "Update OWNERs file for telephony xml files" am: ad8b399ec8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2083965

Change-Id: I0f1a65f04425ba40cb33f862cc85e9d1dfcd7176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:00 +00:00
Jayachandran C
ad8b399ec8 Merge "Update OWNERs file for telephony xml files" 2022-05-05 08:06:14 +00:00
Chiachang Wang
3350cb96a3 Merge changes from topic "AppExclusion" am: 7b6fa7c457 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2076559

Change-Id: I85b1ee3b6e2724f33a9e541527cc377ffb838013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:27 +00:00
Benedict Wong
2e5b004421 Add to/from disk stable format am: 823599b4a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084734

Change-Id: Ia99f0b3c98bec204526f10d00b0b4db1431e6a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:25 +00:00
Chiachang Wang
7b6fa7c457 Merge changes from topic "AppExclusion" 
* changes:
  Allow getting/setting app exclusion list for specific vpn profile
  Add to/from disk stable format
 2022-05-05 01:58:49 +00:00
Treehugger Robot
ea4f257004 Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell" am: 87e124332d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081684

Change-Id: I1cb22ce69e434c15e0324a5526d00478cf0c1850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 01:51:52 +00:00
Treehugger Robot
87e124332d Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell" 2022-05-05 01:24:44 +00:00
Xin Li
cf0f932eb6 [automerger skipped] Merge "Merge SP2A.220505.002" am: 3c7a3e397f -s ours 
am skip reason: Merged-In I7707d01be37582461227edcecf5d559f2019c8a5 with SHA-1 b029b005d8 is already in history

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

Change-Id: I64c603c9b161bbe3cbf24dabcdddac5e5f3b42ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:57:10 +00:00
Xin Li
27861e2cbf [automerger skipped] Merge SP2A.220505.002 am: fd1b1662e9 -s ours 
am skip reason: Merged-In I7707d01be37582461227edcecf5d559f2019c8a5 with SHA-1 b029b005d8 is already in history

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

Change-Id: I7ca3bf32745f5c5e19283786bbc557fa486f6c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:56:53 +00:00
Xin Li
3c7a3e397f Merge "Merge SP2A.220505.002" 2022-05-04 20:30:20 +00:00
Jayachandran C
5e0208562a Update OWNERs file for telephony xml files 
Bug: 213183041
Test: make
Merged-In: If64d1f34038472dcafd9a94f24879ae9d3056bb1
Change-Id: If64d1f34038472dcafd9a94f24879ae9d3056bb1
 2022-05-04 20:03:03 +00:00
Eric Biggers
5e3ed2720b Merge "UserDataPreparer: fix volume preparation order" am: 0c0888da1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2086485

Change-Id: Ib9bef8934e2626f488c1dda9246563a8934436ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 19:54:19 +00:00
Eric Biggers
0c0888da1d Merge "UserDataPreparer: fix volume preparation order" 2022-05-04 18:56:16 +00:00
Miguel Aranda
5c6e766d4b Merge "Still more libcore benchmarks migrated to Crystal Ball." am: 2dc0d124a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084215

Change-Id: Ifc5979a2b92ef527d16ae929bda9b630e1d1f2b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:37:24 +00:00
Miguel Aranda
2dc0d124a7 Merge "Still more libcore benchmarks migrated to Crystal Ball." 2022-05-04 16:55:08 +00:00
Shreerag Jayakrishnan
bb96289dea Merge "Add Activity Recognition to default grants for Home app on Wear." am: 0bcfa16d6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2086183

Change-Id: Id7e001fccc0ab543f9b1bb3ee71cb5acb55fdbae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:26:07 +00:00
Shreerag Jayakrishnan
0bcfa16d6c Merge "Add Activity Recognition to default grants for Home app on Wear." 2022-05-04 14:59:07 +00:00
Miguel Aranda
14a7d644a3 Merge "Libcore VarHandle generator script and tests." am: 2427797def 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2079622

Change-Id: If98d54cd0e19821303d6a2c6ecb9e1928783c2e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:12:38 +00:00
Miguel Aranda
2427797def Merge "Libcore VarHandle generator script and tests." 2022-05-04 12:31:56 +00:00
Hyundo Moon
9558970e9d Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" am: 0bec859fb5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2086903

Change-Id: I3d9cf93f3bc9e7ea7f40d9cd622bc4497fec5f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 10:51:16 +00:00
Miguel
2c04bb22f4 Still more libcore benchmarks migrated to Crystal Ball. 
Test: atest {TestName}
Change-Id: I9e67814d011fc13a9a2cf57f2bf543ba89d9aaa2
 2022-05-04 10:16:08 +00:00
Hyundo Moon
0bec859fb5 Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" 2022-05-04 10:14:20 +00:00
Miguel
4d8a847ab4 Libcore VarHandle generator script and tests. 
Test: atest {TestName}
Change-Id: I6df071657a8d04ed4dd4c00ac4f4e2e941c91322
 2022-05-04 10:00:26 +00:00
Jaegeuk Kim
6538c2d2e7 Merge changes from topic "fscklog_f2fs" am: 65e07d31d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2085723

Change-Id: I01b85c4b4a33b6f89974a3eb241ee5f184aae96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 08:18:41 +00:00
Jaegeuk Kim
6f66355678 Keep the fsck log in /dev/fscklogs/fsck for bug report am: c30d209f5f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2083809

Change-Id: I99fea1d06ef3635d65c2563d1b2e91b454ab02e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 08:18:35 +00:00
Jaegeuk Kim
65e07d31d4 Merge changes from topic "fscklog_f2fs" 
* changes:
  Upload f2fs fscklog
  Keep the fsck log in /dev/fscklogs/fsck for bug report
 2022-05-04 07:35:09 +00:00
Eric Biggers
a8a53c2615 UserDataPreparer: fix volume preparation order 
Internal storage must be prepared before adoptable storage, since the
user's volume keys are stored in their internal storage.  Previously,
the order depended on the Java hashcodes of the volume IDs.  It seems
that in practice things sort of worked out anyway even with the wrong
order, via a bizarre sequence of events involving the user's storage
being deleted and re-created several times.  Regardless, let's fix it.

destroyUserData() sort of had the reverse bug, although I don't think it
actually mattered.  My concern there was that destroying the internal
storage first would bypass vold's destroyKey() for the volume keys.
However, that's okay since the volume keys don't actually need a special
destruction procedure in this case.  Also, internal storage has already
been locked when destroyUserData() runs anyway.

Test: On Cuttlefish:
      $ sm partition disk:253,32 private
      $ pm create-user 10
      $ pm remove-user 10
      Checked logcat for expected messages.
Bug: 231387956
Change-Id: I146d8c786c6b923aed7f8c748db8a7e90c96687f
 2022-05-04 06:45:06 +00:00
Hyundo Moon
5c811c4df5 Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice 
Also fixes some typos.

Test: builds successfully
Change-Id: I39242b40ebe154b8b89f00f48ea320b18f56ecd7
 2022-05-04 05:24:44 +00:00
Chiachang
d19b3c03d2 Allow getting/setting app exclusion list for specific vpn profile 
Provide a way for the system Setting app or other similar system
apps to set the app exclusion list for the specific VPN from
VpnManager. The list affects only VPN provisioned from
VpnManager to keep the design consistence for app using
VpnService.

The list is stored in the keystore for its persistence.

Bug: 192078259
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I157823866e1899b40aa36ea2c0bc4a80370108be
 2022-05-04 02:20:54 +00:00
Benedict Wong
823599b4a8 Add to/from disk stable format 
This change adds a utility to convert persistable bundles to and from
disk-stable byte arrays.

Test: atest FrameworksVcnTests:PersistableBundleUtilsTest
Change-Id: Ifafb7081ec6a34ce3ab8e2aa502d46411405cb6d
 2022-05-04 01:20:32 +00:00
Jeff Sharkey
8e7fbde4f2 Merge "Add Frank/team as android_os_GraphicsEnvironment.cpp OWNERS" am: 6816c0d8dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2086064

Change-Id: I3e92f0820fafcf51775d8aa06d0185a64281c39d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:14:49 +00:00
Treehugger Robot
aeed765f18 Merge "Freeze all package processes before killing" am: beccf603e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2080733

Change-Id: I5b7a58919348bf8ac70cb16f365dddca0a20e8f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:12:36 +00:00
Jeff Sharkey
6816c0d8dd Merge "Add Frank/team as android_os_GraphicsEnvironment.cpp OWNERS" 2022-05-04 00:37:56 +00:00
Shreerag Jayakrishnan
de7f98153e Add Activity Recognition to default grants for Home app on Wear. 
Bug: 228252687
Test: Home app is granted Activity Recognition by default
Change-Id: I1084fc266ef5a2163fea95aa2ead22175ce18d2e
 2022-05-03 22:58:10 +00:00
Ian Elliott
cf9df36902 Add Frank/team as android_os_GraphicsEnvironment.cpp OWNERS 
Bug: 221459804
Test: Visual inspection
Change-Id: Icf4c65bc5a063574a4d6c860bd494b7f2624dc4d
 2022-05-03 16:26:02 -06:00
Treehugger Robot
beccf603e8 Merge "Freeze all package processes before killing" 2022-05-03 21:49:42 +00:00
Xin Li
fd1b1662e9 Merge SP2A.220505.002 
Bug: 231319788
Merged-In: I7707d01be37582461227edcecf5d559f2019c8a5
Change-Id: I1dad245a352258f2a0017b85f14c99f305d8d660
 2022-05-03 20:53:01 +00:00
Suren Baghdasaryan
87dfb8e586 Merge "Do not purge process groups on system_server startup" am: 9e68daf1c8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2080239

Change-Id: I85c5ea5d18722c691677d74ab39fa06ad2d066c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:06:43 +00:00
Suren Baghdasaryan
9e68daf1c8 Merge "Do not purge process groups on system_server startup" 2022-05-03 19:44:23 +00:00