commit dfc07c00521d51ff01dd3027e7ed5c872c486a65
author Android Build Merger (Role) <android-build-merger@google.com> Tue Apr 04 03:41:50 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 04 03:41:56 2017 +0000
tree 2d3361468ec6c985ff0aaaf421cf14bd2f4e37c8
parent 5dbb0f00472141da8128edf1a08f473ed7a0cd6e
parent bcc5b9f569356fa5076ca7348c40f521035a55d6

Merge "Merge "Themes: Apply themes to system_server safely" into oc-dev am: a52fc49845 am: b188c93a45"

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java

diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
index 14b9de5..13f82dd 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
@@ -34,6 +34,7 @@
 import android.widget.TextView;
 
 import com.android.companiondevicemanager.DeviceDiscoveryService.DeviceFilterPair;
+import com.android.internal.util.Preconditions;
 
 public class DeviceChooserActivity extends Activity {
 
@@ -92,8 +93,11 @@
     private CharSequence getCallingAppName() {
         try {
             final PackageManager packageManager = getPackageManager();
+            String callingPackage = Preconditions.checkStringNotEmpty(
+                    getCallingPackage(),
+                    "This activity must be called for result");
             return packageManager.getApplicationLabel(
-                    packageManager.getApplicationInfo(getCallingPackage(), 0));
+                    packageManager.getApplicationInfo(callingPackage, 0));
         } catch (PackageManager.NameNotFoundException e) {
             throw new RuntimeException(e);
         }