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

Commit c5d0cd89 authored by Paul McLean's avatar Paul McLean Committed by Android (Google) Code Review
Browse files

Merge "Changed namespace of AlsaParser (and components) to correctly reflect... 

Merge "Changed namespace of AlsaParser (and components) to correctly reflect their place in the directory hierarchy."
parents 1dfa9d98 65a30ab5

core/java/android/alsa/AlsaCardsParser.java

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

 */



package com.android.alsascan;

package android.alsa;



import android.util.Slog;

import java.io.BufferedReader;

core/java/android/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 com.android.alsascan;

package android.alsa;



import android.util.Slog;

import java.io.BufferedReader;

core/java/android/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 com.android.alsascan;

package android.alsa;



/**

 * @hide

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

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.usb;



import android.alsa.AlsaCardsParser;

import android.alsa.AlsaDevicesParser;

import android.content.Context;

import android.content.Intent;

import android.hardware.usb.UsbConfiguration;
@@ -29,8 +31,6 @@ import android.os.Parcelable; 
import android.os.UserHandle;

import android.util.Slog;



import com.android.alsascan.AlsaCardsParser;

import com.android.alsascan.AlsaDevicesParser;

import com.android.internal.annotations.GuardedBy;



import java.io.File;