| commit | e4cfc06683d1fc8e34ae1f39b4efb0b134cc94b9 | [log] [tgz] |
|---|---|---|
| author | Hawkwood Glazier <jglazier@google.com> | Mon Jan 09 21:50:52 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jan 09 21:50:52 2023 +0000 |
| tree | 95907f807611f23b9d1d2149b592ee1749c2875f | |
| parent | 9e732e644e02e32392951097e156f1857b2ce2df [diff] | |
| parent | 460d897c3fdaffb53f590064bbcd707603a2d56f [diff] |
Merge "Add logging to KeyguardVisibilityHelper" into tm-qpr-dev
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java index 01d81ff..3153313 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
@@ -814,7 +814,7 @@ @Override public void onKeyguardVisibilityChanged(boolean visible, boolean occluded, boolean animatingDismiss) { - if (!mPipTaskOrganizer.isInPip()) { + if (!mPipTransitionState.hasEnteredPip()) { return; } if (visible) {
diff --git a/telephony/java/android/telephony/NetworkScanRequest.java b/telephony/java/android/telephony/NetworkScanRequest.java index 326f417..65c2146 100644 --- a/telephony/java/android/telephony/NetworkScanRequest.java +++ b/telephony/java/android/telephony/NetworkScanRequest.java
@@ -26,7 +26,7 @@ import java.util.Arrays; /** - * Defines a request to peform a network scan. + * Defines a request to perform a network scan. * * This class defines whether the network scan will be performed only once or periodically until * cancelled, when the scan is performed periodically, the time interval is not controlled by the