Fix rewriting upstream/crypto package in lib-datasource

PiperOrigin-RevId: 406840246

library/datasource/src/main/java/com/google/android/exoplayer2/upstream/AesCipherDataSink.java → library/datasource/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java

@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.google.android.exoplayer2.upstream;
+package com.google.android.exoplayer2.upstream.crypto;
 
 
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 import static java.lang.Math.min;
 import static java.lang.Math.min;
 
 
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.upstream.DataSink;
+import com.google.android.exoplayer2.upstream.DataSpec;
 import java.io.IOException;
 import java.io.IOException;
 import javax.crypto.Cipher;
 import javax.crypto.Cipher;
 
 

library/datasource/src/main/java/com/google/android/exoplayer2/upstream/AesCipherDataSource.java → library/datasource/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.google.android.exoplayer2.upstream;
+package com.google.android.exoplayer2.upstream.crypto;
 
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
@@ -21,6 +21,9 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 import android.net.Uri;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.TransferListener;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

library/datasource/src/main/java/com/google/android/exoplayer2/upstream/AesFlushingCipher.java → library/datasource/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.google.android.exoplayer2.upstream;
+package com.google.android.exoplayer2.upstream.crypto;
 
 
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Assertions;

library/datasource/src/test/java/com/google/android/exoplayer2/upstream/AesFlushingCipherTest.java → library/datasource/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.google.android.exoplayer2.upstream;
+package com.google.android.exoplayer2.upstream.crypto;
 
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertThat;
 import static java.lang.Math.min;
 import static java.lang.Math.min;