PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix WifiQrCode scheme inconsistency issue" into main

Browse Source
This commit is contained in:
Weng Su
2024-08-09 08:25:25 +00:00
committed by Android (Google) Code Review
parent fa28c7a636 7b0e5560d1
commit a65576cb0b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/wifi/dpp/WifiQrCode.java
View File

@@ -46,6 +46,7 @@ import android.util.Log;
* *
*/ */
public class WifiQrCode { public class WifiQrCode {
private static final String TAG = "WifiQrCode";
static final String SCHEME_DPP = "DPP"; static final String SCHEME_DPP = "DPP";
static final String SCHEME_ZXING_WIFI_NETWORK_CONFIG = "WIFI"; static final String SCHEME_ZXING_WIFI_NETWORK_CONFIG = "WIFI";
static final String PREFIX_DPP = "DPP:"; static final String PREFIX_DPP = "DPP:";
@@ -119,13 +120,13 @@ public class WifiQrCode {
try { try {
wifiQrCode = new WifiQrCode(qrCode); wifiQrCode = new WifiQrCode(qrCode);
} catch(IllegalArgumentException e) { } catch(IllegalArgumentException e) {
Log.e(TAG, "Failed to create WifiQrCode!", e);
return null; return null;
} }
if (wifiQrCode.getScheme() != UriParserResults.URI_SCHEME_DPP) {
if (SCHEME_DPP.equals(wifiQrCode.getScheme())) { Log.e(TAG, "wifiQrCode scheme is not DPP!");
return wifiQrCode; return null;
} }
return wifiQrCode;
return null;
} }
} }