Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca14b0ad authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix CDM logcat spam when device is nearby" into sc-dev am: 562ed3ad 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13923474

Change-Id: Icb78d280a723932ccd854bc75cfcb0210cbcbad1
parents b6d40027 562ed3ad

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -1244,8 +1244,6 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
        }

        }





        public void schedule() {

        public void schedule() {

            Slog.d(LOG_TAG,

                    "TriggerDeviceDisappearedRunnable.schedule(address = " + mAddress + ")");

            mMainHandler.removeCallbacks(this);

            mMainHandler.removeCallbacks(this);

            mMainHandler.postDelayed(this, this, DEVICE_DISAPPEARED_TIMEOUT_MS);

            mMainHandler.postDelayed(this, this, DEVICE_DISAPPEARED_TIMEOUT_MS);

        }

        }
@@ -1283,8 +1281,6 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
    }

    }





    private void onDeviceNearby(String address) {

    private void onDeviceNearby(String address) {

        Slog.i(LOG_TAG, "onDeviceNearby(address = " + address + ")");



        Date timestamp = new Date();

        Date timestamp = new Date();

        Date oldTimestamp = mDevicesLastNearby.put(address, timestamp);

        Date oldTimestamp = mDevicesLastNearby.put(address, timestamp);