3057504bee36264bcb9f4b75d3aaacbef62ab9d8
39 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Corina
|
506eae3745 |
Add gif mime type
Bug: 168001592 Test: atest MimeMapTest Change-Id: I0413381fd94f61e96d29eb4f139743c197c99040 |
||
|
Alex Johnston
|
f78caf8ec3 | Merge "Allow installation of cert with .der extension" into sc-dev | ||
|
Nikita Iashchenko
|
40f1d1a2c5 |
Merge "Rename MimeMap.Builder setter methods to match guidelines" am: 9ef9fab0a1 am: 2368ec9e27 am: 4052d42e8c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690841 Change-Id: Ibde2ce8cc39a2b3f564a2c11a85e18a24cce0595 |
||
|
Nikita Iashchenko
|
1c44ac53fd |
Rename MimeMap.Builder setter methods to match guidelines
Bug: 184654804 Test: m droid Change-Id: I9d7062af7430856a213edc4ab98b4506e1106053 |
||
|
Alex Johnston
|
9ca2d03ff2 |
Allow installation of cert with .der extension
* Add der file extension to application/x-x509-ca-cert MIME type. Manual testing steps * Push .der certificate onto device * Install CA certificate via Settings and select .der certificate * Verify certificate has been successfully installed Bug: 185283683 Test: manual testing Change-Id: I0be1897a0aaf6f771c0e534533d2413ff0fc12f6 |
||
|
Treehugger Robot
|
9864e155a8 |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 7226ad3729 am: a087245e03 am: 3dd40d172b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661581 Change-Id: I99cb5fd94c4ee02688709ad00e3ffbc3e2f388e7 |
||
|
Bob Badour
|
de423b7a58 |
[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to: drm/java/Android.bp graphics/java/Android.bp identity/Android.bp identity/java/Android.bp keystore/java/Android.bp location/java/Android.bp location/tests/Android.bp lowpan/java/Android.bp media/mca/effect/java/Android.bp media/mca/filterfw/java/Android.bp media/mca/filterpacks/java/Android.bp mime/java/Android.bp mms/java/Android.bp opengl/java/Android.bp rs/java/Android.bp sax/java/Android.bp services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp telecomm/java/Android.bp telephony/common/Android.bp tests/FlickerTests/test-apps/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: telephony/java/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I2ee0af9ce8f74de2172b359b41d2c52a8b8f7e6c |
||
|
Anton Hansson
|
5013902a24 |
Merge changes I97086e30,Ic55df4cf,I81a08c29 am: 4199ef90b9 am: 4bc578052d am: ec1f981309
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655736 Change-Id: I5d242cf5b18c4b556105cfcfe78df2ac18a8544e |
||
|
Anton Hansson
|
9b2c4a650b |
Move framework java filegroups into subdirectories
All the java code used to build the framework jar and run metalava was previously defined in the toplevel Android.bp files. Move these into the subdirs where the source actually lives. This simplifies the rules themselves (no path and needless prefix) and declutters the top level Android.bp. Test: m Change-Id: I97086e309eacb879d16facb8497d9940fa5ddaf6 |
||
|
Bob Badour
|
8a6a2bce6c |
[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to:
apct-tests/perftests/autofill/Android.bp
apct-tests/perftests/blobstore/Android.bp
apct-tests/perftests/core/Android.bp
apct-tests/perftests/core/apps/overlay/Android.bp
apct-tests/perftests/core/apps/reources_manager/Android.bp
apct-tests/perftests/core/jni/Android.bp
apct-tests/perftests/multiuser/Android.bp
apct-tests/perftests/multiuser/apps/dummyapp/Android.bp
apct-tests/perftests/packagemanager/Android.bp
apct-tests/perftests/packagemanager/apps/query-all/Android.bp
apct-tests/perftests/textclassifier/Android.bp
apct-tests/perftests/utils/Android.bp
apct-tests/perftests/windowmanager/Android.bp
apex/Android.bp
apex/blobstore/framework/Android.bp
apex/blobstore/service/Android.bp
apex/jobscheduler/framework/Android.bp
apex/jobscheduler/service/Android.bp
apex/media/Android.bp
apex/media/aidl/Android.bp
apex/media/framework/Android.bp
cmds/am/Android.bp
cmds/app_process/Android.bp
cmds/appops/Android.bp
cmds/appwidget/Android.bp
cmds/backup/Android.bp
cmds/bmgr/Android.bp
cmds/bootanimation/Android.bp
cmds/bu/Android.bp
cmds/content/Android.bp
cmds/dpm/Android.bp
cmds/hid/Android.bp
cmds/hid/jni/Android.bp
cmds/idmap2/Android.bp
cmds/ime/Android.bp
cmds/incident/Android.bp
cmds/incident_helper/Android.bp
cmds/incidentd/Android.bp
cmds/input/Android.bp
cmds/interrupter/Android.bp
cmds/locksettings/Android.bp
cmds/pm/Android.bp
cmds/requestsync/Android.bp
cmds/screencap/Android.bp
cmds/sm/Android.bp
cmds/svc/Android.bp
cmds/telecom/Android.bp
cmds/uiautomator/Android.bp
cmds/uiautomator/cmds/uiautomator/Android.bp
cmds/uiautomator/instrumentation/Android.bp
cmds/uiautomator/library/Android.bp
cmds/vr/Android.bp
cmds/wm/Android.bp
config/Android.bp
core/java/android/service/wallpaper/Android.bp
core/jni/Android.bp
core/sysprop/Android.bp
core/tests/BroadcastRadioTests/Android.bp
core/tests/ConnectivityManagerTest/Android.bp
core/tests/PackageInstallerSessions/Android.bp
core/tests/PlatformCompatFramework/Android.bp
core/tests/bandwidthtests/Android.bp
core/tests/benchmarks/Android.bp
core/tests/bluetoothtests/Android.bp
core/tests/bugreports/Android.bp
core/tests/coretests/Android.bp
core/tests/coretests/BinderDeathRecipientHelperApp/Android.bp
core/tests/coretests/BinderProxyCountingTestApp/Android.bp
core/tests/coretests/BinderProxyCountingTestService/Android.bp
core/tests/coretests/BstatsTestApp/Android.bp
core/tests/coretests/DisabledTestApp/Android.bp
core/tests/coretests/EnabledTestApp/Android.bp
core/tests/coretests/aidl/Android.bp
core/tests/coretests/apks/Android.bp
core/tests/coretests/apks/install/Android.bp
core/tests/coretests/apks/install_bad_dex/Android.bp
core/tests/coretests/apks/install_complete_package_info/Android.bp
core/tests/coretests/apks/install_decl_perm/Android.bp
core/tests/coretests/apks/install_jni_lib/Android.bp
core/tests/coretests/apks/install_jni_lib_open_from_apk/Android.bp
core/tests/coretests/apks/install_loc_auto/Android.bp
core/tests/coretests/apks/install_loc_internal/Android.bp
core/tests/coretests/apks/install_loc_sdcard/Android.bp
core/tests/coretests/apks/install_loc_unspecified/Android.bp
core/tests/coretests/apks/install_use_perm_good/Android.bp
core/tests/coretests/apks/install_uses_feature/Android.bp
core/tests/coretests/apks/install_verifier_bad/Android.bp
core/tests/coretests/apks/install_verifier_good/Android.bp
core/tests/coretests/apks/keyset/Android.bp
core/tests/coretests/apks/locales/Android.bp
core/tests/coretests/apks/overlay_config/Android.bp
core/tests/coretests/apks/version/Android.bp
core/tests/coretests/apks/version_nosys/Android.bp
core/tests/featureflagtests/Android.bp
core/tests/hdmitests/Android.bp
core/tests/hosttests/test-apps/AutoLocTestApp/Android.bp
core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocPermsFLTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPerms/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.bp
core/tests/hosttests/test-apps/InternalLocTestApp/Android.bp
core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.bp
core/tests/hosttests/test-apps/NoLocTestApp/Android.bp
core/tests/hosttests/test-apps/NoLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/NoLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/SharedUid/32/Android.bp
core/tests/hosttests/test-apps/SharedUid/32/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/64/Android.bp
core/tests/hosttests/test-apps/SharedUid/64/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/dual/Android.bp
core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/java_only/Android.bp
core/tests/hosttests/test-apps/SimpleTestApp/Android.bp
core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v1_ext/Android.bp
core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v2_int/Android.bp
core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v1_ext/Android.bp
core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v2_none/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_Auto/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_External/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_Internal/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_None/Android.bp
core/tests/mockingcoretests/Android.bp
core/tests/notificationtests/Android.bp
core/tests/overlaytests/device/Android.bp
core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.bp
core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.bp
core/tests/overlaytests/device/test-apps/FrameworkOverlay/Android.bp
core/tests/overlaytests/host/Android.bp
core/tests/overlaytests/remount/Android.bp
core/tests/overlaytests/remount/test-apps/Overlay/Android.bp
core/tests/overlaytests/remount/test-apps/SharedLibrary/Android.bp
core/tests/overlaytests/remount/test-apps/SharedLibraryOverlay/Android.bp
core/tests/overlaytests/remount/test-apps/Target/Android.bp
core/tests/packagemanagertests/Android.bp
core/tests/privacytests/Android.bp
core/tests/screenshothelpertests/Android.bp
core/tests/systemproperties/Android.bp
core/tests/utillib/Android.bp
core/tests/utiltests/Android.bp
core/tests/utiltests/jni/Android.bp
core/tests/uwbtests/Android.bp
core/xsd/Android.bp
core/xsd/vts/Android.bp
data/etc/Android.bp
data/etc/car/Android.bp
data/fonts/Android.bp
data/keyboards/Android.mk
drm/jni/Android.bp
errorprone/Android.bp
graphics/proto/Android.bp
keystore/Android.bp
keystore/tests/Android.bp
libs/WindowManager/Jetpack/Android.bp
libs/WindowManager/Shell/Android.bp
libs/WindowManager/Shell/tests/Android.bp
libs/androidfw/Android.bp
libs/androidfw/fuzz/resourcefile_fuzzer/Android.bp
libs/hostgraphics/Android.bp
libs/incident/Android.bp
libs/input/Android.bp
libs/input/tests/Android.bp
libs/protoutil/Android.bp
libs/services/Android.bp
libs/storage/Android.bp
libs/usb/tests/AccessoryChat/Android.bp
libs/usb/tests/AccessoryChat/accessorychat/Android.bp
location/lib/Android.bp
location/tests/Android.bp
location/tests/locationtests/Android.bp
lowpan/tests/Android.bp
media/Android.bp
media/java/Android.bp
media/java/android/media/tv/tunerresourcemanager/Android.bp
media/jni/Android.bp
media/jni/audioeffect/Android.bp
media/jni/soundpool/Android.bp
media/jni/soundpool/tests/Android.bp
media/lib/remotedisplay/Android.bp
media/lib/signer/Android.bp
media/lib/tvremote/Android.bp
media/lib/tvremote/tests/Android.bp
media/mca/filterfw/Android.bp
media/mca/filterfw/native/Android.bp
media/mca/filterpacks/Android.bp
media/mca/samples/CameraEffectsRecordingSample/Android.bp
media/mca/tests/Android.bp
media/native/midi/Android.bp
media/packages/BluetoothMidiService/Android.bp
media/packages/BluetoothMidiService/tests/unit/Android.bp
media/tests/AudioPolicyTest/Android.bp
media/tests/CameraBrowser/Android.bp
media/tests/EffectsTest/Android.bp
media/tests/MediaDump/Android.bp
media/tests/MediaFrameworkTest/Android.bp
media/tests/MediaRouter/Android.bp
media/tests/MtpTests/Android.bp
media/tests/ScoAudioTest/Android.bp
media/tests/SoundPoolTest/Android.bp
media/tests/TunerTest/Android.bp
media/tests/audiotests/Android.bp
media/tests/players/Android.bp
mime/Android.bp
native/android/Android.bp
native/graphics/jni/Android.bp
native/webview/loader/Android.bp
nfc-extras/Android.bp
nfc-extras/tests/Android.bp
packages/AppPredictionLib/Android.bp
packages/BackupEncryption/Android.bp
packages/BackupEncryption/test/robolectric-integration/Android.bp
packages/BackupEncryption/test/robolectric/Android.bp
packages/BackupEncryption/test/unittest/Android.bp
packages/BackupRestoreConfirmation/Android.bp
packages/CarSystemUI/Android.bp
packages/CarrierDefaultApp/Android.bp
packages/CarrierDefaultApp/tests/unit/Android.bp
packages/CompanionDeviceManager/Android.bp
packages/Connectivity/framework/Android.bp
packages/Connectivity/service/Android.bp
packages/CtsShim/Android.bp
packages/CtsShim/build/Android.bp
packages/CtsShim/build/jni/Android.bp
packages/DynamicSystemInstallationService/Android.bp
packages/DynamicSystemInstallationService/tests/Android.bp
packages/EasterEgg/Android.bp
packages/EncryptedLocalTransport/Android.bp
packages/ExtShared/Android.bp
packages/ExternalStorageProvider/Android.bp
packages/ExternalStorageProvider/tests/Android.bp
packages/FakeOemFeatures/Android.bp
packages/FusedLocation/Android.bp
packages/InputDevices/Android.bp
packages/LocalTransport/Android.bp
packages/PackageInstaller/Android.bp
packages/PrintRecommendationService/Android.bp
packages/PrintSpooler/Android.bp
packages/PrintSpooler/jni/Android.bp
packages/PrintSpooler/tests/outofprocess/Android.bp
packages/SettingsLib/ActionBarShadow/Android.bp
packages/SettingsLib/ActionButtonsPreference/Android.bp
packages/SettingsLib/AdaptiveIcon/Android.bp
packages/SettingsLib/Android.bp
packages/SettingsLib/AppPreference/Android.bp
packages/SettingsLib/BarChartPreference/Android.bp
packages/SettingsLib/DisplayDensityUtils/Android.bp
packages/SettingsLib/EntityHeaderWidgets/Android.bp
packages/SettingsLib/HelpUtils/Android.bp
packages/SettingsLib/LayoutPreference/Android.bp
packages/SettingsLib/ProgressBar/Android.bp
packages/SettingsLib/RadioButtonPreference/Android.bp
packages/SettingsLib/RestrictedLockUtils/Android.bp
packages/SettingsLib/SchedulesProvider/Android.bp
packages/SettingsLib/SearchProvider/Android.bp
packages/SettingsLib/SearchWidget/Android.bp
packages/SettingsLib/SettingsSpinner/Android.bp
packages/SettingsLib/SettingsTheme/Android.bp
packages/SettingsLib/Tile/Android.bp
packages/SettingsLib/Utils/Android.bp
packages/SettingsLib/search/Android.bp
packages/SettingsLib/tests/integ/Android.bp
packages/SettingsLib/tests/robotests/Android.bp
packages/SettingsProvider/Android.bp
packages/SharedStorageBackup/Android.bp
packages/Shell/Android.bp
packages/Shell/tests/Android.bp
packages/SimAppDialog/Android.bp
packages/SoundPicker/Android.bp
packages/StatementService/Android.bp
packages/SystemUI/Android.bp
packages/SystemUI/plugin/Android.bp
packages/SystemUI/plugin/ExamplePlugin/Android.bp
packages/SystemUI/plugin_core/Android.bp
packages/SystemUI/shared/Android.bp
packages/VpnDialogs/Android.bp
packages/WAPPushManager/Android.bp
packages/WAPPushManager/tests/Android.bp
packages/WallpaperBackup/Android.bp
packages/WallpaperCropper/Android.bp
packages/overlays/Android.mk
packages/overlays/tests/Android.bp
packages/services/PacProcessor/Android.bp
packages/services/PacProcessor/jni/Android.bp
packages/services/Proxy/Android.bp
proto/Android.bp
rs/jni/Android.mk
samples/demo/haptic-assessment/Android.bp
sax/tests/saxtests/Android.bp
services/Android.bp
services/accessibility/Android.bp
services/appprediction/Android.bp
services/appwidget/Android.bp
services/autofill/Android.bp
services/backup/Android.bp
services/backup/backuplib/Android.bp
services/companion/Android.bp
services/contentcapture/Android.bp
services/contentsuggestions/Android.bp
services/core/Android.bp
services/core/java/com/android/server/vcn/Android.bp
services/core/jni/Android.bp
services/core/xsd/Android.bp
services/core/xsd/vts/Android.bp
services/coverage/Android.bp
services/devicepolicy/Android.bp
services/incremental/Android.bp
services/midi/Android.bp
services/net/Android.bp
services/people/Android.bp
services/print/Android.bp
services/profcollect/Android.bp
services/restrictions/Android.bp
services/robotests/Android.bp
services/robotests/backup/Android.bp
services/systemcaptions/Android.bp
services/tests/PackageManagerComponentOverrideTests/Android.bp
services/tests/PackageManagerServiceTests/host/Android.bp
services/tests/PackageManagerServiceTests/host/test-apps/Android.bp
services/tests/mockingservicestests/Android.bp
services/tests/rescueparty/Android.bp
services/tests/servicestests/Android.bp
services/tests/servicestests/aidl/Android.bp
services/tests/servicestests/apks/Android.bp
services/tests/servicestests/apks/install-split-base/Android.bp
services/tests/servicestests/apks/install-split-feature-a/Android.bp
services/tests/servicestests/apks/install_intent_filters/Android.bp
services/tests/servicestests/apks/install_uses_sdk/Android.bp
services/tests/servicestests/test-apps/ConnTestApp/Android.bp
services/tests/servicestests/test-apps/JobTestApp/Android.bp
services/tests/servicestests/test-apps/PackageParserApp/Android.bp
services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
services/tests/servicestests/test-apps/SimpleServiceTestApp/Android.bp
services/tests/servicestests/test-apps/SuspendTestApp/Android.bp
services/tests/shortcutmanagerutils/Android.bp
services/tests/uiservicestests/Android.bp
services/tests/wmtests/Android.bp
services/usage/Android.bp
services/usb/Android.bp
services/voiceinteraction/Android.bp
services/wifi/Android.bp
startop/apps/test/Android.bp
startop/iorap/Android.bp
startop/iorap/functional_tests/Android.bp
startop/iorap/stress/Android.bp
startop/iorap/tests/Android.bp
startop/view_compiler/Android.bp
startop/view_compiler/dex_builder_test/Android.bp
test-base/hiddenapi/Android.bp
test-mock/Android.bp
test-runner/tests/Android.bp
tests/AccessibilityEventsLogger/Android.bp
tests/AccessoryDisplay/common/Android.bp
tests/AccessoryDisplay/sink/Android.bp
tests/AccessoryDisplay/source/Android.bp
tests/ActivityManagerPerfTests/stub-app/Android.bp
tests/ActivityManagerPerfTests/test-app/Android.bp
tests/ActivityManagerPerfTests/tests/Android.bp
tests/ActivityManagerPerfTests/utils/Android.bp
tests/ActivityTests/Android.bp
tests/ActivityViewTest/Android.bp
tests/AmSlam/Android.bp
tests/ApkVerityTest/Android.bp
tests/ApkVerityTest/ApkVerityTestApp/Android.bp
tests/ApkVerityTest/block_device_writer/Android.bp
tests/AppLaunch/Android.bp
tests/AppLaunchWear/Android.bp
tests/AppResourcesLoaders/Android.bp
tests/AppResourcesLoaders/Overlay/Android.bp
tests/Assist/Android.bp
tests/AutoVerify/app1/Android.bp
tests/AutoVerify/app2/Android.bp
tests/AutoVerify/app3/Android.bp
tests/AutoVerify/app4/Android.bp
tests/BackgroundDexOptServiceIntegrationTests/Android.bp
tests/BandwidthTests/Android.bp
tests/BatteryWaster/Android.bp
tests/BiDiTests/Android.bp
tests/BlobStoreTestUtils/Android.bp
tests/BootImageProfileTest/Android.bp
tests/BrowserPowerTest/Android.bp
tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp
tests/CameraPrewarmTest/Android.bp
tests/Codegen/Android.bp
tests/Compatibility/Android.bp
tests/CoreTests/android/Android.bp
tests/DataIdleTest/Android.bp
tests/DozeTest/Android.bp
tests/DpiTest/Android.bp
tests/DynamicCodeLoggerIntegrationTests/Android.mk
tests/FeatureSplit/base/Android.bp
tests/FeatureSplit/feature1/Android.bp
tests/FeatureSplit/feature2/Android.bp
tests/FixVibrateSetting/Android.bp
tests/FlickerTests/Android.bp
tests/FlickerTests/test-apps/Android.bp
tests/FlickerTests/test-apps/flickerapp/Android.bp
tests/FrameworkPerf/Android.bp
tests/GamePerformance/Android.bp
tests/GridLayoutTest/Android.bp
tests/HierarchyViewerTest/Android.bp
tests/HugeBackup/Android.bp
tests/HwAccelerationTest/Android.bp
tests/Internal/Android.bp
tests/JankBench/Android.bp
tests/JobSchedulerPerfTests/Android.bp
tests/JobSchedulerTestApp/Android.bp
tests/LargeAssetTest/Android.bp
tests/LegacyAssistant/Android.bp
tests/LocalizationTest/Android.bp
tests/LocationTracker/Android.bp
tests/LotsOfApps/Android.bp
tests/LowStorageTest/Android.bp
tests/ManagedProfileLifecycleStressTest/Android.bp
tests/ManagedProfileLifecycleStressTest/app/DummyDPC/Android.bp
tests/MemoryUsage/Android.bp
tests/MirrorSurfaceTest/Android.bp
tests/NativeProcessesMemoryTest/Android.bp
tests/NetworkSecurityConfigTest/Android.bp
tests/NullHomeTest/Android.bp
tests/OdmApps/Android.bp
tests/OdmApps/app/Android.bp
tests/OdmApps/priv-app/Android.bp
tests/OneMedia/Android.bp
tests/PackageWatchdog/Android.bp
tests/PlatformCompatGating/Android.bp
tests/PlatformCompatGating/test-rules/Android.bp
tests/ProtoInputStreamTests/Android.bp
tests/RemoteDisplayProvider/Android.bp
tests/RenderThreadTest/Android.bp
tests/RollbackTest/Android.bp
tests/SerialChat/Android.bp
tests/ServiceCrashTest/Android.bp
tests/SharedLibrary/client/Android.bp
tests/SharedLibrary/lib/Android.bp
tests/ShowWhenLockedApp/Android.bp
tests/SmokeTest/Android.bp
tests/SmokeTest/tests/Android.bp
tests/SmokeTestApps/Android.bp
tests/SoundTriggerTestApp/Android.bp
tests/Split/Android.bp
tests/StagedInstallTest/Android.bp
tests/StatusBar/Android.bp
tests/SurfaceComposition/Android.bp
tests/SurfaceControlViewHostTest/Android.bp
tests/SystemMemoryTest/device/Android.bp
tests/SystemMemoryTest/host/Android.bp
tests/SystemUIDemoModeController/Android.bp
tests/TaskOrganizerTest/Android.bp
tests/TelephonyCommonTests/Android.bp
tests/TouchLatency/Android.bp
tests/TransformTest/Android.bp
tests/TtsTests/Android.bp
tests/UiBench/Android.bp
tests/UsageReportingTest/Android.bp
tests/UsageStatsPerfTests/Android.bp
tests/UsageStatsTest/Android.bp
tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.bp
tests/UsbHostExternalManagmentTest/AoapTestHost/Android.bp
tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.bp
tests/UsbManagerTests/Android.bp
tests/UsbManagerTests/lib/Android.bp
tests/UsbTests/Android.bp
tests/UsesFeature2Test/Android.bp
tests/VectorDrawableTest/Android.bp
tests/VoiceEnrollment/Android.bp
tests/VoiceInteraction/Android.bp
tests/WallpaperTest/Android.bp
tests/WindowAnimationJank/Android.bp
tests/WindowInsetsTests/Android.bp
tests/appwidgets/AppWidgetHostTest/Android.bp
tests/appwidgets/AppWidgetProviderTest/Android.bp
tests/backup/Android.mk
tests/benchmarks/Android.bp
tests/libs-permissions/Android.bp
tests/net/Android.bp
tests/net/common/Android.bp
tests/net/deflake/Android.bp
tests/net/integration/Android.bp
tests/net/jni/Android.bp
tests/net/smoketest/Android.bp
tests/notification/Android.bp
tests/permission/Android.bp
tests/privapp-permissions/Android.bp
tests/testables/Android.bp
tests/testables/tests/Android.bp
tests/utils/StubIME/Android.bp
tests/utils/hostutils/Android.bp
tests/utils/testutils/Android.bp
tests/vcn/Android.bp
tools/aapt/Android.bp
tools/aapt2/Android.bp
tools/aapt2/integration-tests/AutoVersionTest/Android.bp
tools/aapt2/integration-tests/BasicTest/Android.bp
tools/aapt2/integration-tests/MergeOnlyTest/LeafLib/Android.mk
tools/aapt2/integration-tests/MergeOnlyTest/LocalLib/Android.mk
tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk
tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk
tools/aapt2/integration-tests/StaticLibTest/App/Android.bp
tools/aapt2/integration-tests/StaticLibTest/LibOne/Android.bp
tools/aapt2/integration-tests/StaticLibTest/LibTwo/Android.bp
tools/aapt2/integration-tests/SymlinkTest/Android.bp
tools/bit/Android.bp
tools/codegen/Android.bp
tools/dump-coverage/Android.bp
tools/incident_report/Android.bp
tools/incident_section_gen/Android.bp
tools/lock_agent/Android.bp
tools/locked_region_code_injection/Android.bp
tools/obbtool/Android.bp
tools/powermodel/Android.bp
tools/preload-check/Android.bp
tools/preload-check/device/Android.bp
tools/preload/loadclass/Android.bp
tools/processors/staledataclass/Android.bp
tools/processors/view_inspector/Android.bp
tools/protologtool/Android.bp
tools/sdkparcelables/Android.bp
tools/split-select/Android.bp
tools/streaming_proto/Android.bp
tools/validatekeymaps/Android.bp
wifi/java/Android.bp
wifi/tests/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
libs/hwui/Android.bp
native/webview/plat_support/Android.bp
obex/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
SPDX-license-identifier-CC-BY SPDX-license-identifier-CPL-1.0
SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
SPDX-license-identifier-W3C legacy_unencumbered
to:
Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
legacy_unencumbered
to:
core/java/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
test-base/Android.bp
test-runner/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL
to:
core/res/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0
to:
libs/usb/Android.bp
libs/usb/tests/accessorytest/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
to:
tools/preload/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
SPDX-license-identifier-Unicode-DFS
to:
api/Android.bp
boot/Android.bp
cmds/device_config/Android.bp
cmds/settings/Android.bp
core/api/Android.bp
core/tests/coretests/certs/Android.bp
core/tests/overlaytests/remount/test-apps/certs/Android.bp
core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp
core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp
libs/tracingproxy/Android.bp
services/startop/Android.bp
test-legacy/Android.mk
tests/ApkVerityTest/testdata/Android.bp
tests/TransitionTests/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Ib9737d8fb5ef5b90a2c14fe71f1a571079edcf02
Merged-In: Ib9737d8fb5ef5b90a2c14fe71f1a571079edcf02
|
||
|
Bob Badour
|
051ef786ac |
[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to:
apct-tests/perftests/autofill/Android.bp
apct-tests/perftests/blobstore/Android.bp
apct-tests/perftests/core/Android.bp
apct-tests/perftests/core/apps/overlay/Android.bp
apct-tests/perftests/core/apps/reources_manager/Android.bp
apct-tests/perftests/core/jni/Android.bp
apct-tests/perftests/multiuser/Android.bp
apct-tests/perftests/multiuser/apps/dummyapp/Android.bp
apct-tests/perftests/packagemanager/Android.bp
apct-tests/perftests/packagemanager/apps/query-all/Android.bp
apct-tests/perftests/textclassifier/Android.bp
apct-tests/perftests/utils/Android.bp
apct-tests/perftests/windowmanager/Android.bp
apex/Android.bp
apex/blobstore/framework/Android.bp
apex/blobstore/service/Android.bp
apex/jobscheduler/framework/Android.bp
apex/jobscheduler/service/Android.bp
apex/media/Android.bp
apex/media/aidl/Android.bp
apex/media/framework/Android.bp
cmds/am/Android.bp
cmds/app_process/Android.bp
cmds/appops/Android.bp
cmds/appwidget/Android.bp
cmds/backup/Android.bp
cmds/bmgr/Android.bp
cmds/bootanimation/Android.bp
cmds/bu/Android.bp
cmds/content/Android.bp
cmds/dpm/Android.bp
cmds/hid/Android.bp
cmds/hid/jni/Android.bp
cmds/idmap2/Android.bp
cmds/ime/Android.bp
cmds/incident/Android.bp
cmds/incident_helper/Android.bp
cmds/incidentd/Android.bp
cmds/input/Android.bp
cmds/interrupter/Android.bp
cmds/locksettings/Android.bp
cmds/pm/Android.bp
cmds/requestsync/Android.bp
cmds/screencap/Android.bp
cmds/sm/Android.bp
cmds/svc/Android.bp
cmds/telecom/Android.bp
cmds/uiautomator/Android.bp
cmds/uiautomator/cmds/uiautomator/Android.bp
cmds/uiautomator/instrumentation/Android.bp
cmds/uiautomator/library/Android.bp
cmds/vr/Android.bp
cmds/wm/Android.bp
config/Android.bp
core/java/android/service/wallpaper/Android.bp
core/jni/Android.bp
core/sysprop/Android.bp
core/tests/BroadcastRadioTests/Android.bp
core/tests/ConnectivityManagerTest/Android.bp
core/tests/PackageInstallerSessions/Android.bp
core/tests/PlatformCompatFramework/Android.bp
core/tests/bandwidthtests/Android.bp
core/tests/benchmarks/Android.bp
core/tests/bluetoothtests/Android.bp
core/tests/bugreports/Android.bp
core/tests/coretests/Android.bp
core/tests/coretests/BinderDeathRecipientHelperApp/Android.bp
core/tests/coretests/BinderProxyCountingTestApp/Android.bp
core/tests/coretests/BinderProxyCountingTestService/Android.bp
core/tests/coretests/BstatsTestApp/Android.bp
core/tests/coretests/DisabledTestApp/Android.bp
core/tests/coretests/EnabledTestApp/Android.bp
core/tests/coretests/aidl/Android.bp
core/tests/coretests/apks/Android.bp
core/tests/coretests/apks/install/Android.bp
core/tests/coretests/apks/install_bad_dex/Android.bp
core/tests/coretests/apks/install_complete_package_info/Android.bp
core/tests/coretests/apks/install_decl_perm/Android.bp
core/tests/coretests/apks/install_jni_lib/Android.bp
core/tests/coretests/apks/install_jni_lib_open_from_apk/Android.bp
core/tests/coretests/apks/install_loc_auto/Android.bp
core/tests/coretests/apks/install_loc_internal/Android.bp
core/tests/coretests/apks/install_loc_sdcard/Android.bp
core/tests/coretests/apks/install_loc_unspecified/Android.bp
core/tests/coretests/apks/install_use_perm_good/Android.bp
core/tests/coretests/apks/install_uses_feature/Android.bp
core/tests/coretests/apks/install_verifier_bad/Android.bp
core/tests/coretests/apks/install_verifier_good/Android.bp
core/tests/coretests/apks/keyset/Android.bp
core/tests/coretests/apks/locales/Android.bp
core/tests/coretests/apks/overlay_config/Android.bp
core/tests/coretests/apks/version/Android.bp
core/tests/coretests/apks/version_nosys/Android.bp
core/tests/featureflagtests/Android.bp
core/tests/hdmitests/Android.bp
core/tests/hosttests/test-apps/AutoLocTestApp/Android.bp
core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocPermsFLTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPerms/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.bp
core/tests/hosttests/test-apps/InternalLocTestApp/Android.bp
core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.bp
core/tests/hosttests/test-apps/NoLocTestApp/Android.bp
core/tests/hosttests/test-apps/NoLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/NoLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/SharedUid/32/Android.bp
core/tests/hosttests/test-apps/SharedUid/32/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/64/Android.bp
core/tests/hosttests/test-apps/SharedUid/64/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/dual/Android.bp
core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/java_only/Android.bp
core/tests/hosttests/test-apps/SimpleTestApp/Android.bp
core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v1_ext/Android.bp
core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v2_int/Android.bp
core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v1_ext/Android.bp
core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v2_none/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_Auto/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_External/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_Internal/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_None/Android.bp
core/tests/mockingcoretests/Android.bp
core/tests/notificationtests/Android.bp
core/tests/overlaytests/device/Android.bp
core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.bp
core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.bp
core/tests/overlaytests/device/test-apps/FrameworkOverlay/Android.bp
core/tests/overlaytests/host/Android.bp
core/tests/overlaytests/remount/Android.bp
core/tests/overlaytests/remount/test-apps/Overlay/Android.bp
core/tests/overlaytests/remount/test-apps/SharedLibrary/Android.bp
core/tests/overlaytests/remount/test-apps/SharedLibraryOverlay/Android.bp
core/tests/overlaytests/remount/test-apps/Target/Android.bp
core/tests/packagemanagertests/Android.bp
core/tests/privacytests/Android.bp
core/tests/screenshothelpertests/Android.bp
core/tests/systemproperties/Android.bp
core/tests/utillib/Android.bp
core/tests/utiltests/Android.bp
core/tests/utiltests/jni/Android.bp
core/tests/uwbtests/Android.bp
core/xsd/Android.bp
core/xsd/vts/Android.bp
data/etc/Android.bp
data/etc/car/Android.bp
data/fonts/Android.bp
data/keyboards/Android.mk
drm/jni/Android.bp
errorprone/Android.bp
graphics/proto/Android.bp
keystore/Android.bp
keystore/tests/Android.bp
libs/WindowManager/Jetpack/Android.bp
libs/WindowManager/Shell/Android.bp
libs/WindowManager/Shell/tests/Android.bp
libs/androidfw/Android.bp
libs/androidfw/fuzz/resourcefile_fuzzer/Android.bp
libs/hostgraphics/Android.bp
libs/incident/Android.bp
libs/input/Android.bp
libs/input/tests/Android.bp
libs/protoutil/Android.bp
libs/services/Android.bp
libs/storage/Android.bp
libs/usb/tests/AccessoryChat/Android.bp
libs/usb/tests/AccessoryChat/accessorychat/Android.bp
location/lib/Android.bp
location/tests/Android.bp
location/tests/locationtests/Android.bp
lowpan/tests/Android.bp
media/Android.bp
media/java/Android.bp
media/java/android/media/tv/tunerresourcemanager/Android.bp
media/jni/Android.bp
media/jni/audioeffect/Android.bp
media/jni/soundpool/Android.bp
media/jni/soundpool/tests/Android.bp
media/lib/remotedisplay/Android.bp
media/lib/signer/Android.bp
media/lib/tvremote/Android.bp
media/lib/tvremote/tests/Android.bp
media/mca/filterfw/Android.bp
media/mca/filterfw/native/Android.bp
media/mca/filterpacks/Android.bp
media/mca/samples/CameraEffectsRecordingSample/Android.bp
media/mca/tests/Android.bp
media/native/midi/Android.bp
media/packages/BluetoothMidiService/Android.bp
media/packages/BluetoothMidiService/tests/unit/Android.bp
media/tests/AudioPolicyTest/Android.bp
media/tests/CameraBrowser/Android.bp
media/tests/EffectsTest/Android.bp
media/tests/MediaDump/Android.bp
media/tests/MediaFrameworkTest/Android.bp
media/tests/MediaRouter/Android.bp
media/tests/MtpTests/Android.bp
media/tests/ScoAudioTest/Android.bp
media/tests/SoundPoolTest/Android.bp
media/tests/TunerTest/Android.bp
media/tests/audiotests/Android.bp
media/tests/players/Android.bp
mime/Android.bp
native/android/Android.bp
native/graphics/jni/Android.bp
native/webview/loader/Android.bp
nfc-extras/Android.bp
nfc-extras/tests/Android.bp
packages/AppPredictionLib/Android.bp
packages/BackupEncryption/Android.bp
packages/BackupEncryption/test/robolectric-integration/Android.bp
packages/BackupEncryption/test/robolectric/Android.bp
packages/BackupEncryption/test/unittest/Android.bp
packages/BackupRestoreConfirmation/Android.bp
packages/CarSystemUI/Android.bp
packages/CarrierDefaultApp/Android.bp
packages/CarrierDefaultApp/tests/unit/Android.bp
packages/CompanionDeviceManager/Android.bp
packages/Connectivity/framework/Android.bp
packages/Connectivity/service/Android.bp
packages/CtsShim/Android.bp
packages/CtsShim/build/Android.bp
packages/CtsShim/build/jni/Android.bp
packages/DynamicSystemInstallationService/Android.bp
packages/DynamicSystemInstallationService/tests/Android.bp
packages/EasterEgg/Android.bp
packages/EncryptedLocalTransport/Android.bp
packages/ExtShared/Android.bp
packages/ExternalStorageProvider/Android.bp
packages/ExternalStorageProvider/tests/Android.bp
packages/FakeOemFeatures/Android.bp
packages/FusedLocation/Android.bp
packages/InputDevices/Android.bp
packages/LocalTransport/Android.bp
packages/PackageInstaller/Android.bp
packages/PrintRecommendationService/Android.bp
packages/PrintSpooler/Android.bp
packages/PrintSpooler/jni/Android.bp
packages/PrintSpooler/tests/outofprocess/Android.bp
packages/SettingsLib/ActionBarShadow/Android.bp
packages/SettingsLib/ActionButtonsPreference/Android.bp
packages/SettingsLib/AdaptiveIcon/Android.bp
packages/SettingsLib/Android.bp
packages/SettingsLib/AppPreference/Android.bp
packages/SettingsLib/BarChartPreference/Android.bp
packages/SettingsLib/DisplayDensityUtils/Android.bp
packages/SettingsLib/EntityHeaderWidgets/Android.bp
packages/SettingsLib/HelpUtils/Android.bp
packages/SettingsLib/LayoutPreference/Android.bp
packages/SettingsLib/ProgressBar/Android.bp
packages/SettingsLib/RadioButtonPreference/Android.bp
packages/SettingsLib/RestrictedLockUtils/Android.bp
packages/SettingsLib/SchedulesProvider/Android.bp
packages/SettingsLib/SearchProvider/Android.bp
packages/SettingsLib/SearchWidget/Android.bp
packages/SettingsLib/SettingsSpinner/Android.bp
packages/SettingsLib/SettingsTheme/Android.bp
packages/SettingsLib/Tile/Android.bp
packages/SettingsLib/Utils/Android.bp
packages/SettingsLib/search/Android.bp
packages/SettingsLib/tests/integ/Android.bp
packages/SettingsLib/tests/robotests/Android.bp
packages/SettingsProvider/Android.bp
packages/SharedStorageBackup/Android.bp
packages/Shell/Android.bp
packages/Shell/tests/Android.bp
packages/SimAppDialog/Android.bp
packages/SoundPicker/Android.bp
packages/StatementService/Android.bp
packages/SystemUI/Android.bp
packages/SystemUI/plugin/Android.bp
packages/SystemUI/plugin/ExamplePlugin/Android.bp
packages/SystemUI/plugin_core/Android.bp
packages/SystemUI/shared/Android.bp
packages/VpnDialogs/Android.bp
packages/WAPPushManager/Android.bp
packages/WAPPushManager/tests/Android.bp
packages/WallpaperBackup/Android.bp
packages/WallpaperCropper/Android.bp
packages/overlays/Android.mk
packages/overlays/tests/Android.bp
packages/services/PacProcessor/Android.bp
packages/services/PacProcessor/jni/Android.bp
packages/services/Proxy/Android.bp
proto/Android.bp
rs/jni/Android.mk
samples/demo/haptic-assessment/Android.bp
sax/tests/saxtests/Android.bp
services/Android.bp
services/accessibility/Android.bp
services/appprediction/Android.bp
services/appwidget/Android.bp
services/autofill/Android.bp
services/backup/Android.bp
services/backup/backuplib/Android.bp
services/companion/Android.bp
services/contentcapture/Android.bp
services/contentsuggestions/Android.bp
services/core/Android.bp
services/core/java/com/android/server/vcn/Android.bp
services/core/jni/Android.bp
services/core/xsd/Android.bp
services/core/xsd/vts/Android.bp
services/coverage/Android.bp
services/devicepolicy/Android.bp
services/incremental/Android.bp
services/midi/Android.bp
services/net/Android.bp
services/people/Android.bp
services/print/Android.bp
services/profcollect/Android.bp
services/restrictions/Android.bp
services/robotests/Android.bp
services/robotests/backup/Android.bp
services/systemcaptions/Android.bp
services/tests/PackageManagerComponentOverrideTests/Android.bp
services/tests/PackageManagerServiceTests/host/Android.bp
services/tests/PackageManagerServiceTests/host/test-apps/Android.bp
services/tests/mockingservicestests/Android.bp
services/tests/rescueparty/Android.bp
services/tests/servicestests/Android.bp
services/tests/servicestests/aidl/Android.bp
services/tests/servicestests/apks/Android.bp
services/tests/servicestests/apks/install-split-base/Android.bp
services/tests/servicestests/apks/install-split-feature-a/Android.bp
services/tests/servicestests/apks/install_intent_filters/Android.bp
services/tests/servicestests/apks/install_uses_sdk/Android.bp
services/tests/servicestests/test-apps/ConnTestApp/Android.bp
services/tests/servicestests/test-apps/JobTestApp/Android.bp
services/tests/servicestests/test-apps/PackageParserApp/Android.bp
services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
services/tests/servicestests/test-apps/SimpleServiceTestApp/Android.bp
services/tests/servicestests/test-apps/SuspendTestApp/Android.bp
services/tests/shortcutmanagerutils/Android.bp
services/tests/uiservicestests/Android.bp
services/tests/wmtests/Android.bp
services/usage/Android.bp
services/usb/Android.bp
services/voiceinteraction/Android.bp
services/wifi/Android.bp
startop/apps/test/Android.bp
startop/iorap/Android.bp
startop/iorap/functional_tests/Android.bp
startop/iorap/stress/Android.bp
startop/iorap/tests/Android.bp
startop/view_compiler/Android.bp
startop/view_compiler/dex_builder_test/Android.bp
test-base/hiddenapi/Android.bp
test-mock/Android.bp
test-runner/tests/Android.bp
tests/AccessibilityEventsLogger/Android.bp
tests/AccessoryDisplay/common/Android.bp
tests/AccessoryDisplay/sink/Android.bp
tests/AccessoryDisplay/source/Android.bp
tests/ActivityManagerPerfTests/stub-app/Android.bp
tests/ActivityManagerPerfTests/test-app/Android.bp
tests/ActivityManagerPerfTests/tests/Android.bp
tests/ActivityManagerPerfTests/utils/Android.bp
tests/ActivityTests/Android.bp
tests/ActivityViewTest/Android.bp
tests/AmSlam/Android.bp
tests/ApkVerityTest/Android.bp
tests/ApkVerityTest/ApkVerityTestApp/Android.bp
tests/ApkVerityTest/block_device_writer/Android.bp
tests/AppLaunch/Android.bp
tests/AppLaunchWear/Android.bp
tests/AppResourcesLoaders/Android.bp
tests/AppResourcesLoaders/Overlay/Android.bp
tests/Assist/Android.bp
tests/AutoVerify/app1/Android.bp
tests/AutoVerify/app2/Android.bp
tests/AutoVerify/app3/Android.bp
tests/AutoVerify/app4/Android.bp
tests/BackgroundDexOptServiceIntegrationTests/Android.bp
tests/BandwidthTests/Android.bp
tests/BatteryWaster/Android.bp
tests/BiDiTests/Android.bp
tests/BlobStoreTestUtils/Android.bp
tests/BootImageProfileTest/Android.bp
tests/BrowserPowerTest/Android.bp
tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp
tests/CameraPrewarmTest/Android.bp
tests/Codegen/Android.bp
tests/Compatibility/Android.bp
tests/CoreTests/android/Android.bp
tests/DataIdleTest/Android.bp
tests/DozeTest/Android.bp
tests/DpiTest/Android.bp
tests/DynamicCodeLoggerIntegrationTests/Android.mk
tests/FeatureSplit/base/Android.bp
tests/FeatureSplit/feature1/Android.bp
tests/FeatureSplit/feature2/Android.bp
tests/FixVibrateSetting/Android.bp
tests/FlickerTests/Android.bp
tests/FlickerTests/test-apps/Android.bp
tests/FlickerTests/test-apps/flickerapp/Android.bp
tests/FrameworkPerf/Android.bp
tests/GamePerformance/Android.bp
tests/GridLayoutTest/Android.bp
tests/HierarchyViewerTest/Android.bp
tests/HugeBackup/Android.bp
tests/HwAccelerationTest/Android.bp
tests/Internal/Android.bp
tests/JankBench/Android.bp
tests/JobSchedulerPerfTests/Android.bp
tests/JobSchedulerTestApp/Android.bp
tests/LargeAssetTest/Android.bp
tests/LegacyAssistant/Android.bp
tests/LocalizationTest/Android.bp
tests/LocationTracker/Android.bp
tests/LotsOfApps/Android.bp
tests/LowStorageTest/Android.bp
tests/ManagedProfileLifecycleStressTest/Android.bp
tests/ManagedProfileLifecycleStressTest/app/DummyDPC/Android.bp
tests/MemoryUsage/Android.bp
tests/MirrorSurfaceTest/Android.bp
tests/NativeProcessesMemoryTest/Android.bp
tests/NetworkSecurityConfigTest/Android.bp
tests/NullHomeTest/Android.bp
tests/OdmApps/Android.bp
tests/OdmApps/app/Android.bp
tests/OdmApps/priv-app/Android.bp
tests/OneMedia/Android.bp
tests/PackageWatchdog/Android.bp
tests/PlatformCompatGating/Android.bp
tests/PlatformCompatGating/test-rules/Android.bp
tests/ProtoInputStreamTests/Android.bp
tests/RemoteDisplayProvider/Android.bp
tests/RenderThreadTest/Android.bp
tests/RollbackTest/Android.bp
tests/SerialChat/Android.bp
tests/ServiceCrashTest/Android.bp
tests/SharedLibrary/client/Android.bp
tests/SharedLibrary/lib/Android.bp
tests/ShowWhenLockedApp/Android.bp
tests/SmokeTest/Android.bp
tests/SmokeTest/tests/Android.bp
tests/SmokeTestApps/Android.bp
tests/SoundTriggerTestApp/Android.bp
tests/Split/Android.bp
tests/StagedInstallTest/Android.bp
tests/StatusBar/Android.bp
tests/SurfaceComposition/Android.bp
tests/SurfaceControlViewHostTest/Android.bp
tests/SystemMemoryTest/device/Android.bp
tests/SystemMemoryTest/host/Android.bp
tests/SystemUIDemoModeController/Android.bp
tests/TaskOrganizerTest/Android.bp
tests/TelephonyCommonTests/Android.bp
tests/TouchLatency/Android.bp
tests/TransformTest/Android.bp
tests/TtsTests/Android.bp
tests/UiBench/Android.bp
tests/UsageReportingTest/Android.bp
tests/UsageStatsPerfTests/Android.bp
tests/UsageStatsTest/Android.bp
tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.bp
tests/UsbHostExternalManagmentTest/AoapTestHost/Android.bp
tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.bp
tests/UsbManagerTests/Android.bp
tests/UsbManagerTests/lib/Android.bp
tests/UsbTests/Android.bp
tests/UsesFeature2Test/Android.bp
tests/VectorDrawableTest/Android.bp
tests/VoiceEnrollment/Android.bp
tests/VoiceInteraction/Android.bp
tests/WallpaperTest/Android.bp
tests/WindowAnimationJank/Android.bp
tests/WindowInsetsTests/Android.bp
tests/appwidgets/AppWidgetHostTest/Android.bp
tests/appwidgets/AppWidgetProviderTest/Android.bp
tests/backup/Android.mk
tests/benchmarks/Android.bp
tests/libs-permissions/Android.bp
tests/net/Android.bp
tests/net/common/Android.bp
tests/net/deflake/Android.bp
tests/net/integration/Android.bp
tests/net/jni/Android.bp
tests/net/smoketest/Android.bp
tests/notification/Android.bp
tests/permission/Android.bp
tests/privapp-permissions/Android.bp
tests/testables/Android.bp
tests/testables/tests/Android.bp
tests/utils/StubIME/Android.bp
tests/utils/hostutils/Android.bp
tests/utils/testutils/Android.bp
tests/vcn/Android.bp
tools/aapt/Android.bp
tools/aapt2/Android.bp
tools/aapt2/integration-tests/AutoVersionTest/Android.bp
tools/aapt2/integration-tests/BasicTest/Android.bp
tools/aapt2/integration-tests/MergeOnlyTest/LeafLib/Android.mk
tools/aapt2/integration-tests/MergeOnlyTest/LocalLib/Android.mk
tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk
tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk
tools/aapt2/integration-tests/StaticLibTest/App/Android.bp
tools/aapt2/integration-tests/StaticLibTest/LibOne/Android.bp
tools/aapt2/integration-tests/StaticLibTest/LibTwo/Android.bp
tools/aapt2/integration-tests/SymlinkTest/Android.bp
tools/bit/Android.bp
tools/codegen/Android.bp
tools/dump-coverage/Android.bp
tools/incident_report/Android.bp
tools/incident_section_gen/Android.bp
tools/lock_agent/Android.bp
tools/locked_region_code_injection/Android.bp
tools/obbtool/Android.bp
tools/powermodel/Android.bp
tools/preload-check/Android.bp
tools/preload-check/device/Android.bp
tools/preload/loadclass/Android.bp
tools/processors/staledataclass/Android.bp
tools/processors/view_inspector/Android.bp
tools/protologtool/Android.bp
tools/sdkparcelables/Android.bp
tools/split-select/Android.bp
tools/streaming_proto/Android.bp
tools/validatekeymaps/Android.bp
wifi/java/Android.bp
wifi/tests/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
libs/hwui/Android.bp
native/webview/plat_support/Android.bp
obex/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
SPDX-license-identifier-CC-BY SPDX-license-identifier-CPL-1.0
SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
SPDX-license-identifier-W3C legacy_unencumbered
to:
Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
legacy_unencumbered
to:
core/java/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
test-base/Android.bp
test-runner/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL
to:
core/res/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0
to:
libs/usb/Android.bp
libs/usb/tests/accessorytest/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
to:
tools/preload/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
SPDX-license-identifier-Unicode-DFS
to:
api/Android.bp
boot/Android.bp
cmds/device_config/Android.bp
cmds/settings/Android.bp
core/api/Android.bp
core/tests/coretests/certs/Android.bp
core/tests/overlaytests/remount/test-apps/certs/Android.bp
core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp
core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp
libs/tracingproxy/Android.bp
services/startop/Android.bp
test-legacy/Android.mk
tests/ApkVerityTest/testdata/Android.bp
tests/TransitionTests/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Ic44d662936d1ff0cae7fbe915932b37aa4e4869a
Merged-in: I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06
|
||
|
Automerger Merge Worker
|
bf0626bc36 |
Merge "Merge "Additional OWNERS coverage for storage." am: d111833fd3 am: c7077507d0" into rvc-qpr-dev-plus-aosp am: f11186b845
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531982 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I472de486642f4fbc6bc37ba58cb88e196c5d7a39 |
||
|
Jeff Sharkey
|
9ac773a60b |
Additional OWNERS coverage for storage.
Bug: 174932174 Test: none Change-Id: I265ebd077d27d0d52d97a2c3c4a7147368be2498 |
||
|
Jeff Sharkey
|
cb1039d660 |
Merge "Add mobi extensions to known mime types" am: 806aa0b377 am: 08715462b9 am: 5848bfa206
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1514851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I107706ff1a59d76dfb610bba92d089df75a94f71 |
||
|
Jeff Sharkey
|
806aa0b377 | Merge "Add mobi extensions to known mime types" | ||
|
Sai Rijal
|
eeb1257df8 |
Add mobi extensions to known mime types
Allow .prc/.mobi file extensions to be read as a separate mobi mime type. This allows Android to open mobi files with the correct mime type. This in turn allows applications to set their intent filters based on mime type when opening mobi files. Test: CtsMimeMapTestCases Change-Id: I2b8f80f019f930f888e8e50db8b4efee0f0d4035 |
||
|
Jeff Sharkey
|
0ab7007631 |
resolve merge conflicts of 358f0d4fc8 to master
Bug: 174932174 Test: I solemnly swear I tested this conflict resolution. Exempt-From-Owner-Approval: refactoring with team leads buy-in Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c |
||
|
Jeff Sharkey
|
52b9862f87 |
Improve OWNERS coverage across frameworks/base/.
As general background, OWNERS files expedite code reviews by helping code authors quickly find relevant reviewers, and they also ensure that stakeholders are involved in code changes in their areas. Some teams under frameworks/base/ have been using OWNERS files successfully for many years, and we're ready to expand them to cover more areas. Here's the historical coverage statistics for the last two years of changes before these new OWNERS changes land: -- 56% of changes are fully covered by OWNERS -- 17% of changes are partially covered by OWNERS -- 25% of changes have no OWNERS coverage Working closely with team leads, we've now identified clear OWNERS on a per-package basis, and we're using "include" directives whenever possible to to simplify future maintenance. With this extensive effort, we've now improved our coverage as follows: -- 98% of changes are fully covered by OWNERS -- 1% of changes are partially covered by OWNERS -- 1% of changes have no OWNERS coverage This specific change is automatically generated by a script that identifies relevant "include" directives. Bug: 174932174 Test: manual Exempt-From-Owner-Approval: refactoring with team leads buy-in Merged-In: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813 Change-Id: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813 |
||
|
Vignesh Venkatasubramanian
|
c08511b34b |
Add AVIF mime type to android.mime.types
Associate "avif" extension to "image/avif" which is the mime type for AVIF images. Specification: https://aomediacodec.github.io/av1-avif/#mime-registration Unlike HEIF, AVIF does not have separate mime types for still images and sequences: https://github.com/AOMediaCodec/av1-avif/issues/59 Bug: 141654151 Change-Id: I34711d5354aac0b78e89502f84debf9ce0a1ddff |
||
|
Sahana Rao
|
42a1345445 |
Add additional optional audio/x-mpeg MIME type to MIME type map
audio/x-mpeg is a valid MIME type and still being used by some apps. Bug: 157127219 Test: atest CtsMimeMapTestCases Change-Id: I43d18d419a282ff0ca3ca5f2773d7002fcb62014 |
||
|
Jeff Sharkey
|
0db4811916 |
Fix inconsistent MIME type mapping.
MediaProvider heavily relies on developers to provide a MIME type, which it then translates into a file extension, and then later back into a MIME type. For this flow to work without apps losing access to the data they just wrote, all MIME types need to consistently map back to the same "major" type that they started with. This change adds tests to verify this consistency for all audio, video, and image MIME types, and fixes an obscure bug where the "audio/3gpp" MIME type would end up translating to "video/3gpp". Bug: 154667531 Test: atest CtsMimeMapTestCases Change-Id: I47998d8f4b1f9922a7d9439014e2f7f51f401f04 |
||
|
Jeff Sharkey
|
01c5b10196 |
Add more specific subtitles and lyrics MIME types.
"srt" subtitles have a more specific MIME type of "application/x-subrip", as listed here in Apache and therefore widely used across the Internet: http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/conf/mime.types "lrc" lyrics have a more specific MIME type of "application/lrc", as determined here from the archive.org scraping of popular Internet sites: https://discuss.httparchive.org/t/keeping-etc-mime-types-up-to-date/825 Bug: 143707020 Test: atest --test-mapping packages/providers/MediaProvider Change-Id: I9598d1de920f29fbda7efa3c17b5632f756a65f2 |
||
|
Jeff Sharkey
|
8a1370053c |
Add MIME type for "amr" audio files.
More details here: https://en.wikipedia.org/wiki/Adaptive_Multi-Rate_audio_codec Bug: 143521987 Test: manual Change-Id: Ic99672b746920d8733873e9df57a7c534e04e9d5 |
||
|
Jeff Sharkey
|
3d44b1009e |
Additional extensions based on real-world usage.
We've recently started working with the VideoLAN team to understand more about media files they regularly encounter in the wild, which may not have official IANA registrations. In particular, here's the official list they support: http://git.videolan.org/?p=vlc.git;a=blob_plain;f=include/vlc_interface.h;hb=HEAD Some of these file formats are far too obscure to have official MIME types at all, but for the ones that overlap with well-defined standards, this CL registers those extensions as valid options. -- Add SDP per https://tools.ietf.org/html/rfc4566 -- Add SMIL per https://en.wikipedia.org/wiki/Synchronized_Multimedia_Integration_Language -- Add TTML per https://en.wikipedia.org/wiki/Timed_Text_Markup_Language -- Add 3GA as a shortened version of https://en.wikipedia.org/wiki/Adaptive_Multi-Rate_audio_codec -- Add 3GP2 as shortened version of https://en.wikipedia.org/wiki/3GP_and_3G2 -- Add AC3/A52 per https://tools.ietf.org/html/rfc4184 -- Add M4B as audiobook version of https://en.wikipedia.org/wiki/MPEG-4_Part_14 -- Add M4P as protected version of https://en.wikipedia.org/wiki/MPEG-4_Part_14 -- Add several F4* variants per https://en.wikipedia.org/wiki/Flash_Video -- Add ADTS per https://www.w3.org/2013/12/byte-stream-format-registry/mpeg-audio-byte-stream-format.html -- Add MP4V/MPEG4 as alternative extensions -- Add MP2/MP1/MPA as alternative extensions -- Add MPEG2/MPV2/MP2V/M2V as alternative extensions -- Add MPEG1/MPV1/MP1V/M1V as alternative extensions -- Add M2T as tape-specific variant Additional information available in RFC 4337. Bug: 143549606 Test: atest --test-mapping frameworks/base/mime Change-Id: Id24b6abbb5149ec8cdcb098f43ff611b01a69e96 |
||
|
Tobias Thierer
|
033bce99cd |
vendor.mime.types: Revert accidental modification.
I had added some lines during verification of the base CL [1], but had
accidentally committed, uploaded and merged them. This CL reverts the
accidental addition.
[1] r.android.com/1136528 commit
|
||
|
Tobias Thierer
|
8e1c1f4d9d |
Minimize default MIME map and optimize loading.
This CL topic speeds up DefaultMimeMapFactory.create() from 15.5msec
to 5.7msec (measured by bundling a copy of the logic and data into
a test app) and saves 5.2 KByte of space (16 KBytes uncompressed) in
framework.jar. This CL topic does not change the amount of heap memory
consumed by the loaded MimeMap.
This is achieved by moving the following parsing steps from
DefaultMimeMapFactory into a build-time optimization step:
* strip off comments (starting with '#')
* normalize whitespace (trim leading and trailing whitespace;
replace remaining whitespace with a single ' ').
* drop lines that do not contain a ' ' after this step (those
only contained comments or only a MIME type without any
extension).
* use String.indexOf(char) in favor of String.contains(String) or
Pattern matching.
Noteworthy extra step specific to this CL:
* specifically for vendor.mime.types (but not android.mime.types),
add a prefix '?' to MIME types and extensions at build time,
rather than at runtime.
Note that after this CL, DefaultMimeMapFactory can now *only* parse
minimized *mime.types files, not the original (non-minimized) file
format.
Test: Checked that the mapping didn't change by checking that
a device flashed after this CL passes CtsMimeMapTestCases
built before this CL.
Test: Ran "make mimemap-res.jar" and manually verified that files
in the resulting jar look as expected.
Test: Locally added some extra mappings to vendor.mime.types, some
of them with a leading '?', and verified that they all show
up with exactly one leading '?' for the MIME type and each
extension within mimemap-res.jar.
Bug: 142267887
Change-Id: Idf1ef945a4ac225476f2036fbc8bb35eb9c090af
|
||
|
Tobias Thierer
|
8edd837b79 |
Track MimeMap moving to libcore.content.type.
Another CL in this topic moves libcore.net.MimeMap to package libcore.content.type. This CL updates associated references. Bug: 136256059 Bug: 124232146 Test: Treehugger Test: CtsMimeMapTestCases Exempt-From-Owner-Approval: move affecting imports only Change-Id: I30aac8b28a1740180ea01834a2bb66b61cb255d4 |
||
|
Tobias Thierer
|
65e6a23e40 | Merge "mime/Android.bp comment: Fix grammar." | ||
|
Tobias Thierer
|
9f3542fdf9 | Merge "CtsMimeMapTestCases: Run in presubmit for relevant packages." | ||
|
Tobias Thierer
|
9a3c44390b |
mime/Android.bp comment: Fix grammar.
This addresses an outstanding review comment from https://r.android.com/1130781 Test: Visual inspection only. Change-Id: Ica163c4a0ec5e963c53c0cc5f2be2cd50d279eeb |
||
|
Tobias Thierer
|
adeea59b4d |
Make CTS more opinionated about the platform's default MimeMap.
Historically, the mapping implemented by MimeMap (formerly MimeUtils)
was largely untested and therefore differed between Android devices.
This CL topic makes CtsMimeMapTestCases a lot more opinionated by
checking that:
- MimeMap.getDefault() must respect all of the mappings supplied
in stock Android. This is enforced via CTS bundling a copy of:
- the {,android.,vendor.}mime.types data files
- DefaultMimeMapFactory (rewritten via jarjar to
android.content.type.cts.StockAndroidMimeMapFactory)
MimeMap.getDefault() is allowed to implement _additional_
mappings, but changed or removed mappings are not allowed.
- Public APIs android.webkit.MimeTypeMap and
URLConnection.getFileNameMap() must behave consistently with
MimeMap.getDefault() (in stock Android, those APIs are
implemented directly on top of MimeMap.getDefault()).
Test: atest CtsMimeMapTestCases
Test: atest CtsLibcoreTestCases:libcore.libcore.net.MimeMapTest
Test: The above atest runs pass on a device that contains an
additional mapping in vendor.mime.types that is not
present in CTS.
Test: Checked that on a device that changes a mapping in
android.mime.types, CtsLibcoreTestCases still passes
but CtsMimeMapTestCases fails.
Bug: 141842930
Bug: 139895945
Change-Id: I68e0e9c3ce53c1acf2a89f8b80519f4658c07217
|
||
|
Tobias Thierer
|
af56126157 |
CtsMimeMapTestCases: Run in presubmit for relevant packages.
libcore.net.MimeMap might move to a different package in future, in which case that part of its TEST_MAPPING would move elsewhere. Test: croot frameworks/base/mime && atest Test: croot libcore/luni/src/main/java/libcore/net && atest Bug: 136256059 Change-Id: Id4aa29e6bbda439009bf82376865bff5cf36a6d9 |
||
|
Tobias Thierer
|
324349142c |
Introduce vendor.mime.types
Like mime.types and android.mime.types, this file specifies mappings
between MIME types and file extensions. Unlike those files, it can
only be used to define _additional_ mapping but not modify (change,
remove) any mappings defined by those files.
This is done by prepending '?' to every line element from
vendor.mime.types that doesn't already have one; when there is a
leading "?", it is ignored so that it's okay to move a line from
{android,vendor}.mime.types without necessarily changing it.
Test: Checked manually that vendor.mime.types works as expected.
Specifically, after adding these lines to vendor.mime.type:
audio/mpeg testmpeg
audio/testmpeg mp3
?mime/foo ?fooext
the following test passes:
MimeTypeMap map = MimeTypeMap.getSingleton();
// Original mapping is unchanged
assertEquals("mp3", map.getExtensionFromMimeType("audio/mpeg"));
assertEquals("audio/mpeg", map.getMimeTypeFromExtension("mp3"));
// Map from the key to existing value is added
assertEquals("audio/mpeg", map.getMimeTypeFromExtension("testmpeg"));
assertEquals("mp3", map.getExtensionFromMimeType("audio/testmpeg"));
// Completely new mapping is added both ways
assertEquals("mime/foo", map.getMimeTypeFromExtension("fooext"));
assertEquals("fooext", map.getExtensionFromMimeType("mime/foo"));
Bug: 141842825
Change-Id: Iaf918ce39324709ff58a8e0f9612e4827a673323
|
||
|
Tobias Thierer
|
e25c54f328 |
android.mime.types: Fix typo.
Test: Treehugger Change-Id: I60032b97251146006c2dc95b4be19c3d2d70697f |
||
|
Tobias Thierer
|
af0cef987d |
MimeMapImpl.createDefaultInstance() -> DefaultMimeMapFactory.create().
The class no longer implements MimeMap, so the name MimeMapImpl no longer made sense. Test: Treehugger Bug: 136256059 Change-Id: I2cbc70a7769232b704a9bdfde2def832c1e292b8 |
||
|
Tobias Thierer
|
fd9657d032 |
Make MimeMap final and introduce MimeMap.Builder.
This CL topic introduces a new @CorePlatformApi MimeMap.Builder
and uses it to make MimeMap a concrete, final, immutable type.
This has the following advantages:
- Consistency of behavior of MimeMap implementations with regards
to lower-casing and treatment of null is trivial to guarantee
because there is only one implementation.
- The @CorePlatformApi surface now makes more sense. The responsibility
for lower-casing and treatment of null was previously split between
MimeMap in libcore and MimeMapImpl in frameworks/base, which is why
MimeMap.toLowerCase() and MimeMap.isNullOrEmpty() were in the
@CorePlatformApi.
- Most of the logic now lives in libcore / ART module.
frameworks/base now has minimal logic. This makes it easier to write
(in a follow-up CL) a CTS test that asserts all the default mappings,
because that test can now duplicate that small amount of logic in
order to read from a copy of the same data files.
Note: The semantics of the @CorePlatformApi Builder.put(String, List<String>)
are fairly complex, which isn't great. This was done because:
- By following the semantics of the *mime.types file format, it allows
us to minimize the logic in frameworks/base.
- It's simpler than having multiple overloads of put() for
mimeType -> file extension mapping and vice versa,
and for whether or not any existing mapping should be overwritten.
If we had named classes for MimeType and FileExtension with
appropriate case-insensitive equals and hashCode semantics, then
we could instead have API such as
builder.asMimeToExtensionMap().put(...)
but existing API (e.g. Intent.getType(), android.webkit.MimeTypeMap)
has set precedent for treating these as Strings.
Bug: 136256059
Test: atest CtsLibcoreTestCases
Test: atest CtsMimeMapTestCases
Change-Id: I9a185a689745726dd79b15117892001461fa4a0d
|
||
|
Tobias Thierer
|
878c77b704 |
Move default MimeMap implementation to frameworks.
This is the second attempt to submit this CL. The first attempt
regressed on app startup because RuntimeInit installed the
custom MimeMap from commonInit() which runs post-fork of the zygote,
but that was fixed by installing it pre-fork.
This CL topic moves the default MimeMap implementation to frameworks.
Libcore starts with a minimal implementation sufficient to pass
CtsLibcoreTestCases, but frameworks can inject the real implementation.
Before this CL topic, the data files and logic (MimeMapImpl) were part of
core-*.jar on device; after this CL, they instead live in framework.jar.
Tests from MimeMapTest that check behavior of that default
implementation also move to a non-libcore CTS test.
Planned work for follow-up CL:
1. Make CTS more opinionated, with a plan to assert that all of
the default mappings are present. How exactly the expectated
mapping will be bundled in CTS is still TBD.
2. Add a vendor.mime.types file (defaults to empty) where vendors
can add additional mappings; I plan to make it such that mappings
in that file are parsed last but never override any earlier
mappings, as if each mime type / file extension was prefixed
with '?'.
3. Perhaps enforce that public APIs android.webkit.MimeTypeMap
and java.net.URLConnection.getFileNameMap() behave consistently
with MimeMap.getDefault().
Test: atest CtsLibcoreTestCases
Test: atest CtsMimeMapTestCases
Test: Checked that CtsLibcoreTestCases still passes on a build that
is missing the MimeMap.setDefault() call from RuntimeInit.java.
Test: Checked that app startup time does not regress as part of this
CL topic - see http://b/136256059#comment17
Bug: 136256059
Change-Id: I716914bf1a7e6205e539f0551f010615dacb17a8
|
||
|
Tobias Thierer
|
f83bd777f3 |
Revert "Move default MimeMap implementation to frameworks."
This reverts commit
|
||
|
Tobias Thierer
|
53f15f39f8 |
Move default MimeMap implementation to frameworks.
This CL topic moves the default MimeMap implementation to frameworks.
Libcore starts with a minimal implementation sufficient to pass
CtsLibcoreTestCases, but frameworks can inject the real implementation.
Before this CL topic, the data files and logic (MimeMapImpl) were part of
core-*.jar on device; after this CL, they instead live in framework.jar.
Tests from MimeMapTest that check behavior of that default
implementation also move to a non-libcore CTS test.
Specifically, the logic and android.mime.types now live in
frameworks/base/mime. The default implementation is injected
into libcore from RuntimeInit. I chose to use a separate directory
(frameworks/base/mime/) and build java_library target ("mimemap")
in order to keep this as separate as possible from the rest of
frameworks code, to make it as easy as possible to factor this
out into a separate APEX module if we ever choose to do so.
Planned work for follow-up CL:
1. Make CTS more opinionated, with a plan to assert that all of
the default mappings are present. How exactly the expectated
mapping will be bundled in CTS is still TBD.
2. Add a vendor.mime.types file (defaults to empty) where vendors
can add additional mappings; I plan to make it such that mappings
in that file are parsed last but never override any earlier
mappings, as if each mime type / file extension was prefixed
with '?'.
3. Perhaps enforce that public APIs android.webkit.MimeTypeMap
and java.net.URLConnection.getFileNameMap() behave consistently
with MimeMap.getDefault().
Test: atest CtsLibcoreTestCases
Test: atest CtsMimeMapTestCases
Bug: 136256059
Change-Id: Ib955699694d24a25c33ef2445443afb7c35ed9e7
|