summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2015-02-27 18:42:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-27 18:42:13 +0000
commit238cba35934e11c062c5f5da1768fcb474a8715d (patch)
treed356ac475b3cdf15803644a9798a29ed34aa4717
parent228fd600cebe51e612357489310bc239d6bf24cc (diff)
parent464c655871f4c1dd280474723e4b33f55044baa5 (diff)
downloadframeworks_base-238cba35934e11c062c5f5da1768fcb474a8715d.zip
frameworks_base-238cba35934e11c062c5f5da1768fcb474a8715d.tar.gz
frameworks_base-238cba35934e11c062c5f5da1768fcb474a8715d.tar.bz2
Merge "Move ALSA utilities to com.android.internal.alsa package"
-rw-r--r--core/java/com/android/internal/alsa/AlsaCardsParser.java (renamed from core/java/android/alsa/AlsaCardsParser.java)2
-rw-r--r--core/java/com/android/internal/alsa/AlsaDevicesParser.java (renamed from core/java/android/alsa/AlsaDevicesParser.java)2
-rw-r--r--core/java/com/android/internal/alsa/LineTokenizer.java (renamed from core/java/android/alsa/LineTokenizer.java)2
-rw-r--r--services/usb/java/com/android/server/usb/UsbAlsaManager.java4
4 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/alsa/AlsaCardsParser.java b/core/java/com/android/internal/alsa/AlsaCardsParser.java
index 5e88bca..5c0a888 100644
--- a/core/java/android/alsa/AlsaCardsParser.java
+++ b/core/java/com/android/internal/alsa/AlsaCardsParser.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.alsa;
+package com.android.internal.alsa;
import android.util.Slog;
import java.io.BufferedReader;
diff --git a/core/java/android/alsa/AlsaDevicesParser.java b/core/java/com/android/internal/alsa/AlsaDevicesParser.java
index b140d3d..81b7943 100644
--- a/core/java/android/alsa/AlsaDevicesParser.java
+++ b/core/java/com/android/internal/alsa/AlsaDevicesParser.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.alsa;
+package com.android.internal.alsa;
import android.util.Slog;
import java.io.BufferedReader;
diff --git a/core/java/android/alsa/LineTokenizer.java b/core/java/com/android/internal/alsa/LineTokenizer.java
index 78c91b5..43047a9 100644
--- a/core/java/android/alsa/LineTokenizer.java
+++ b/core/java/com/android/internal/alsa/LineTokenizer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.alsa;
+package com.android.internal.alsa;
/**
* @hide
diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
index 0aa8862..f869841 100644
--- a/services/usb/java/com/android/server/usb/UsbAlsaManager.java
+++ b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
@@ -16,8 +16,6 @@
package com.android.server.usb;
-import android.alsa.AlsaCardsParser;
-import android.alsa.AlsaDevicesParser;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
@@ -37,6 +35,8 @@ import android.os.UserHandle;
import android.provider.Settings;
import android.util.Slog;
+import com.android.internal.alsa.AlsaCardsParser;
+import com.android.internal.alsa.AlsaDevicesParser;
import com.android.server.audio.AudioService;
import libcore.io.IoUtils;