commit 2a59e10d691642d6e50d7855190d5b837bb663cd
author Eugene Susla <eugenesusla@google.com> Mon Aug 31 19:42:43 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 31 19:42:43 2020 +0000
tree 3e6245267fcd819e97baee1e780f93f833ffd3b2
parent 5bfd8bcc4e33c49657659c827203ec67ad2ce25a
parent ca576d4b3b47ba866e20746c5086db57866323c1

Merge "Fix CDM.requestNotificationAccess() in profile." am: ca576d4b3b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1415449

Change-Id: I2e83c80e7a976731162a44cab0b6b6aa57a0822e

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 1d2ed17..70a3054 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -3020,10 +3020,9 @@
         if (PER_PROFILE_IME_ENABLED && userId != mSettings.getCurrentUserId()) {
             switchUserLocked(userId);
         }
-
-        // Main feature flag that overrides other conditions and forces IME preRendering.
+        // Master feature flag that overrides other conditions and forces IME preRendering.
         if (DEBUG) {
-            Slog.v(TAG, "IME PreRendering main flag: "
+            Slog.v(TAG, "IME PreRendering MASTER flag: "
                     + DebugFlags.FLAG_PRE_RENDER_IME_VIEWS.value() + ", LowRam: " + mIsLowRam);
         }
         // pre-rendering not supported on low-ram devices.

services/core/java/com/android/server/location/GnssConfiguration.java

diff --git a/services/core/java/com/android/server/location/GnssConfiguration.java b/services/core/java/com/android/server/location/GnssConfiguration.java
index 9c7adab..18d9f69 100644
--- a/services/core/java/com/android/server/location/GnssConfiguration.java
+++ b/services/core/java/com/android/server/location/GnssConfiguration.java
@@ -21,7 +21,6 @@
 import android.os.SystemProperties;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.StatsLog;
@@ -237,13 +236,6 @@
         logConfigurations();
 
         final HalInterfaceVersion gnssConfigurationIfaceVersion = getHalInterfaceVersion();
-
-        TelephonyManager phone = (TelephonyManager)
-                mContext.getSystemService(Context.TELEPHONY_SERVICE);
-        int ddSubId = SubscriptionManager.getDefaultDataSubscriptionId();
-        String simOperator = SubscriptionManager.isValidSubscriptionId(ddSubId)
-                ? phone.getSimOperator(ddSubId) : phone.getSimOperator();
-
         if (gnssConfigurationIfaceVersion != null) {
             // Set to a range checked value.
             if (isConfigEsExtensionSecSupported(gnssConfigurationIfaceVersion)
@@ -279,7 +271,7 @@
                     try {
                         int propertyValueInt = Integer.decode(propertyValueString);
                         boolean result = entry.getValue().set(propertyValueInt);
-                        if (!result && !TextUtils.isEmpty(simOperator)) {
+                        if (!result) {
                             Log.e(TAG, "Unable to set " + propertyName);
                         }
                     } catch (NumberFormatException e) {