File: remove-use-of-_-variable-name.patch

package info (click to toggle)
android-framework-23 6.0.1%2Br72-5
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 233,244 kB
  • sloc: java: 1,707,033; xml: 247,323; cpp: 211,819; ansic: 2,748; python: 2,640; sh: 1,517; yacc: 343; lex: 214; ruby: 183; perl: 88; makefile: 63; sed: 19
file content (28 lines) | stat: -rw-r--r-- 1,068 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
Subject: Remove use of '_' variable name

To build with Java 9 and newer.

Forwarded: https://android.googlesource.com/platform/frameworks/base/+/00d6b601e6257d86b173f743d76396ec3183a5e8%5E%21/#F0

diff --git a/frameworks/base/media/java/android/media/SRTRenderer.java b/frameworks/base/media/java/android/media/SRTRenderer.java
index ee4edee..a3e2abd 100644
--- a/frameworks/base/media/java/android/media/SRTRenderer.java
+++ b/frameworks/base/media/java/android/media/SRTRenderer.java
@@ -165,7 +165,6 @@
             return;
         }
 
-        final int _ = 0;
         for (Cue cue : activeCues) {
             TextTrackCue ttc = (TextTrackCue) cue;
 
@@ -184,7 +183,8 @@
             parcel.writeInt(buf.length);
             parcel.writeByteArray(buf);
 
-            Message msg = mEventHandler.obtainMessage(MEDIA_TIMED_TEXT, _, _, parcel);
+            Message msg = mEventHandler.obtainMessage(MEDIA_TIMED_TEXT, 0 /* arg1 */, 0 /* arg2 */,
+                    parcel);
             mEventHandler.sendMessage(msg);
         }
         activeCues.clear();