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

wifi: Using framework uri parsing

Browse Source 
Bug: 298669190
Test: Manual test. Qr code sacnning works normally.
Change-Id: I8e6138971ae6798b42db32930f80e9113a8c0223
This commit is contained in:
Les Lee
2024-03-22 05:11:08 +00:00
parent a9f137842a
commit 1635951de2
5 changed files with 65 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/development/AdbQrcodeScannerFragment.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.development;
import android.annotation.Nullable;
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -26,6 +27,7 @@ import android.debug.IAdbManager;
import android.graphics.Matrix;
import android.graphics.Rect;
import android.graphics.SurfaceTexture;
import android.net.wifi.WifiConfiguration;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -47,7 +49,6 @@ import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.wifi.dpp.AdbQrCode;
import com.android.settings.wifi.dpp.WifiDppQrCodeBaseFragment;
import com.android.settings.wifi.dpp.WifiNetworkConfig;
import com.android.settingslib.qrcode.QrCamera;
import com.android.settingslib.qrcode.QrDecorateView;
@@ -81,7 +82,8 @@ public class AdbQrcodeScannerFragment extends WifiDppQrCodeBaseFragment implemen
/** QR code data scanned by camera */
private AdbQrCode mAdbQrCode;
private WifiNetworkConfig mAdbConfig;
@Nullable
private WifiConfiguration mAdbConfig;
private IAdbManager mAdbManager;
@@ -287,13 +289,16 @@ public class AdbQrcodeScannerFragment extends WifiDppQrCodeBaseFragment implemen
AdbQrCode.triggerVibrationForQrCodeRecognition(getContext());
mVerifyingTextView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
try {
mAdbManager.enablePairingByQrCode(mAdbConfig.getSsid(),
mAdbConfig.getPreSharedKey());
if (mAdbConfig != null) {
mAdbManager.enablePairingByQrCode(mAdbConfig.SSID,
mAdbConfig.preSharedKey);
return;
}
} catch (RemoteException e) {
Log.e(TAG, "Unable to enable QR code pairing");
getActivity().setResult(Activity.RESULT_CANCELED);
getActivity().finish();
Log.e(TAG, "Unable to enable QR code pairing" + e);
}
getActivity().setResult(Activity.RESULT_CANCELED);
getActivity().finish();
}
@Override