Commit Graph

688282 Commits

Author SHA1 Message Date
Jack Yu
78f46dd41e Merge "Improved data fail cause debug message" 2022-05-09 15:47:21 +00:00
Eric Biggers
350433edc8 Merge changes from topic "deny-create-user-dirs"
* changes:
  Zygote: relabel to either system_userdir_file or system_data_file
  BrightnessTracker: don't create stuff directly in /data/system_de
2022-05-09 14:45:11 +00:00
Jack Yu
fcb5553d10 Improved data fail cause debug message
Test: Manual
Fix: 228611718
Merged-In: Ic3a5a64a4e57ed49dd4445ff31018b78e833f73f
Change-Id: Ic3a5a64a4e57ed49dd4445ff31018b78e833f73f
2022-05-08 23:28:05 -07:00
Jack Yu
0d0729a62f Merge changes from topics "enterprise_internet", "set_data_enabled"
* changes:
  Improved the network type to string
  SetDataEnabled indicate calling package
2022-05-09 03:19:56 +00:00
Jack Yu
1780b1aece Improved the network type to string
Bug: 227781379
Test: atest DataNetworkControllerTest DataProfileManagerTest
Merged-In: I6d09ade1650e226a965547e3f78e74f3f2ffec59
Change-Id: I6d09ade1650e226a965547e3f78e74f3f2ffec59
2022-05-08 13:42:20 -07:00
Sarah Chin
967c10b103 SetDataEnabled indicate calling package
Test: atest TelephonyManagerTest
Bug: 226149142
Merged-In: I769437e9332f27c0990c37f60ad6d9db284e86cf
Change-Id: I769437e9332f27c0990c37f60ad6d9db284e86cf
2022-05-08 12:22:43 -07:00
Treehugger Robot
22a9bec54c Merge "Don't send null data call list response" 2022-05-07 00:54:03 +00:00
Hans Boehm
5ee3cfe147 Merge "Document VirtualRefBasePtr hazards" 2022-05-06 23:54:45 +00:00
Sarah Chin
50b8df99a7 Don't send null data call list response
Test: atest DataServiceCallbackTest
Bug: 223473056
Merged-In: I2919fff4abe1ccc234ae2b5d45582eadce440986
Change-Id: I2919fff4abe1ccc234ae2b5d45582eadce440986
2022-05-06 14:54:59 -07:00
Treehugger Robot
1e3e69212a Merge "Set an edit uri to data of ACTION_EDIT" 2022-05-06 20:38:05 +00:00
Hans Boehm
d72e472407 Document VirtualRefBasePtr hazards
Test: Treehugger
Change-Id: I6f364b4e0f73a2eb554f2902a67e774ef5890b00
2022-05-06 11:11:37 -07:00
Treehugger Robot
39e3a67feb Merge "Add String for state DATA_HANDOVER_IN_PROGRESS" 2022-05-06 06:20:01 +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
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
d884be6c10 Merge "AudioService: catch RuntimeException for IServiceManager.getService" 2022-05-05 15:53:17 +00:00
Jayachandran C
ad8b399ec8 Merge "Update OWNERs file for telephony xml files" 2022-05-05 08:06:14 +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
87e124332d Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell" 2022-05-05 01:24:44 +00:00
Eric Biggers
5454379320 Zygote: relabel to either system_userdir_file or system_data_file
To hide other apps' data directories, zygote mounts tmpfs instances over
various directories such as /data/user, then bind-mounts in the needed
app directories.  Files in tmpfs get the SELinux label "tmpfs" by
default.  After creating them, zygote relabels some of these "tmpfs"
files to their normal labels; however, in every case the desired label
was "u:object_r:system_data_file:s0", so zygote just copied the label of
/data/user_de which happened to have this same label.

With https://r.android.com/2078213, the /data/user_de directory, but not
its subdirectories, will start being labeled as
"u:object_r:system_userdir_file:s0".  This would break the
above-mentioned logic, as it would start assigning system_userdir_file
to files that should be system_data_file.  Therefore, update it to
assign the appropriate type of [system_userdir_file, system_data_file].

Note that alternatively, it seems that we could just always use
system_data_file, or just remove this relabeling code entirely since the
sepolicy contains 'allow domain tmpfs:dir search' anyway.  But as long
as zygote is trying to set the normal labels, it should do it correctly.

Test: Tested together with the sepolicy change
      https://r.android.com/2078213; see there for testing notes.
Bug: 156305599
Change-Id: I325aa873cf216e33924d0508100fcc755f265cf2
2022-05-04 22:35:18 +00:00
Eric Biggers
3d9c19f2fd BrightnessTracker: don't create stuff directly in /data/system_de
/data/system_de is only for per-user data; it *must* only contain
per-user encrypted directories.  Only vold should ever create anything
directly in this directory.  In preparation for removing system_server's
write access to this directory (https://r.android.com/2078213), make
BrightnessTracker store its brightness_events.xml file at
/data/system/brightness_events.xml instead of
/data/system_de/brightness_events.xml, and likewise for
ambient_brightness_stats.xml.

Migration happens lazily, except that the old files aren't ever deleted
since the SELinux policy will no longer allow system_server to do that;
the old files just stop being used.  vold will need to handle the
cleanup instead, or we could just leave the files around.

Test: Flashed new build without wiping userdata.  Log shows "Reading
      ambient_brightness_stats.xml from old location" as expected.
      Rebooted.  Log message no longer appears, as expected.  File
      /data/system/ambient_brightness_stats.xml exists, as expected.
Bug: 156305599
Change-Id: I6e0948ac54ec9183348943234d505e7466042963
2022-05-04 22:35:17 +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
0c0888da1d Merge "UserDataPreparer: fix volume preparation order" 2022-05-04 18:56:16 +00:00
Miguel Aranda
2dc0d124a7 Merge "Still more libcore benchmarks migrated to Crystal Ball." 2022-05-04 16:55:08 +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
2427797def Merge "Libcore VarHandle generator script and tests." 2022-05-04 12:31:56 +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
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
sewookseo
11ebef7072 Add String for state DATA_HANDOVER_IN_PROGRESS
dataStateToString() will return string value of state
DATA_HANDOVER_IN_PROGRESS

Test: build & verified with AVD
Change-Id: I80e9bfd893144d1b23d6925a94e6569c10b7baa7
2022-05-04 01:30:25 +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
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
9e68daf1c8 Merge "Do not purge process groups on system_server startup" 2022-05-03 19:44:23 +00:00
Neil Fuller
6576601e82 Merge "Capitalize TZ display name strings" 2022-05-03 19:22:03 +00:00
Jayachandran C
3e25e7a0b8 Merge "Update SMS short code list for Italy" 2022-05-03 18:55:35 +00:00
Treehugger Robot
d58f16c645 Merge "Moved telephony related resource to a separate file" 2022-05-03 14:26:16 +00:00
Treehugger Robot
6fd3435745 Merge "Bit: teach bit how to print number of @Ignored tests" 2022-05-03 10:55:06 +00:00
Treehugger Robot
78e7ddbf43 Merge "Bit: use exec-out instead of shell" 2022-05-03 10:54:58 +00:00
Treehugger Robot
2ca9a7aeaa Merge "Update API doc for accidentally exposed NETWORK_TYPE_BITMASK_LTE_CA" 2022-05-03 07:28:19 +00:00