summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/SystemServer.java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-02-06 19:46:04 -0500
committerJohn Spurlock <jspurlock@google.com>2015-02-09 17:13:38 -0500
commit6156017c2217d0fbbbb03434986250ec6bbd69d8 (patch)
tree2bf29bdfad945edeeb161b9ef9bb6b8108093042 /services/java/com/android/server/SystemServer.java
parent7d85bc4c435bc37284a814fb8baf53980396ab5b (diff)
downloadframeworks_base-6156017c2217d0fbbbb03434986250ec6bbd69d8.zip
frameworks_base-6156017c2217d0fbbbb03434986250ec6bbd69d8.tar.gz
frameworks_base-6156017c2217d0fbbbb03434986250ec6bbd69d8.tar.bz2
Move AudioService to services.
...and a few dependencies. Move remaining shared items to AudioSystem. Change-Id: Ib9623ff867678d34977337856bb0156e8cdaeeb5
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
-rw-r--r--services/java/com/android/server/SystemServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 7f9af31..875d395 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -29,7 +29,6 @@ import android.content.Intent;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
-import android.media.AudioService;
import android.media.tv.TvInputManager;
import android.os.Build;
import android.os.Environment;
@@ -60,6 +59,7 @@ import com.android.server.accessibility.AccessibilityManagerService;
import com.android.server.accounts.AccountManagerService;
import com.android.server.am.ActivityManagerService;
import com.android.server.am.BatteryStatsService;
+import com.android.server.audio.AudioService;
import com.android.server.clipboard.ClipboardService;
import com.android.server.content.ContentService;
import com.android.server.devicepolicy.DevicePolicyManagerService;