am 8510d31e: Rename camera_calibration_file and audio_firmware_file.

* commit '8510d31e':
  Rename camera_calibration_file and audio_firmware_file.

file.te

@@ -49,7 +49,7 @@ type shell_data_file, file_type, data_file_type;
 # /data/gps
 type gps_data_file, file_type, data_file_type;
 # /data/misc subdirectories
-type audio_firmware_file, file_type, data_file_type;
+type audio_data_file, file_type, data_file_type;
 type bluetooth_data_file, file_type, data_file_type;
 type media_data_file, file_type, data_file_type;
 type keystore_data_file, file_type, data_file_type;
@@ -58,8 +58,11 @@ type systemkeys_data_file, file_type, data_file_type;
 type wifi_data_file, file_type, data_file_type;
 type radio_data_file, file_type, data_file_type;
 type nfc_data_file, file_type, data_file_type;
-type camera_calibration_file, file_type, data_file_type;
+type camera_data_file, file_type, data_file_type;
 type adb_keys_file, file_type, data_file_type;
+# Compatibility with type names used in vanilla Android 4.3 and 4.4.
+typealias audio_data_file alias audio_firmware_file;
+typealias camera_data_file alias camera_calibration_file;
 # /data/data subdirectories - app sandboxes
 type app_data_file, file_type, data_file_type;
 type platform_app_data_file, file_type, data_file_type, mlstrustedobject;

file_contexts

@@ -167,7 +167,7 @@
 /data/tombstones(/.*)?	u:object_r:tombstone_data_file:s0
 /data/local/tmp(/.*)?	u:object_r:shell_data_file:s0
 # Misc data
-/data/misc/audio(/.*)?          u:object_r:audio_firmware_file:s0
+/data/misc/audio(/.*)?          u:object_r:audio_data_file:s0
 /data/misc/bluetooth(/.*)?	u:object_r:bluetooth_data_file:s0
 /data/misc/bluedroid(/.*)?	u:object_r:bluetooth_data_file:s0
 /data/misc/keystore(/.*)?	u:object_r:keystore_data_file:s0
@@ -175,7 +175,7 @@
 /data/misc/vpn(/.*)?		u:object_r:vpn_data_file:s0
 /data/misc/systemkeys(/.*)?	u:object_r:systemkeys_data_file:s0
 /data/misc/wifi(/.*)?		u:object_r:wifi_data_file:s0
-/data/misc/camera(/.*)?	u:object_r:camera_calibration_file:s0
+/data/misc/camera(/.*)?	u:object_r:camera_data_file:s0
 /data/misc/dhcp(/.*)?           u:object_r:dhcp_data_file:s0
 /data/misc/adb(/.*)?            u:object_r:adb_keys_file:s0
 # App sandboxes

mediaserver.te

@@ -47,13 +47,13 @@ allow mediaserver rpmsg_device:chr_file rw_file_perms;
 # Inter System processes communicate over named pipe (FIFO)
 allow mediaserver system_server:fifo_file r_file_perms;
 
-# Camera calibration
-allow mediaserver camera_calibration_file:dir r_dir_perms;
-allow mediaserver camera_calibration_file:file r_file_perms;
+# Camera data
+allow mediaserver camera_data_file:dir r_dir_perms;
+allow mediaserver camera_data_file:file r_file_perms;
 
-# Grant access to audio firmware files to mediaserver
-allow mediaserver audio_firmware_file:dir ra_dir_perms;
-allow mediaserver audio_firmware_file:file create_file_perms;
+# Grant access to audio files to mediaserver
+allow mediaserver audio_data_file:dir ra_dir_perms;
+allow mediaserver audio_data_file:file create_file_perms;
 
 # Read/[write] to /proc/net/xt_qtaguid/ctrl and /dev/xt_qtaguid
 allow mediaserver qtaguid_proc:file rw_file_perms;