diff --git a/app.te b/app.te
index 1aa6b2377cc234b9fdb976af32d3b46d92787d93..9df1a083b1191ba1875e0fb87137e2532456dd6b 100644
--- a/app.te
+++ b/app.te
@@ -194,10 +194,7 @@ neverallow { appdomain -unconfineddomain } {
 }:chr_file { read write };
 
 # Note: Try expanding list of app domains in the future.
-neverallow { untrusted_app isolated_app shell -unconfineddomain } {
-    adf_device
-    graphics_device
-}:chr_file { read write };
+neverallow { untrusted_app isolated_app shell -unconfineddomain } graphics_device:chr_file { read write };
 
 neverallow { appdomain -nfc -unconfineddomain } nfc_device:chr_file
     { read write };
diff --git a/device.te b/device.te
index bf7b2e7d2fe59278309aee0a6c060ba1d6a4ef46..e9b7e515a482fefe995a996e03a5710b97c505f0 100644
--- a/device.te
+++ b/device.te
@@ -2,7 +2,6 @@
 type device, dev_type, fs_type;
 type alarm_device, dev_type, mlstrustedobject;
 type adb_device, dev_type;
-type adf_device, dev_type;
 type ashmem_device, dev_type, mlstrustedobject;
 type audio_device, dev_type;
 type binder_device, dev_type, mlstrustedobject;
diff --git a/file_contexts b/file_contexts
index fe493d3db0f944c8093b72a629cab60c72eedeaf..8ea7f6db13b3971008d671182cab395d2eca88c4 100644
--- a/file_contexts
+++ b/file_contexts
@@ -31,9 +31,9 @@
 /dev(/.*)?		u:object_r:device:s0
 /dev/akm8973.*		u:object_r:sensors_device:s0
 /dev/accelerometer	u:object_r:sensors_device:s0
-/dev/adf[0-9]*		u:object_r:adf_device:s0
-/dev/adf-interface[0-9]*\.[0-9]*	u:object_r:adf_device:s0
-/dev/adf-overlay-engine[0-9]*\.[0-9]*	u:object_r:adf_device:s0
+/dev/adf[0-9]*		u:object_r:graphics_device:s0
+/dev/adf-interface[0-9]*\.[0-9]*	u:object_r:graphics_device:s0
+/dev/adf-overlay-engine[0-9]*\.[0-9]*	u:object_r:graphics_device:s0
 /dev/alarm		u:object_r:alarm_device:s0
 /dev/android_adb.*	u:object_r:adb_device:s0
 /dev/ashmem		u:object_r:ashmem_device:s0
diff --git a/healthd.te b/healthd.te
index dd49e4e9b121fa8b879ea3d228b8bf5a04d62dfd..97c0ca589b39fa947e5e3388dd613d040a9156d9 100644
--- a/healthd.te
+++ b/healthd.te
@@ -23,7 +23,6 @@ allow healthd sysfs:file write;
 ### healthd: charger mode
 ###
 
-allow healthd adf_device:chr_file rw_file_perms;
 allow healthd graphics_device:dir r_dir_perms;
 allow healthd graphics_device:chr_file rw_file_perms;
 allow healthd input_device:dir r_dir_perms;
diff --git a/surfaceflinger.te b/surfaceflinger.te
index cea5e71a9227815d7a5179a4969e7c51efdfe9ca..5133786413618bac457a4b8bc0beb04b0238c909 100644
--- a/surfaceflinger.te
+++ b/surfaceflinger.te
@@ -29,9 +29,6 @@ allow surfaceflinger gpu_device:chr_file rw_file_perms;
 allow surfaceflinger graphics_device:dir search;
 allow surfaceflinger graphics_device:chr_file rw_file_perms;
 
-# Access ADF device nodes.
-allow surfaceflinger adf_device:chr_file rw_file_perms;
-
 # Access /dev/video1.
 allow surfaceflinger video_device:dir r_dir_perms;
 allow surfaceflinger video_device:chr_file rw_file_perms;