commit 2d10bd04816b2931cc232602855a08f1c031de64
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jan 29 22:14:24 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 29 22:14:24 2019 +0000
tree c7af2f95bd9be5c567a2cd6cd20bd30bdb721991
parent 06cb6f5252fb045688ee1d20b968bfa5fc1e4a67
parent 0c0af4b0cc6f945748afb2e009badb2725c5a1de

Merge "Merge "Whitelist packages from VPN lockdown: DPM API." into pi-dev-plus-aosp am: 299f825678"

core/java/android/view/contentcapture/ContentCaptureManager.java

diff --git a/core/java/android/view/contentcapture/ContentCaptureManager.java b/core/java/android/view/contentcapture/ContentCaptureManager.java
index d7f1b9f..07c9101 100644
--- a/core/java/android/view/contentcapture/ContentCaptureManager.java
+++ b/core/java/android/view/contentcapture/ContentCaptureManager.java
@@ -17,8 +17,6 @@
 
 import static android.view.contentcapture.ContentCaptureHelper.VERBOSE;
 
-import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
-
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.SystemService;
@@ -33,7 +31,6 @@
 import android.view.contentcapture.ContentCaptureSession.FlushReason;
 
 import com.android.internal.annotations.GuardedBy;
-import com.android.internal.os.IResultReceiver;
 import com.android.internal.util.Preconditions;
 import com.android.internal.util.SyncResultReceiver;
 
@@ -155,13 +152,12 @@
         }
         // Wait for system server to return the component name.
         final SyncResultReceiver resultReceiver = new SyncResultReceiver(SYNC_CALLS_TIMEOUT_MS);
-        mHandler.sendMessage(obtainMessage(
-                ContentCaptureManager::handleGetComponentName, this, resultReceiver));
+
 
         try {
+            mService.getServiceComponentName(resultReceiver);
             return resultReceiver.getParcelableResult();
         } catch (RemoteException e) {
-            // Unable to retrieve component name in a reasonable amount of time.
             throw e.rethrowFromSystemServer();
         }
     }
@@ -223,14 +219,4 @@
             }
         }
     }
-
-
-    /** Retrieves the component name of the target content capture service through system_server. */
-    private void handleGetComponentName(@NonNull IResultReceiver resultReceiver) {
-        try {
-            mService.getServiceComponentName(resultReceiver);
-        } catch (RemoteException e) {
-            Log.w(TAG, "Unable to retrieve service component name: " + e);
-        }
-    }
 }