2c3e6c6434
The feature failed after the CL "Force the adapter to rebind cards with a toggle". Because toggle slices have been forced to rebind after starting another activity and when any slice is updating. This unpins Wi-Fi slice and stops WifiScanWorker and then clears the saved clicked network. Solution: 1. Change ConnectToWifiHandler from activity to receiver and send broadcasts to it with FLAG_RECEIVER_FOREGROUND, so Wi-Fi slice won't be forced to rebind. 2. Seperate Wi-Fi scan worker and contextual Wi-Fi scan worker. Keep the original logic for the generic one, and then add the logic below to the contextual one. 3. Do not clear the saved clicked network when slice is unppined because it happens frequently in contextual homepage. 4. Introduce a static long in ContextualWifiScanWorker that updates once in every visible UI session. A session is when the screen is visible to user. 5. Use session token to determine whether auto-starting captive portal is needed. Fixes: 128056349 Test: robotest, visual in homepage and network panel Change-Id: I9e03c379806e124fa7253b2a635574b2433f6afc
95 lines
3.0 KiB
Java
95 lines
3.0 KiB
Java
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.slices;
|
|
|
|
import android.content.Context;
|
|
import android.net.Uri;
|
|
import android.os.SystemClock;
|
|
|
|
import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
|
|
import com.android.settings.wifi.calling.WifiCallingSliceHelper;
|
|
import com.android.settingslib.utils.ThreadUtils;
|
|
|
|
/**
|
|
* Manages Slices in Settings.
|
|
*/
|
|
public class SlicesFeatureProviderImpl implements SlicesFeatureProvider {
|
|
|
|
private long mUiSessionToken;
|
|
private SlicesIndexer mSlicesIndexer;
|
|
private SliceDataConverter mSliceDataConverter;
|
|
|
|
@Override
|
|
public SliceDataConverter getSliceDataConverter(Context context) {
|
|
if (mSliceDataConverter == null) {
|
|
mSliceDataConverter = new SliceDataConverter(context.getApplicationContext());
|
|
}
|
|
return mSliceDataConverter;
|
|
}
|
|
|
|
@Override
|
|
public void newUiSession() {
|
|
mUiSessionToken = SystemClock.elapsedRealtime();
|
|
}
|
|
|
|
@Override
|
|
public long getUiSessionToken() {
|
|
return mUiSessionToken;
|
|
}
|
|
|
|
@Override
|
|
public void indexSliceDataAsync(Context context) {
|
|
SlicesIndexer indexer = getSliceIndexer(context);
|
|
ThreadUtils.postOnBackgroundThread(indexer);
|
|
}
|
|
|
|
@Override
|
|
public void indexSliceData(Context context) {
|
|
SlicesIndexer indexer = getSliceIndexer(context);
|
|
indexer.indexSliceData();
|
|
}
|
|
|
|
@Override
|
|
public WifiCallingSliceHelper getNewWifiCallingSliceHelper(Context context) {
|
|
return new WifiCallingSliceHelper(context);
|
|
}
|
|
|
|
@Override
|
|
public Enhanced4gLteSliceHelper getNewEnhanced4gLteSliceHelper(Context context) {
|
|
return new Enhanced4gLteSliceHelper(context);
|
|
}
|
|
|
|
@Override
|
|
public CustomSliceable getSliceableFromUri(Context context, Uri uri) {
|
|
final Uri newUri = CustomSliceRegistry.removeParameterFromUri(uri);
|
|
final Class clazz = CustomSliceRegistry.getSliceClassByUri(newUri);
|
|
if (clazz == null) {
|
|
throw new IllegalArgumentException("No Slice found for uri: " + uri);
|
|
}
|
|
|
|
final CustomSliceable sliceable = CustomSliceable.createInstance(context, clazz);
|
|
return sliceable;
|
|
}
|
|
|
|
private SlicesIndexer getSliceIndexer(Context context) {
|
|
if (mSlicesIndexer == null) {
|
|
mSlicesIndexer = new SlicesIndexer(context.getApplicationContext());
|
|
}
|
|
return mSlicesIndexer;
|
|
}
|
|
}
|