loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respectful language cleanup

Browse Source 
PiperOrigin-RevId: 357587009
This commit is contained in:
olly 2021-02-15 17:48:22 +00:00 committed by kim-vde
parent 7f5b5c9b6d
commit abaf1e10a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
View File

@ -448,9 +448,9 @@ public final class Loader implements LoaderErrorThrower {
obtainMessage(MSG_IO_EXCEPTION, new UnexpectedLoaderException(e)).sendToTarget(); obtainMessage(MSG_IO_EXCEPTION, new UnexpectedLoaderException(e)).sendToTarget();
} }
} catch (Error e) { } catch (Error e) {
// We'd hope that the platform would kill the process if an Error is thrown here, but the // We'd hope that the platform would shut down the process if an Error is thrown here, but
// executor may catch the error (b/20616433). Throw it here, but also pass and throw it from // the executor may catch the error (b/20616433). Throw it here, but also pass and throw it
// the handler thread so that the process dies even if the executor behaves in this way. // from the handler thread so the process dies even if the executor behaves in this way.
Log.e(TAG, "Unexpected error loading stream", e); Log.e(TAG, "Unexpected error loading stream", e);
if (!released) { if (!released) {
obtainMessage(MSG_FATAL_ERROR, e).sendToTarget(); obtainMessage(MSG_FATAL_ERROR, e).sendToTarget();

2
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java vendored
View File

@ -82,7 +82,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* *
* <p>[1] (key1, id1) is removed from the in-memory index ... the index is not stored to disk ... * <p>[1] (key1, id1) is removed from the in-memory index ... the index is not stored to disk ...
* [2] id1 is reused for a different key2 ... the index is not stored to disk ... [3] A file for * [2] id1 is reused for a different key2 ... the index is not stored to disk ... [3] A file for
* key2 is partially written using a path corresponding to id1 ... the process is killed before * key2 is partially written using a path corresponding to id1 ... the process is shut down before
* the index is stored to disk ... [4] The index is read from disk, causing the partially written * the index is stored to disk ... [4] The index is read from disk, causing the partially written
* file to be incorrectly associated to key1 * file to be incorrectly associated to key1
* *