Skip to content

Commit 58ec984

Browse files
committed
使用ポートの監視機能は Android 10 未満の場合のみサポート。
1 parent efda320 commit 58ec984

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

dConnectManager/dConnectManager/dconnect-manager-app/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 28
5-
buildToolsVersion '28.0.3'
4+
compileSdkVersion 29
65

76
def getVersionName = { ->
87
def version

dConnectManager/dConnectManager/dconnect-manager-app/src/main/java/org/deviceconnect/android/manager/setting/SettingsFragment.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import android.preference.CheckBoxPreference;
2727
import android.preference.EditTextPreference;
2828
import android.preference.Preference;
29+
import android.preference.PreferenceCategory;
2930
import android.preference.PreferenceFragment;
3031
import android.preference.PreferenceScreen;
3132
import android.preference.SwitchPreference;
@@ -124,6 +125,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O
124125
*/
125126
private PauseHandlerImpl mPauseHandler;
126127

128+
@SuppressWarnings("deprecation")
127129
@Override
128130
public void onCreate(final Bundle savedInstanceState) {
129131
super.onCreate(savedInstanceState);
@@ -248,6 +250,10 @@ public void onCreate(final Bundle savedInstanceState) {
248250
// ポート監視設定のON/OFF
249251
mObserverPreferences = (CheckBoxPreference) getPreferenceScreen()
250252
.findPreference(getString(R.string.key_settings_dconn_observer_on_off));
253+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
254+
PreferenceCategory category = (PreferenceCategory) findPreference("setting_category_security");
255+
category.removePreference(mObserverPreferences);
256+
}
251257

252258
// Manager名の表示オンオフのチェックボックス.
253259
mCheckBoxManagerNameVisiblePreferences = (CheckBoxPreference) getPreferenceScreen()

dConnectManager/dConnectManager/dconnect-manager-app/src/main/res/xml/settings_dconnect_security.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
3-
<PreferenceCategory android:title="@string/activity_settings_security" >
3+
<PreferenceCategory
4+
android:title="@string/activity_settings_security"
5+
android:key="setting_category_security" >
46
<CheckBoxPreference
57
android:defaultValue="false"
68
android:key="@string/key_settings_dconn_availability_visible_name"

0 commit comments

Comments
 (0)