xiaoyan159/Android14Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 处理引用依赖问题

Browse Source
This commit is contained in:
xiaoyan159@6800H
2024-12-11 15:28:11 +08:00
parent df105485bd
commit 8454e55c4b
246 changed files with 14884 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
View File

@@ -40,7 +40,7 @@ import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import dalvik.system.VMRuntime;
//import dalvik.system.VMRuntime;
import java.util.ArrayList;
import java.util.List;
@@ -218,15 +218,15 @@ public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePref
}
private static String chooseAbi(ApplicationInfo ai) {
final String isa = VMRuntime.getCurrentInstructionSet();
if (ai.primaryCpuAbi != null
&& isa.equals(VMRuntime.getInstructionSet(ai.primaryCpuAbi))) {
return ai.primaryCpuAbi;
}
if (ai.secondaryCpuAbi != null
&& isa.equals(VMRuntime.getInstructionSet(ai.secondaryCpuAbi))) {
return ai.secondaryCpuAbi;
}
// final String isa = VMRuntime.getCurrentInstructionSet();
// if (ai.primaryCpuAbi != null
// && isa.equals(VMRuntime.getInstructionSet(ai.primaryCpuAbi))) {
// return ai.primaryCpuAbi;
// }
// if (ai.secondaryCpuAbi != null
// && isa.equals(VMRuntime.getInstructionSet(ai.secondaryCpuAbi))) {
// return ai.secondaryCpuAbi;
// }
return null;
}
}

27
Settings/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -56,6 +56,7 @@ import android.util.Log;
import android.widget.ImageView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.core.text.BidiFormatter;
import androidx.preference.Preference;
@@ -80,6 +81,7 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.search.SearchIndexableRaw;
import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.ActionButtonsPreference;
import com.android.settingslib.widget.LayoutPreference;
@@ -194,6 +196,31 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
private static final int TOKEN_QUERY_CARRIER_ID_AND_UPDATE_SIM_SUMMARY = 1;
private static final int COLUMN_CARRIER_NAME = 0;
@Override
public void updateNonIndexableKeys(List<String> keys) {
PreferenceControllerMixin.super.updateNonIndexableKeys(keys);
}
@Override
public void updateRawDataToIndex(List<SearchIndexableRaw> rawData) {
PreferenceControllerMixin.super.updateRawDataToIndex(rawData);
}
@Override
public void updateDynamicRawDataToIndex(List<SearchIndexableRaw> rawData) {
PreferenceControllerMixin.super.updateDynamicRawDataToIndex(rawData);
}
@Override
public void onForget(@NonNull WifiDialog2 dialog) {
WifiDialog2Listener.super.onForget(dialog);
}
@Override
public void onScan(@NonNull WifiDialog2 dialog, @NonNull String ssid) {
WifiDialog2Listener.super.onScan(dialog, ssid);
}
private class CarrierIdAsyncQueryHandler extends AsyncQueryHandler {
private CarrierIdAsyncQueryHandler(Context context) {