Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
bfbfb3c1
Commit
bfbfb3c1
authored
Jul 11, 2018
by
Sylvain Berfini
🎩
Browse files
Fix to be able to use AAR in 3.4.X android branch
parent
60d6f372
Pipeline
#154
failed with stage
in 0 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
java/impl/org/linphone/core/tools/AndroidPlatformHelper.java
java/impl/org/linphone/core/tools/AndroidPlatformHelper.java
+1
-1
wrappers/java/classes/tools/AndroidPlatformHelper.java
wrappers/java/classes/tools/AndroidPlatformHelper.java
+1
-1
No files found.
java/impl/org/linphone/tools/AndroidPlatformHelper.java
→
java/impl/org/linphone/
core/
tools/AndroidPlatformHelper.java
View file @
bfbfb3c1
...
...
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package
org.linphone.tools
;
package
org.linphone.
core.
tools
;
import
org.linphone.mediastream.Log
;
import
org.linphone.mediastream.MediastreamerAndroidContext
;
...
...
wrappers/java/classes/tools/AndroidPlatformHelper.java
View file @
bfbfb3c1
...
...
@@ -75,7 +75,7 @@ public class AndroidPlatformHelper {
mPowerManager
=
(
PowerManager
)
mContext
.
getSystemService
(
Context
.
POWER_SERVICE
);
mConnectivityManager
=
(
ConnectivityManager
)
mContext
.
getSystemService
(
Context
.
CONNECTIVITY_SERVICE
);
mWakeLock
=
mPowerManager
.
newWakeLock
(
PowerManager
.
PARTIAL_WAKE_LOCK
,
"AndroidPlatformHelper"
);
mWakeLock
=
mPowerManager
.
newWakeLock
(
PowerManager
.
PARTIAL_WAKE_LOCK
,
"AndroidPlatformHelper"
);
mWakeLock
.
setReferenceCounted
(
true
);
mMcastLock
=
wifiMgr
.
createMulticastLock
(
"AndroidPlatformHelper"
);
mMcastLock
.
setReferenceCounted
(
true
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment