summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChloe Dai <chloedai@google.com>2021-08-02 08:26:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-02 08:26:00 +0000
commit6a87c602d6a80decb951c2743eb60e242ef3c347 (patch)
tree567bb71c40afd987421bd9c5d67d49bc6d3ada34
parent94316433e3d695b632b2a1512d0e652679e207e6 (diff)
parenta4933d9073e17905f8db58812566b2633b19c557 (diff)
downloadplatform_packages_apps_Nfc-6a87c602d6a80decb951c2743eb60e242ef3c347.tar.gz
platform_packages_apps_Nfc-6a87c602d6a80decb951c2743eb60e242ef3c347.tar.bz2
platform_packages_apps_Nfc-6a87c602d6a80decb951c2743eb60e242ef3c347.zip
Merge "Change 'TYPE_SYSTEM_ALERT' to 'TYPE_SYSTEM_DIALOG'" am: 3019e1afa9 am: a4933d9073
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1782515 Change-Id: Ic76b4f031b0702411d848481f4b4105f3cf889be
-rw-r--r--src/com/android/nfc/NfcDispatcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/nfc/NfcDispatcher.java b/src/com/android/nfc/NfcDispatcher.java
index 455023ba..7215e7fb 100644
--- a/src/com/android/nfc/NfcDispatcher.java
+++ b/src/com/android/nfc/NfcDispatcher.java
@@ -810,7 +810,7 @@ class NfcDispatcher {
dispatch.tryStartActivity();
});
AlertDialog dialog = builder.create();
- dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+ dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);
dialog.show();
}