- Introduce a static long in SliceFeatureProvider that updates once every "session". A session is when user is in an UI (screen rotation, going to subpage, etc does not break the continuation of session). - Use session token in ContextualWifiSlice to determine when to refresh, instead of relying on WeakHashMap from CustomSliceManager. WeakHashMap can be cleaned up at any time by gc so it doesn't match what we want on the UI. - Also as a side fix, merged CustomSliceManager into SliceFeatureProvider. Fixes: 123937830 Test: robo Change-Id: I199bceceb208b99a32f3f08e624787b5a03e73a9
71 lines
2.3 KiB
Java
71 lines
2.3 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.wifi.slice;
|
|
|
|
import android.content.Context;
|
|
import android.net.Uri;
|
|
import android.net.wifi.WifiSsid;
|
|
import android.text.TextUtils;
|
|
import android.util.Log;
|
|
|
|
import androidx.annotation.VisibleForTesting;
|
|
import androidx.slice.Slice;
|
|
|
|
import com.android.settings.overlay.FeatureFactory;
|
|
import com.android.settings.slices.CustomSliceRegistry;
|
|
import com.android.settings.slices.CustomSliceable;
|
|
|
|
/**
|
|
* {@link CustomSliceable} for Wi-Fi, used by contextual homepage.
|
|
*/
|
|
public class ContextualWifiSlice extends WifiSlice {
|
|
|
|
private static final String TAG = "ContextualWifiSlice";
|
|
@VisibleForTesting
|
|
static long sActiveUiSession = -1000;
|
|
@VisibleForTesting
|
|
static boolean sPreviouslyDisplayed;
|
|
|
|
public ContextualWifiSlice(Context context) {
|
|
super(context);
|
|
}
|
|
|
|
@Override
|
|
public Uri getUri() {
|
|
return CustomSliceRegistry.CONTEXTUAL_WIFI_SLICE_URI;
|
|
}
|
|
|
|
@Override
|
|
public Slice getSlice() {
|
|
final long currentUiSession = FeatureFactory.getFactory(mContext)
|
|
.getSlicesFeatureProvider().getUiSessionToken();
|
|
if (currentUiSession != sActiveUiSession) {
|
|
sActiveUiSession = currentUiSession;
|
|
sPreviouslyDisplayed = false;
|
|
}
|
|
if (!sPreviouslyDisplayed && !TextUtils.equals(getActiveSSID(), WifiSsid.NONE)) {
|
|
Log.d(TAG, "Wifi is connected, no point showing any suggestion.");
|
|
return null;
|
|
}
|
|
// Set sPreviouslyDisplayed to true - we will show *something* on the screen. So we should
|
|
// keep showing this card to keep UI stable, even if wifi connects to a network later.
|
|
sPreviouslyDisplayed = true;
|
|
|
|
return super.getSlice();
|
|
}
|
|
}
|