LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[nearby] Log changes

Browse Source 
Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2a4cadec922725cf89992103f6ade337d5a8ec86)
Merged-In: I11a03bd3bf40cd7cd6f0ac892f040c9eb3ce822c
Change-Id: I11a03bd3bf40cd7cd6f0ac892f040c9eb3ce822c
This commit is contained in:
Xinyi Zhou
2023-12-12 19:53:05 +00:00
parent 64e14583cc
commit 4dfc089531
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManager.java
View File

@@ -245,7 +245,7 @@ public class DiscoveryProviderManager extends
@GuardedBy("mMultiplexerLock") @GuardedBy("mMultiplexerLock")
private void startBleProvider(Set<ScanFilter> scanFilters) { private void startBleProvider(Set<ScanFilter> scanFilters) {
if (!mBleDiscoveryProvider.getController().isStarted()) { if (!mBleDiscoveryProvider.getController().isStarted()) {
Log.d(TAG, "DiscoveryProviderManager starts Ble scanning."); Log.d(TAG, "DiscoveryProviderManager starts BLE scanning.");
mBleDiscoveryProvider.getController().setListener(this); mBleDiscoveryProvider.getController().setListener(this);
mBleDiscoveryProvider.getController().setProviderScanMode(mMerged.getScanMode()); mBleDiscoveryProvider.getController().setProviderScanMode(mMerged.getScanMode());
mBleDiscoveryProvider.getController().setProviderScanFilters( mBleDiscoveryProvider.getController().setProviderScanFilters(

28
nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManagerLegacy.java
View File

@@ -143,18 +143,18 @@ public class DiscoveryProviderManagerLegacy implements AbstractDiscoveryProvider
for (IBinder listenerBinder : mScanTypeScanListenerRecordMap.keySet()) { for (IBinder listenerBinder : mScanTypeScanListenerRecordMap.keySet()) {
ScanListenerRecord record = mScanTypeScanListenerRecordMap.get(listenerBinder); ScanListenerRecord record = mScanTypeScanListenerRecordMap.get(listenerBinder);
if (record == null) { if (record == null) {
Log.w(TAG, "DiscoveryProviderManager cannot find the scan record."); Log.w(TAG, "DiscoveryProviderManagerLegacy cannot find the scan record.");
continue; continue;
} }
CallerIdentity callerIdentity = record.getCallerIdentity(); CallerIdentity callerIdentity = record.getCallerIdentity();
if (!DiscoveryPermissions.noteDiscoveryResultDelivery( if (!DiscoveryPermissions.noteDiscoveryResultDelivery(
appOpsManager, callerIdentity)) { appOpsManager, callerIdentity)) {
Log.w(TAG, "[DiscoveryProviderManager] scan permission revoked " Log.w(TAG, "[DiscoveryProviderManagerLegacy] scan permission revoked "
+ "- not forwarding results"); + "- not forwarding results");
try { try {
record.getScanListener().onError(ScanCallback.ERROR_PERMISSION_DENIED); record.getScanListener().onError(ScanCallback.ERROR_PERMISSION_DENIED);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "DiscoveryProviderManager failed to report error.", e); Log.w(TAG, "DiscoveryProviderManagerLegacy failed to report error.", e);
} }
return; return;
} }
@@ -181,7 +181,7 @@ public class DiscoveryProviderManagerLegacy implements AbstractDiscoveryProvider
NearbyMetrics.logScanDeviceDiscovered( NearbyMetrics.logScanDeviceDiscovered(
record.hashCode(), record.getScanRequest(), nearbyDevice); record.hashCode(), record.getScanRequest(), nearbyDevice);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "DiscoveryProviderManager failed to report onDiscovered.", e); Log.w(TAG, "DiscoveryProviderManagerLegacy failed to report onDiscovered.", e);
} }
} }
} }
@@ -194,18 +194,18 @@ public class DiscoveryProviderManagerLegacy implements AbstractDiscoveryProvider
for (IBinder listenerBinder : mScanTypeScanListenerRecordMap.keySet()) { for (IBinder listenerBinder : mScanTypeScanListenerRecordMap.keySet()) {
ScanListenerRecord record = mScanTypeScanListenerRecordMap.get(listenerBinder); ScanListenerRecord record = mScanTypeScanListenerRecordMap.get(listenerBinder);
if (record == null) { if (record == null) {
Log.w(TAG, "DiscoveryProviderManager cannot find the scan record."); Log.w(TAG, "DiscoveryProviderManagerLegacy cannot find the scan record.");
continue; continue;
} }
CallerIdentity callerIdentity = record.getCallerIdentity(); CallerIdentity callerIdentity = record.getCallerIdentity();
if (!DiscoveryPermissions.noteDiscoveryResultDelivery( if (!DiscoveryPermissions.noteDiscoveryResultDelivery(
appOpsManager, callerIdentity)) { appOpsManager, callerIdentity)) {
Log.w(TAG, "[DiscoveryProviderManager] scan permission revoked " Log.w(TAG, "[DiscoveryProviderManagerLegacy] scan permission revoked "
+ "- not forwarding results"); + "- not forwarding results");
try { try {
record.getScanListener().onError(ScanCallback.ERROR_PERMISSION_DENIED); record.getScanListener().onError(ScanCallback.ERROR_PERMISSION_DENIED);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "DiscoveryProviderManager failed to report error.", e); Log.w(TAG, "DiscoveryProviderManagerLegacy failed to report error.", e);
} }
return; return;
} }
@@ -213,7 +213,7 @@ public class DiscoveryProviderManagerLegacy implements AbstractDiscoveryProvider
try { try {
record.getScanListener().onError(errorCode); record.getScanListener().onError(errorCode);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "DiscoveryProviderManager failed to report onError.", e); Log.w(TAG, "DiscoveryProviderManagerLegacy failed to report onError.", e);
} }
} }
} }
@@ -296,10 +296,10 @@ public class DiscoveryProviderManagerLegacy implements AbstractDiscoveryProvider
if (listenerBinder != null && deathRecipient != null) { if (listenerBinder != null && deathRecipient != null) {
listenerBinder.unlinkToDeath(removedRecord.getDeathRecipient(), 0); listenerBinder.unlinkToDeath(removedRecord.getDeathRecipient(), 0);
} }
Log.v(TAG, "DiscoveryProviderManager unregistered scan listener."); Log.v(TAG, "DiscoveryProviderManagerLegacy unregistered scan listener.");
NearbyMetrics.logScanStopped(removedRecord.hashCode(), removedRecord.getScanRequest()); NearbyMetrics.logScanStopped(removedRecord.hashCode(), removedRecord.getScanRequest());
if (mScanTypeScanListenerRecordMap.isEmpty()) { if (mScanTypeScanListenerRecordMap.isEmpty()) {
Log.v(TAG, "DiscoveryProviderManager stops provider because there is no " Log.v(TAG, "DiscoveryProviderManagerLegacy stops provider because there is no "
+ "scan listener registered."); + "scan listener registered.");
stopProviders(); stopProviders();
return; return;
@@ -309,8 +309,8 @@ public class DiscoveryProviderManagerLegacy implements AbstractDiscoveryProvider
// Removes current highest scan mode requested and sets the next highest scan mode. // Removes current highest scan mode requested and sets the next highest scan mode.
if (removedRecord.getScanRequest().getScanMode() == mScanMode) { if (removedRecord.getScanRequest().getScanMode() == mScanMode) {
Log.v(TAG, "DiscoveryProviderManager starts to find the new highest scan mode " Log.v(TAG, "DiscoveryProviderManagerLegacy starts to find the new highest "
+ "because the highest scan mode listener was unregistered."); + "scan mode because the highest scan mode listener was unregistered.");
@ScanRequest.ScanMode int highestScanModeRequested = ScanRequest.SCAN_MODE_NO_POWER; @ScanRequest.ScanMode int highestScanModeRequested = ScanRequest.SCAN_MODE_NO_POWER;
// find the next highest scan mode; // find the next highest scan mode;
for (ScanListenerRecord record : mScanTypeScanListenerRecordMap.values()) { for (ScanListenerRecord record : mScanTypeScanListenerRecordMap.values()) {
@@ -380,7 +380,7 @@ public class DiscoveryProviderManagerLegacy implements AbstractDiscoveryProvider
private void startBleProvider(List<ScanFilter> scanFilters) { private void startBleProvider(List<ScanFilter> scanFilters) {
if (!mBleDiscoveryProvider.getController().isStarted()) { if (!mBleDiscoveryProvider.getController().isStarted()) {
Log.d(TAG, "DiscoveryProviderManager starts Ble scanning."); Log.d(TAG, "DiscoveryProviderManagerLegacy starts BLE scanning.");
mBleDiscoveryProvider.getController().setListener(this); mBleDiscoveryProvider.getController().setListener(this);
mBleDiscoveryProvider.getController().setProviderScanMode(mScanMode); mBleDiscoveryProvider.getController().setProviderScanMode(mScanMode);
mBleDiscoveryProvider.getController().setProviderScanFilters(scanFilters); mBleDiscoveryProvider.getController().setProviderScanFilters(scanFilters);
@@ -390,7 +390,7 @@ public class DiscoveryProviderManagerLegacy implements AbstractDiscoveryProvider
@VisibleForTesting @VisibleForTesting
void startChreProvider(List<ScanFilter> scanFilters) { void startChreProvider(List<ScanFilter> scanFilters) {
Log.d(TAG, "DiscoveryProviderManager starts CHRE scanning."); Log.d(TAG, "DiscoveryProviderManagerLegacy starts CHRE scanning.");
mChreDiscoveryProvider.getController().setProviderScanFilters(scanFilters); mChreDiscoveryProvider.getController().setProviderScanFilters(scanFilters);
mChreDiscoveryProvider.getController().setProviderScanMode(mScanMode); mChreDiscoveryProvider.getController().setProviderScanMode(mScanMode);
mChreDiscoveryProvider.getController().start(); mChreDiscoveryProvider.getController().start();