| commit | 71803580e2884666641aaa45615eb8635cd4c3bb | [log] [tgz] |
|---|---|---|
| author | Xinyi Zhou <zxy@google.com> | Thu May 11 18:16:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 11 18:16:34 2023 +0000 |
| tree | c15ae726d409e9a6f974c0e17239b076cf0b0023 | |
| parent | 40f3e64cd7884c7bb3932c37fce5f49910135455 [diff] | |
| parent | 8be22731f945fd0aee000abf1ae962b4458578f4 [diff] |
Merge "[Clean up] Remove debug logs" into udc-dev am: 8be22731f9 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23154688 Change-Id: I8eabed8bb1f7b3c85bd471caee68414d9f1bbeaa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManager.java b/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManager.java index 4cda93a..0c41426 100644 --- a/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManager.java +++ b/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManager.java
@@ -231,12 +231,9 @@ if (mMerged.getScanTypes().contains(SCAN_TYPE_NEARBY_PRESENCE)) { startChreProvider(scanFilters); - Log.d(TAG, "startProviders: heeey"); return true; } - Log.d(TAG, "startProviders: geagewage"); - startBleProvider(scanFilters); return true; }
diff --git a/nearby/service/java/com/android/server/nearby/managers/registration/DiscoveryRegistration.java b/nearby/service/java/com/android/server/nearby/managers/registration/DiscoveryRegistration.java index bef319ec..91237d2 100644 --- a/nearby/service/java/com/android/server/nearby/managers/registration/DiscoveryRegistration.java +++ b/nearby/service/java/com/android/server/nearby/managers/registration/DiscoveryRegistration.java
@@ -300,7 +300,6 @@ private boolean checkIdentity() { boolean result = DiscoveryPermissions.noteDiscoveryResultDelivery(mAppOpsManager, mCallerIdentity); - Log.v(TAG, "checkIdentity: result is " + result + " mAppOpsManager " + mAppOpsManager); if (!result) { Log.w(TAG, "[DiscoveryProviderManager] scan permission revoked " + "- not forwarding results for the registration.");