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

Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future

Browse Source 
Bug: 347831320
Merged-In: I54a12b03ed9be6dc49fb957df0f1f7b31647810d
Change-Id: I473577d5983daafb368afa5523bad948499cb9a2
This commit is contained in:
Xin Li
2024-08-13 15:37:50 -07:00
parent 20fb15ea4b 94ea022aa1
commit 0b886fe303
9 changed files with 302 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@
package com.android.settings.development;
import android.annotation.Nullable;
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -27,7 +26,6 @@ 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;
@@ -49,6 +47,7 @@ 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;
@@ -82,8 +81,7 @@ public class AdbQrcodeScannerFragment extends WifiDppQrCodeBaseFragment implemen
/** QR code data scanned by camera */
private AdbQrCode mAdbQrCode;
@Nullable
private WifiConfiguration mAdbConfig;
private WifiNetworkConfig mAdbConfig;
private IAdbManager mAdbManager;
@@ -289,16 +287,13 @@ public class AdbQrcodeScannerFragment extends WifiDppQrCodeBaseFragment implemen
AdbQrCode.triggerVibrationForQrCodeRecognition(getContext());
mVerifyingTextView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
try {
if (mAdbConfig != null) {
mAdbManager.enablePairingByQrCode(mAdbConfig.SSID,
mAdbConfig.preSharedKey);
return;
}
mAdbManager.enablePairingByQrCode(mAdbConfig.getSsid(),
mAdbConfig.getPreSharedKey());
} catch (RemoteException e) {
Log.e(TAG, "Unable to enable QR code pairing" + e);
Log.e(TAG, "Unable to enable QR code pairing");
getActivity().setResult(Activity.RESULT_CANCELED);
getActivity().finish();
}
getActivity().setResult(Activity.RESULT_CANCELED);
getActivity().finish();
}
@Override