Merge branch 'Java7'

Author: HuuNguyen312

app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion rootProject.ext.androidCompileSdkVersion
-    buildToolsVersion rootProject.ext.androidBuildToolsVersion
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -13,18 +13,18 @@ android {
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-        ndk.abiFilters = ['arm64-v8a']
+        ndk.abiFilters = ['arm64-v8a','x86']
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
+    /*compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-    }
+    }*/
     packagingOptions {
         exclude 'META-INF/MANIFEST.MF'
     }

app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
+    <uses-sdk android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />

app/src/main/java/org/appspot/apprtc/AppRTCAudioManager.java

@@ -184,10 +184,15 @@ private AppRTCAudioManager(Context context) {
     // Tablet devices (e.g. Nexus 7) does not support proximity sensors.
     // Note that, the sensor will not be active until start() has been called.
     proximitySensor = AppRTCProximitySensor.create(context,
-        // This method will be called each time a state change is detected.
-        // Example: user holds his hand over the device (closer than ~5 cm),
-        // or removes his hand from the device.
-        this ::onProximitySensorChangedState);
+            // This method will be called each time a state change is detected.
+            // Example: user holds his hand over the device (closer than ~5 cm),
+            // or removes his hand from the device.
+            new Runnable() {
+              @Override
+              public void run() {
+                onProximitySensorChangedState();
+              }
+            });
 
     Log.d(TAG, "defaultAudioDevice: " + defaultAudioDevice);
     AppRTCUtils.logDeviceInfo(TAG);

app/src/main/java/org/appspot/apprtc/CallActivity.java

@@ -47,6 +47,7 @@
 import org.webrtc.Camera2Enumerator;
 import org.webrtc.CameraEnumerator;
 import org.webrtc.EglBase;
+import org.webrtc.EglBaseHelper;
 import org.webrtc.FileVideoCapturer;
 import org.webrtc.IceCandidate;
 import org.webrtc.Logging;
@@ -232,7 +233,7 @@ public void onClick(View view) {
     remoteSinks.add(remoteProxyRenderer);
 
     final Intent intent = getIntent();
-    final EglBase eglBase = EglBase.create();
+    final EglBase eglBase = EglBaseHelper.create();
 
     // Create video renderers.
     pipRenderer.init(eglBase.getEglBaseContext(), null);

app/src/main/java/org/appspot/apprtc/DirectRTCClient.java

@@ -235,7 +235,7 @@ public void onTCPConnected(boolean isServer) {
 
       SignalingParameters parameters = new SignalingParameters(
           // Ice servers are not needed for direct connections.
-          new ArrayList<>(),
+          new ArrayList<PeerConnection.IceServer>(),
           isServer, // Server side acts as the initiator on direct connections.
           null, // clientId
           null, // wssUrl
@@ -271,7 +271,7 @@ public void onTCPMessage(String msg) {
 
         SignalingParameters parameters = new SignalingParameters(
             // Ice servers are not needed for direct connections.
-            new ArrayList<>(),
+            new ArrayList<PeerConnection.IceServer>(),
             false, // This code will only be run on the client side. So, we are not the initiator.
             null, // clientId
             null, // wssUrl