wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1195854: getNeighboringCells() is deprecated on Android M. r=sebastian

Browse Source
This commit is contained in:
Garvan Keeley 2015-08-31 00:35:53 -04:00
parent 6b74c9bbf9
commit 3950e83406
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScannerImplementation.java
View File

@ -85,7 +85,7 @@ public class CellScannerImplementation implements CellScanner.CellScannerImpl {
mIsStarted = true; mIsStarted = true;
if (mTelephonyManager == null) { if (mTelephonyManager == null) {
if (Build.VERSION.SDK_INT >= 18 /*Build.VERSION_CODES.JELLY_BEAN_MR2 */) { // Fennec: no Build.VERSION_CODES if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
mGetAllInfoCellScanner = new GetAllCellInfoScannerMr2(); mGetAllInfoCellScanner = new GetAllCellInfoScannerMr2();
} else { } else {
mGetAllInfoCellScanner = new GetAllCellInfoScannerDummy(); mGetAllInfoCellScanner = new GetAllCellInfoScannerDummy();
@ -170,6 +170,11 @@ public class CellScannerImplementation implements CellScanner.CellScannerImpl {
} }
private List<CellInfo> getNeighboringCells() { private List<CellInfo> getNeighboringCells() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
return Collections.emptyList();
}
@SuppressWarnings("deprecation")
Collection<NeighboringCellInfo> cells = mTelephonyManager.getNeighboringCellInfo(); Collection<NeighboringCellInfo> cells = mTelephonyManager.getNeighboringCellInfo();
if (cells == null || cells.isEmpty()) { if (cells == null || cells.isEmpty()) {
return Collections.emptyList(); return Collections.emptyList();