Merge "Change ServiceState and TelephonyRegistry logging"
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 1ea4180..180c427 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -924,8 +924,12 @@
@Override
public void overrideConfig(int subscriptionId, PersistableBundle overrides) {
+ // SHELL UID already has MODIFY_PHONE_STATE implicitly so we do not have to check it, but
+ // the API signature explicitly declares that the method caller have MODIFY_PHONE_STATE, so
+ // calling this as well to be safe.
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.MODIFY_PHONE_STATE, null);
+ TelephonyPermissions.enforceShellOnly(Binder.getCallingUid(), "overrideConfig");
int phoneId = SubscriptionManager.getPhoneId(subscriptionId);
if (!SubscriptionManager.isValidPhoneId(phoneId)) {
log("Ignore invalid phoneId: " + phoneId + " for subId: " + subscriptionId);
@@ -942,7 +946,8 @@
} else {
mOverrideConfigs[phoneId].putAll(overrides);
}
- broadcastConfigChangedIntent(phoneId);
+
+ notifySubscriptionInfoUpdater(phoneId);
}
@Override
diff --git a/src/com/android/phone/NetworkScanHelper.java b/src/com/android/phone/NetworkScanHelper.java
index a21f547..fcfbf22 100644
--- a/src/com/android/phone/NetworkScanHelper.java
+++ b/src/com/android/phone/NetworkScanHelper.java
@@ -31,6 +31,7 @@
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import java.lang.annotation.Retention;
@@ -180,7 +181,7 @@
int errCode = Integer.parseInt(t.getMessage());
onError(errCode);
}
- });
+ }, MoreExecutors.directExecutor());
mExecutor.execute(new NetworkScanSyncTask(
mTelephonyManager, (SettableFuture) mNetworkScanFuture));
} else if (type == NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS) {
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 36400b3..12db135 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4470,16 +4470,6 @@
}
}
- // STOPSHIP Revisit PLMN check (b/130253962).
- //List<String> allowedMccMncs =
- // NetworkScanRequestTracker.getAllowedMccMncsForLocationRestrictedScan(mApp);
- //for (String mccmnc : request.getPlmns()) {
- // if (!allowedMccMncs.contains(mccmnc)) {
- // return new SecurityException("Requested mccmnc " + mccmnc + " is not known to the"
- // + " device and cannot be scanned for without location access.");
- // }
- //}
-
return null;
}
diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index cada504..1f157e3 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -209,6 +209,11 @@
Log.v(this, "onExtrasRemoved: c=" + c + " key=" + keys);
removeExtras(keys);
}
+
+ @Override
+ public void onConnectionEvent(Connection c, String event, Bundle extras) {
+ sendConnectionEvent(event, extras);
+ }
};
/**