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

Add more logging.

Browse Source 
Bug: 296507968
Test: atest
Change-Id: I7b4372d749713638c7973e9fe8bcf7e14a96e2de
This commit is contained in:
Yiyi Shen
2023-10-18 17:52:04 +08:00
parent ca8885a549
commit f512283d8d
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/connecteddevice/fastpair/FastPairDeviceGroupController.java
View File

@@ -22,6 +22,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -44,7 +45,10 @@ import com.android.settings.overlay.FeatureFactory;
public class FastPairDeviceGroupController extends BasePreferenceController public class FastPairDeviceGroupController extends BasePreferenceController
implements PreferenceControllerMixin, DefaultLifecycleObserver, DevicePreferenceCallback { implements PreferenceControllerMixin, DefaultLifecycleObserver, DevicePreferenceCallback {
private static final String TAG = "FastPairDeviceGroupCtr";
private static final String KEY = "fast_pair_device_list"; private static final String KEY = "fast_pair_device_list";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@VisibleForTesting PreferenceGroup mPreferenceGroup; @VisibleForTesting PreferenceGroup mPreferenceGroup;
private final FastPairDeviceUpdater mFastPairDeviceUpdater; private final FastPairDeviceUpdater mFastPairDeviceUpdater;
@@ -68,6 +72,7 @@ public class FastPairDeviceGroupController extends BasePreferenceController
mFastPairDeviceUpdater = mFastPairDeviceUpdater =
fastPairFeatureProvider.getFastPairDeviceUpdater(context, this); fastPairFeatureProvider.getFastPairDeviceUpdater(context, this);
} else { } else {
Log.d(TAG, "Flag disabled. Ignored.");
mFastPairDeviceUpdater = null; mFastPairDeviceUpdater = null;
} }
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -78,6 +83,10 @@ public class FastPairDeviceGroupController extends BasePreferenceController
public void onStart(@NonNull LifecycleOwner owner) { public void onStart(@NonNull LifecycleOwner owner) {
if (mFastPairDeviceUpdater != null) { if (mFastPairDeviceUpdater != null) {
mFastPairDeviceUpdater.registerCallback(); mFastPairDeviceUpdater.registerCallback();
} else {
if (DEBUG) {
Log.d(TAG, "Callback register: Fast Pair device updater is null. Ignore.");
}
} }
mContext.registerReceiver(mReceiver, mIntentFilter, Context.RECEIVER_EXPORTED_UNAUDITED); mContext.registerReceiver(mReceiver, mIntentFilter, Context.RECEIVER_EXPORTED_UNAUDITED);
} }
@@ -86,6 +95,10 @@ public class FastPairDeviceGroupController extends BasePreferenceController
public void onStop(@NonNull LifecycleOwner owner) { public void onStop(@NonNull LifecycleOwner owner) {
if (mFastPairDeviceUpdater != null) { if (mFastPairDeviceUpdater != null) {
mFastPairDeviceUpdater.unregisterCallback(); mFastPairDeviceUpdater.unregisterCallback();
} else {
if (DEBUG) {
Log.d(TAG, "Callback unregister: Fast Pair device updater is null. Ignore.");
}
} }
mContext.unregisterReceiver(mReceiver); mContext.unregisterReceiver(mReceiver);
} }
@@ -117,14 +130,24 @@ public class FastPairDeviceGroupController extends BasePreferenceController
@Override @Override
public void onDeviceAdded(Preference preference) { public void onDeviceAdded(Preference preference) {
if (preference == null) return; if (preference == null) {
if (DEBUG) {
Log.d(TAG, "onDeviceAdded receives null preference. Ignore.");
}
return;
}
mPreferenceGroup.addPreference(preference); mPreferenceGroup.addPreference(preference);
updatePreferenceVisibility(); updatePreferenceVisibility();
} }
@Override @Override
public void onDeviceRemoved(Preference preference) { public void onDeviceRemoved(Preference preference) {
if (preference == null) return; if (preference == null) {
if (DEBUG) {
Log.d(TAG, "onDeviceRemoved receives null preference. Ignore.");
}
return;
}
mPreferenceGroup.removePreference(preference); mPreferenceGroup.removePreference(preference);
updatePreferenceVisibility(); updatePreferenceVisibility();
} }

9
src/com/android/settings/connecteddevice/fastpair/FastPairDevicePreferenceController.java
View File

@@ -81,6 +81,7 @@ public class FastPairDevicePreferenceController extends BasePreferenceController
mFastPairDeviceUpdater = mFastPairDeviceUpdater =
fastPairFeatureProvider.getFastPairDeviceUpdater(context, this); fastPairFeatureProvider.getFastPairDeviceUpdater(context, this);
} else { } else {
Log.d(TAG, "Flag disabled. Ignore.");
mFastPairDeviceUpdater = null; mFastPairDeviceUpdater = null;
} }
mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED); mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
@@ -91,6 +92,10 @@ public class FastPairDevicePreferenceController extends BasePreferenceController
public void onStart(@NonNull LifecycleOwner owner) { public void onStart(@NonNull LifecycleOwner owner) {
if (mFastPairDeviceUpdater != null) { if (mFastPairDeviceUpdater != null) {
mFastPairDeviceUpdater.registerCallback(); mFastPairDeviceUpdater.registerCallback();
} else {
if (DEBUG) {
Log.d(TAG, "Callback register: Fast Pair device updater is null. Ignore.");
}
} }
mContext.registerReceiver(mReceiver, mIntentFilter, Context.RECEIVER_EXPORTED_UNAUDITED); mContext.registerReceiver(mReceiver, mIntentFilter, Context.RECEIVER_EXPORTED_UNAUDITED);
} }
@@ -99,6 +104,10 @@ public class FastPairDevicePreferenceController extends BasePreferenceController
public void onStop(@NonNull LifecycleOwner owner) { public void onStop(@NonNull LifecycleOwner owner) {
if (mFastPairDeviceUpdater != null) { if (mFastPairDeviceUpdater != null) {
mFastPairDeviceUpdater.unregisterCallback(); mFastPairDeviceUpdater.unregisterCallback();
} else {
if (DEBUG) {
Log.d(TAG, "Callback unregister: Fast Pair device updater is null. Ignore.");
}
} }
mContext.unregisterReceiver(mReceiver); mContext.unregisterReceiver(mReceiver);
} }