commit 9acd72c60b0965fdb1da1bce39b12e0d9c242a06
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 19 13:45:36 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 19 13:45:36 2019 +0000
tree acc2d812f55d81328ec98586202a0387d6911dd2
parent b5958c7c49f8fff85d293664b709559b1dd9e770
parent a1b39023d8c53ec516ccb5772b75569ab4af7829

Merge "Compatibility API implementation for app processes."

Android.bp

diff --git a/Android.bp b/Android.bp
index 9cc17ea..b01c3c7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1275,7 +1275,6 @@
     libs: [
         "ext",
         "framework",
-        "voip-common",
     ],
     local_sourcepaths: frameworks_base_subdirs,
     installable: false,

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 015874d..09f4355 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -37412,7 +37412,7 @@
     field public static final String CONTENT_ID = "cid";
     field public static final String CONTENT_LOCATION = "cl";
     field public static final String CONTENT_TYPE = "ct";
-    field public static final android.net.Uri CONTENT_URI;
+    field @NonNull public static final android.net.Uri CONTENT_URI;
     field public static final String CT_START = "ctt_s";
     field public static final String CT_TYPE = "ctt_t";
     field public static final String FILENAME = "fn";

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index 03fb9bb..0fcb994 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -340,7 +340,7 @@
                 case SimPuk:
                     // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home
                     SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);
-                    if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled(
+                    if (securityMode == SecurityMode.None && mLockPatternUtils.isLockScreenDisabled(
                             KeyguardUpdateMonitor.getCurrentUser())) {
                         finish = true;
                     } else {

telephony/java/android/provider/Telephony.java

diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java
index 83aa521..094f8c2 100644
--- a/telephony/java/android/provider/Telephony.java
+++ b/telephony/java/android/provider/Telephony.java
@@ -2975,6 +2975,7 @@
              * The {@code content://} style URL for this table. Can be appended with a part ID to
              * address individual parts.
              */
+            @NonNull
             public static final Uri CONTENT_URI = Uri.withAppendedPath(Mms.CONTENT_URI, "part");
 
             /**