Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 238cba35 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Move ALSA utilities to com.android.internal.alsa package"

parents 228fd600 464c6558

core/java/android/alsa/AlsaCardsParser.java→core/java/com/android/internal/alsa/AlsaCardsParser.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.alsa;

package com.android.internal.alsa;



import android.util.Slog;

import java.io.BufferedReader;

core/java/android/alsa/AlsaDevicesParser.java→core/java/com/android/internal/alsa/AlsaDevicesParser.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/alsa/LineTokenizer.java→core/java/com/android/internal/alsa/LineTokenizer.java

+1 −1
Original line number Diff line number Diff line
@@ -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

services/usb/java/com/android/server/usb/UsbAlsaManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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;