Remove InlinedApi lint ignore.
Adds ignore for all lint errors in Chromium code. Changes minimum SDK for instrumentation tests to 16 from 14. Adds TargetApi annotations. BUG=webrtc:6597 Review-Url: https://codereview.webrtc.org/2670473004 Cr-Commit-Position: refs/heads/master@{#16412}
This commit is contained in:
@ -7,7 +7,6 @@
|
|||||||
to suppress.py. -->
|
to suppress.py. -->
|
||||||
<issue id="NewApi"></issue>
|
<issue id="NewApi"></issue>
|
||||||
|
|
||||||
<issue id="InlinedApi" severity="ignore"/>
|
|
||||||
<issue id="Assert" severity="ignore"/>
|
<issue id="Assert" severity="ignore"/>
|
||||||
<issue id="UseSparseArrays" severity="ignore"/>
|
<issue id="UseSparseArrays" severity="ignore"/>
|
||||||
|
|
||||||
@ -33,4 +32,9 @@
|
|||||||
<issue id="MissingApplicationIcon" severity="ignore"/>
|
<issue id="MissingApplicationIcon" severity="ignore"/>
|
||||||
<issue id="AllowBackup" severity="ignore"/>
|
<issue id="AllowBackup" severity="ignore"/>
|
||||||
<issue id="MissingVersion" severity="ignore"/>
|
<issue id="MissingVersion" severity="ignore"/>
|
||||||
|
|
||||||
|
<!-- Ignore all lint errors in Chromium code. -->
|
||||||
|
<issue id="all">
|
||||||
|
<ignore path="**/org/chromium/**/*.java" />
|
||||||
|
</issue>
|
||||||
</lint>
|
</lint>
|
||||||
|
|||||||
@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
package org.appspot.apprtc;
|
package org.appspot.apprtc;
|
||||||
|
|
||||||
|
import android.annotation.TargetApi;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.app.FragmentTransaction;
|
import android.app.FragmentTransaction;
|
||||||
@ -20,6 +21,7 @@ import android.content.pm.PackageManager;
|
|||||||
import android.media.projection.MediaProjection;
|
import android.media.projection.MediaProjection;
|
||||||
import android.media.projection.MediaProjectionManager;
|
import android.media.projection.MediaProjectionManager;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.util.DisplayMetrics;
|
import android.util.DisplayMetrics;
|
||||||
@ -191,8 +193,7 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven
|
|||||||
getWindow().addFlags(LayoutParams.FLAG_FULLSCREEN | LayoutParams.FLAG_KEEP_SCREEN_ON
|
getWindow().addFlags(LayoutParams.FLAG_FULLSCREEN | LayoutParams.FLAG_KEEP_SCREEN_ON
|
||||||
| LayoutParams.FLAG_DISMISS_KEYGUARD | LayoutParams.FLAG_SHOW_WHEN_LOCKED
|
| LayoutParams.FLAG_DISMISS_KEYGUARD | LayoutParams.FLAG_SHOW_WHEN_LOCKED
|
||||||
| LayoutParams.FLAG_TURN_SCREEN_ON);
|
| LayoutParams.FLAG_TURN_SCREEN_ON);
|
||||||
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
|
getWindow().getDecorView().setSystemUiVisibility(getSystemUiVisibility());
|
||||||
| View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
|
|
||||||
setContentView(R.layout.activity_call);
|
setContentView(R.layout.activity_call);
|
||||||
|
|
||||||
iceConnected = false;
|
iceConnected = false;
|
||||||
@ -362,14 +363,28 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven
|
|||||||
getApplicationContext(), peerConnectionParameters, CallActivity.this);
|
getApplicationContext(), peerConnectionParameters, CallActivity.this);
|
||||||
|
|
||||||
if (screencaptureEnabled) {
|
if (screencaptureEnabled) {
|
||||||
|
startScreenCapture();
|
||||||
|
} else {
|
||||||
|
startCall();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@TargetApi(19)
|
||||||
|
private static int getSystemUiVisibility() {
|
||||||
|
int flags = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN;
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
|
||||||
|
flags |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
|
||||||
|
}
|
||||||
|
return flags;
|
||||||
|
}
|
||||||
|
|
||||||
|
@TargetApi(21)
|
||||||
|
private void startScreenCapture() {
|
||||||
MediaProjectionManager mediaProjectionManager =
|
MediaProjectionManager mediaProjectionManager =
|
||||||
(MediaProjectionManager) getApplication().getSystemService(
|
(MediaProjectionManager) getApplication().getSystemService(
|
||||||
Context.MEDIA_PROJECTION_SERVICE);
|
Context.MEDIA_PROJECTION_SERVICE);
|
||||||
startActivityForResult(
|
startActivityForResult(
|
||||||
mediaProjectionManager.createScreenCaptureIntent(), CAPTURE_PERMISSION_REQUEST_CODE);
|
mediaProjectionManager.createScreenCaptureIntent(), CAPTURE_PERMISSION_REQUEST_CODE);
|
||||||
} else {
|
|
||||||
startCall();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -10,8 +10,6 @@
|
|||||||
|
|
||||||
package org.webrtc.voiceengine;
|
package org.webrtc.voiceengine;
|
||||||
|
|
||||||
import org.webrtc.Logging;
|
|
||||||
|
|
||||||
import android.annotation.TargetApi;
|
import android.annotation.TargetApi;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
@ -20,9 +18,9 @@ import android.media.AudioManager;
|
|||||||
import android.media.AudioRecord;
|
import android.media.AudioRecord;
|
||||||
import android.media.AudioTrack;
|
import android.media.AudioTrack;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
|
|
||||||
import java.util.Timer;
|
import java.util.Timer;
|
||||||
import java.util.TimerTask;
|
import java.util.TimerTask;
|
||||||
|
import org.webrtc.Logging;
|
||||||
|
|
||||||
// WebRtcAudioManager handles tasks that uses android.media.AudioManager.
|
// WebRtcAudioManager handles tasks that uses android.media.AudioManager.
|
||||||
// At construction, storeAudioParameters() is called and it retrieves
|
// At construction, storeAudioParameters() is called and it retrieves
|
||||||
@ -248,6 +246,7 @@ public class WebRtcAudioManager {
|
|||||||
|
|
||||||
// Returns true if the device has professional audio level of functionality
|
// Returns true if the device has professional audio level of functionality
|
||||||
// and therefore supports the lowest possible round-trip latency.
|
// and therefore supports the lowest possible round-trip latency.
|
||||||
|
@TargetApi(23)
|
||||||
private boolean isProAudioSupported() {
|
private boolean isProAudioSupported() {
|
||||||
return WebRtcAudioUtils.runningOnMarshmallowOrHigher()
|
return WebRtcAudioUtils.runningOnMarshmallowOrHigher()
|
||||||
&& context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUDIO_PRO);
|
&& context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUDIO_PRO);
|
||||||
|
|||||||
@ -10,16 +10,15 @@
|
|||||||
|
|
||||||
package org.webrtc.voiceengine;
|
package org.webrtc.voiceengine;
|
||||||
|
|
||||||
import org.webrtc.Logging;
|
import android.annotation.TargetApi;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.media.AudioFormat;
|
import android.media.AudioFormat;
|
||||||
import android.media.AudioManager;
|
import android.media.AudioManager;
|
||||||
import android.media.AudioTrack;
|
import android.media.AudioTrack;
|
||||||
import android.os.Process;
|
import android.os.Process;
|
||||||
|
|
||||||
import java.lang.Thread;
|
import java.lang.Thread;
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
|
import org.webrtc.Logging;
|
||||||
|
|
||||||
public class WebRtcAudioTrack {
|
public class WebRtcAudioTrack {
|
||||||
private static final boolean DEBUG = false;
|
private static final boolean DEBUG = false;
|
||||||
@ -130,6 +129,7 @@ public class WebRtcAudioTrack {
|
|||||||
audioTrack.flush();
|
audioTrack.flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TargetApi(21)
|
||||||
private int writeOnLollipop(AudioTrack audioTrack, ByteBuffer byteBuffer, int sizeInBytes) {
|
private int writeOnLollipop(AudioTrack audioTrack, ByteBuffer byteBuffer, int sizeInBytes) {
|
||||||
return audioTrack.write(byteBuffer, sizeInBytes, AudioTrack.WRITE_BLOCKING);
|
return audioTrack.write(byteBuffer, sizeInBytes, AudioTrack.WRITE_BLOCKING);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,9 +10,6 @@
|
|||||||
|
|
||||||
package org.webrtc;
|
package org.webrtc;
|
||||||
|
|
||||||
import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
|
|
||||||
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
|
|
||||||
|
|
||||||
import android.Manifest.permission;
|
import android.Manifest.permission;
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
import android.content.BroadcastReceiver;
|
import android.content.BroadcastReceiver;
|
||||||
@ -31,7 +28,6 @@ import android.net.wifi.WifiInfo;
|
|||||||
import android.net.wifi.WifiManager;
|
import android.net.wifi.WifiManager;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.telephony.TelephonyManager;
|
import android.telephony.TelephonyManager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -327,14 +323,17 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network);
|
final NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network);
|
||||||
return capabilities != null && capabilities.hasCapability(NET_CAPABILITY_INTERNET);
|
return capabilities != null
|
||||||
|
&& capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Only callable on Lollipop and newer releases. */
|
/** Only callable on Lollipop and newer releases. */
|
||||||
@SuppressLint("NewApi")
|
@SuppressLint("NewApi")
|
||||||
public void registerNetworkCallback(NetworkCallback networkCallback) {
|
public void registerNetworkCallback(NetworkCallback networkCallback) {
|
||||||
connectivityManager.registerNetworkCallback(
|
connectivityManager.registerNetworkCallback(
|
||||||
new NetworkRequest.Builder().addCapability(NET_CAPABILITY_INTERNET).build(),
|
new NetworkRequest.Builder()
|
||||||
|
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
|
||||||
|
.build(),
|
||||||
networkCallback);
|
networkCallback);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -342,7 +341,8 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
|
|||||||
@SuppressLint("NewApi")
|
@SuppressLint("NewApi")
|
||||||
public void requestMobileNetwork(NetworkCallback networkCallback) {
|
public void requestMobileNetwork(NetworkCallback networkCallback) {
|
||||||
NetworkRequest.Builder builder = new NetworkRequest.Builder();
|
NetworkRequest.Builder builder = new NetworkRequest.Builder();
|
||||||
builder.addCapability(NET_CAPABILITY_INTERNET).addTransportType(TRANSPORT_CELLULAR);
|
builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
|
||||||
|
.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
|
||||||
connectivityManager.requestNetwork(builder.build(), networkCallback);
|
connectivityManager.requestNetwork(builder.build(), networkCallback);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
<uses-feature android:name="android.hardware.camera.autofocus" />
|
<uses-feature android:name="android.hardware.camera.autofocus" />
|
||||||
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
|
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
|
||||||
|
|
||||||
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
|
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.CAMERA" />
|
<uses-permission android:name="android.permission.CAMERA" />
|
||||||
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
||||||
|
|||||||
@ -14,6 +14,7 @@ import static org.junit.Assert.assertEquals;
|
|||||||
import static org.junit.Assert.assertFalse;
|
import static org.junit.Assert.assertFalse;
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
|
|
||||||
|
import android.annotation.TargetApi;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.hardware.camera2.CameraAccessException;
|
import android.hardware.camera2.CameraAccessException;
|
||||||
import android.hardware.camera2.CameraDevice;
|
import android.hardware.camera2.CameraDevice;
|
||||||
@ -31,6 +32,7 @@ import org.junit.Before;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
@TargetApi(21)
|
||||||
@RunWith(BaseJUnit4ClassRunner.class)
|
@RunWith(BaseJUnit4ClassRunner.class)
|
||||||
public class Camera2CapturerTest {
|
public class Camera2CapturerTest {
|
||||||
static final String TAG = "Camera2CapturerTest";
|
static final String TAG = "Camera2CapturerTest";
|
||||||
|
|||||||
Reference in New Issue
Block a user