Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
d4362096
Commit
d4362096
authored
6 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
Release: version 148
Change-Id: Iaa28a0df3cf999d5721122d6993ec279083f20ac
parent
a1e6a73a
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ring-android/app/build.gradle
+2
-2
2 additions, 2 deletions
ring-android/app/build.gradle
ring-android/app/src/main/java/cx/ring/services/HardwareServiceImpl.java
+1
-1
1 addition, 1 deletion
...p/src/main/java/cx/ring/services/HardwareServiceImpl.java
with
3 additions
and
3 deletions
ring-android/app/build.gradle
+
2
−
2
View file @
d4362096
...
@@ -8,8 +8,8 @@ android {
...
@@ -8,8 +8,8 @@ android {
defaultConfig
{
defaultConfig
{
minSdkVersion
21
minSdkVersion
21
targetSdkVersion
28
targetSdkVersion
28
versionCode
14
7
versionCode
14
8
versionName
"2019
0
12
7
"
versionName
"2019
12
12"
}
}
sourceSets
{
sourceSets
{
...
...
This diff is collapsed.
Click to expand it.
ring-android/app/src/main/java/cx/ring/services/HardwareServiceImpl.java
+
1
−
1
View file @
d4362096
...
@@ -62,7 +62,7 @@ public class HardwareServiceImpl extends HardwareService implements AudioManager
...
@@ -62,7 +62,7 @@ public class HardwareServiceImpl extends HardwareService implements AudioManager
private
static
final
Point
VIDEO_SIZE_FULL_HD
=
new
Point
(
1920
,
1080
);
private
static
final
Point
VIDEO_SIZE_FULL_HD
=
new
Point
(
1920
,
1080
);
private
static
final
Point
VIDEO_SIZE_ULTRA_HD
=
new
Point
(
3840
,
2160
);
private
static
final
Point
VIDEO_SIZE_ULTRA_HD
=
new
Point
(
3840
,
2160
);
private
static
final
String
TAG
=
HardwareServiceImpl
.
class
.
getName
();
private
static
final
String
TAG
=
HardwareServiceImpl
.
class
.
get
Simple
Name
();
private
static
WeakReference
<
TextureView
>
mCameraPreviewSurface
=
new
WeakReference
<>(
null
);
private
static
WeakReference
<
TextureView
>
mCameraPreviewSurface
=
new
WeakReference
<>(
null
);
private
static
final
Map
<
String
,
WeakReference
<
SurfaceHolder
>>
videoSurfaces
=
Collections
.
synchronizedMap
(
new
HashMap
<>());
private
static
final
Map
<
String
,
WeakReference
<
SurfaceHolder
>>
videoSurfaces
=
Collections
.
synchronizedMap
(
new
HashMap
<>());
private
final
Map
<
String
,
Shm
>
videoInputs
=
new
HashMap
<>();
private
final
Map
<
String
,
Shm
>
videoInputs
=
new
HashMap
<>();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment