commit a0c7d6d614dc3f204b7af2e723d5292e7330b533
author Jayden Kim <jaydenk@google.com> Sat Oct 29 16:58:56 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 29 16:58:56 2022 +0000
tree 1569ffd90d5eb8032b8a32dc026b46387fb144b1
parent 00894a4baed0983ef020c1d622e5f781ead77f83
parent 63358f143caea5acc8f15839b3892e397018d28d

Merge "Reduce nearby log spam" into tm-mainline-prod

nearby/service/java/com/android/server/nearby/provider/ChreCommunication.java

diff --git a/nearby/service/java/com/android/server/nearby/provider/ChreCommunication.java b/nearby/service/java/com/android/server/nearby/provider/ChreCommunication.java
index 4a3c559..00e1cb6 100644
--- a/nearby/service/java/com/android/server/nearby/provider/ChreCommunication.java
+++ b/nearby/service/java/com/android/server/nearby/provider/ChreCommunication.java
@@ -249,7 +249,7 @@
                         return;
                     }
                 }
-                Log.e(
+                Log.i(
                         TAG,
                         String.format(
                                 "Didn't find the nanoapp on contexthub: %s",

nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java

diff --git a/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java b/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java
index 392f02d..7d843aa 100644
--- a/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java
+++ b/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java
@@ -92,9 +92,6 @@
     /** Initialize the CHRE discovery provider. */
     public void init() {
         mChreCommunication.start(mChreCallback, Collections.singleton(NANOAPP_ID));
-        mIntentFilter.addAction(Intent.ACTION_SCREEN_ON);
-        mIntentFilter.addAction(Intent.ACTION_SCREEN_OFF);
-        mContext.registerReceiver(mScreenBroadcastReceiver, mIntentFilter);
     }
 
     @Override
@@ -195,6 +192,9 @@
             if (success) {
                 synchronized (ChreDiscoveryProvider.this) {
                     Log.i(TAG, "CHRE communication started");
+                    mIntentFilter.addAction(Intent.ACTION_SCREEN_ON);
+                    mIntentFilter.addAction(Intent.ACTION_SCREEN_OFF);
+                    mContext.registerReceiver(mScreenBroadcastReceiver, mIntentFilter);
                     mChreStarted = true;
                     if (mFilters != null) {
                         sendFilters(mFilters);