| commit | 6542f2f866e8e6d56e57f5f924fd78ef1d25a5bd | [log] [tgz] |
|---|---|---|
| author | Xinyi Zhou <zxy@google.com> | Thu May 11 19:09:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 11 19:09:20 2023 +0000 |
| tree | 289c4db69663b1fa2f3c1675b2f04fd570efc0dd | |
| parent | 58235881d553d8f28b29435d890b242c3ccbbfbc [diff] | |
| parent | 449eac903b3fd598a23efba0e9e81eb18130e31c [diff] |
Merge "[Clean up] Remove debug logs" into udc-dev am: 8be22731f9 am: 449eac903b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23154688 Change-Id: I6a910c5271d0548c272ee0c135844e9914dd8b21 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.");