Merge "Don't record network name in metrics log" into pi-dev
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 5cbb6f6..fad4698 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -42,6 +42,7 @@
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.ServiceManager;
+import android.os.ShellCallback;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
@@ -2722,6 +2723,37 @@
return PhoneFactory.getImsResolver().isResolvingBinding();
}
+ /**
+ * Sets the ImsService Package Name that Telephony will bind to.
+ *
+ * @param slotId the slot ID that the ImsService should bind for.
+ * @param isCarrierImsService true if the ImsService is the carrier override, false if the
+ * ImsService is the device default ImsService.
+ * @param packageName The package name of the application that contains the ImsService to bind
+ * to.
+ * @return true if setting the ImsService to bind to succeeded, false if it did not.
+ * @hide
+ */
+ public boolean setImsService(int slotId, boolean isCarrierImsService, String packageName) {
+ enforceModifyPermission();
+ return PhoneFactory.getImsResolver().overrideImsServiceConfiguration(slotId,
+ isCarrierImsService, packageName);
+ }
+
+ /**
+ * Return the ImsService configuration.
+ *
+ * @param slotId The slot that the ImsService is associated with.
+ * @param isCarrierImsService true, if the ImsService is a carrier override, false if it is
+ * the device default.
+ * @return the package name of the ImsService configuration.
+ */
+ public String getImsService(int slotId, boolean isCarrierImsService) {
+ enforceReadPrivilegedPermission();
+ return PhoneFactory.getImsResolver().getImsServiceConfiguration(slotId,
+ isCarrierImsService);
+ }
+
public void setImsRegistrationState(boolean registered) {
enforceModifyPermission();
mPhone.setImsRegistrationState(registered);
@@ -3953,6 +3985,13 @@
DumpsysHandler.dump(mPhone.getContext(), fd, writer, args);
}
+ @Override
+ public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
+ String[] args, ShellCallback callback, ResultReceiver resultReceiver)
+ throws RemoteException {
+ (new TelephonyShellCommand(this)).exec(this, in, out, err, args, callback, resultReceiver);
+ }
+
/**
* Get aggregated video call data usage since boot.
*
diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
new file mode 100644
index 0000000..fce1086
--- /dev/null
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone;
+
+import android.os.RemoteException;
+import android.os.ShellCommand;
+import android.telephony.SubscriptionManager;
+import android.util.Log;
+
+import com.android.internal.telephony.ITelephony;
+
+import java.io.PrintWriter;
+
+/**
+ * Takes actions based on the adb commands given by "adb shell cmd phone ...". Be careful, no
+ * permission checks have been done before onCommand was called. Make sure any commands processed
+ * here also contain the appropriate permissions checks.
+ */
+
+public class TelephonyShellCommand extends ShellCommand {
+
+ private static final String LOG_TAG = "TelephonyShellCommand";
+ // Don't commit with this true.
+ private static final boolean VDBG = true;
+
+ private static final String IMS_SUBCOMMAND = "ims";
+ private static final String IMS_SET_CARRIER_SERVICE = "set-ims-service";
+ private static final String IMS_GET_CARRIER_SERVICE = "get-ims-service";
+ private static final String IMS_ENABLE = "enable";
+ private static final String IMS_DISABLE = "disable";
+
+ // Take advantage of existing methods that already contain permissions checks when possible.
+ private final ITelephony mInterface;
+
+ public TelephonyShellCommand(ITelephony binder) {
+ mInterface = binder;
+ }
+
+ @Override
+ public int onCommand(String cmd) {
+ if (cmd == null) {
+ return handleDefaultCommands(null);
+ }
+
+ switch (cmd) {
+ case IMS_SUBCOMMAND: {
+ return handleImsCommand();
+ }
+ default: {
+ return handleDefaultCommands(cmd);
+ }
+ }
+ }
+
+ @Override
+ public void onHelp() {
+ PrintWriter pw = getOutPrintWriter();
+ pw.println("Telephony Commands:");
+ pw.println(" help");
+ pw.println(" Print this help text.");
+ pw.println(" ims");
+ pw.println(" IMS Commands.");
+ onHelpIms();
+ }
+
+ private void onHelpIms() {
+ PrintWriter pw = getOutPrintWriter();
+ pw.println("IMS Commands:");
+ pw.println(" ims set-ims-service [-s SLOT_ID] (-c | -d) PACKAGE_NAME");
+ pw.println(" Sets the ImsService defined in PACKAGE_NAME to to be the bound");
+ pw.println(" ImsService. Options are:");
+ pw.println(" -s: the slot ID that the ImsService should be bound for. If no option");
+ pw.println(" is specified, it will choose the default voice SIM slot.");
+ pw.println(" -c: Override the ImsService defined in the carrier configuration.");
+ pw.println(" -d: Override the ImsService defined in the device overlay.");
+ pw.println(" ims get-ims-service [-s SLOT_ID] [-c | -d]");
+ pw.println(" Gets the package name of the currently defined ImsService.");
+ pw.println(" Options are:");
+ pw.println(" -s: The SIM slot ID for the registered ImsService. If no option");
+ pw.println(" is specified, it will choose the default voice SIM slot.");
+ pw.println(" -c: The ImsService defined as the carrier configured ImsService.");
+ pw.println(" -c: The ImsService defined as the device default ImsService.");
+ pw.println(" ims enable [-s SLOT_ID]");
+ pw.println(" enables IMS for the SIM slot specified, or for the default voice SIM slot");
+ pw.println(" if none is specified.");
+ pw.println(" ims disable [-s SLOT_ID]");
+ pw.println(" disables IMS for the SIM slot specified, or for the default voice SIM");
+ pw.println(" slot if none is specified.");
+ }
+
+ private int handleImsCommand() {
+ String arg = getNextArg();
+ if (arg == null) {
+ onHelpIms();
+ return 0;
+ }
+
+ switch (arg) {
+ case IMS_SET_CARRIER_SERVICE: {
+ return handleImsSetServiceCommand();
+ }
+ case IMS_GET_CARRIER_SERVICE: {
+ return handleImsGetServiceCommand();
+ }
+ case IMS_ENABLE: {
+ return handleEnableIms();
+ }
+ case IMS_DISABLE: {
+ return handleDisableIms();
+ }
+ }
+
+ return -1;
+ }
+
+ // ims set-ims-service
+ private int handleImsSetServiceCommand() {
+ PrintWriter errPw = getErrPrintWriter();
+ int slotId = SubscriptionManager.getDefaultVoicePhoneId();
+ Boolean isCarrierService = null;
+
+ String opt;
+ while ((opt = getNextOption()) != null) {
+ switch (opt) {
+ case "-s": {
+ try {
+ slotId = Integer.parseInt(getNextArgRequired());
+ } catch (NumberFormatException e) {
+ errPw.println("ims set-ims-service requires an integer as a SLOT_ID.");
+ return -1;
+ }
+ break;
+ }
+ case "-c": {
+ isCarrierService = true;
+ break;
+ }
+ case "-d": {
+ isCarrierService = false;
+ break;
+ }
+ }
+ }
+ // Mandatory param, either -c or -d
+ if (isCarrierService == null) {
+ errPw.println("ims set-ims-service requires either \"-c\" or \"-d\" to be set.");
+ return -1;
+ }
+
+ String packageName = getNextArg();
+
+ try {
+ if (packageName == null) {
+ packageName = "";
+ }
+ boolean result = mInterface.setImsService(slotId, isCarrierService, packageName);
+ if (VDBG) {
+ Log.v(LOG_TAG, "ims set-ims-service -s " + slotId + " "
+ + (isCarrierService ? "-c " : "-d ") + packageName + ", result=" + result);
+ }
+ getOutPrintWriter().println(result);
+ } catch (RemoteException e) {
+ Log.w(LOG_TAG, "ims set-ims-service -s " + slotId + " "
+ + (isCarrierService ? "-c " : "-d ") + packageName + ", error"
+ + e.getMessage());
+ errPw.println("Exception: " + e.getMessage());
+ return -1;
+ }
+ return 0;
+ }
+
+ // ims get-ims-service
+ private int handleImsGetServiceCommand() {
+ PrintWriter errPw = getErrPrintWriter();
+ int slotId = SubscriptionManager.getDefaultVoicePhoneId();
+ Boolean isCarrierService = null;
+
+ String opt;
+ while ((opt = getNextOption()) != null) {
+ switch (opt) {
+ case "-s": {
+ try {
+ slotId = Integer.parseInt(getNextArgRequired());
+ } catch (NumberFormatException e) {
+ errPw.println("ims set-ims-service requires an integer as a SLOT_ID.");
+ return -1;
+ }
+ break;
+ }
+ case "-c": {
+ isCarrierService = true;
+ break;
+ }
+ case "-d": {
+ isCarrierService = false;
+ break;
+ }
+ }
+ }
+ // Mandatory param, either -c or -d
+ if (isCarrierService == null) {
+ errPw.println("ims set-ims-service requires either \"-c\" or \"-d\" to be set.");
+ return -1;
+ }
+
+ String result;
+ try {
+ result = mInterface.getImsService(slotId, isCarrierService);
+ } catch (RemoteException e) {
+ return -1;
+ }
+ if (VDBG) {
+ Log.v(LOG_TAG, "ims get-ims-service -s " + slotId + " "
+ + (isCarrierService ? "-c " : "-d ") + ", returned: " + result);
+ }
+ getOutPrintWriter().println(result);
+ return 0;
+ }
+
+ private int handleEnableIms() {
+ int slotId = SubscriptionManager.getDefaultVoicePhoneId();
+ String opt;
+ while ((opt = getNextOption()) != null) {
+ switch (opt) {
+ case "-s": {
+ try {
+ slotId = Integer.parseInt(getNextArgRequired());
+ } catch (NumberFormatException e) {
+ getErrPrintWriter().println("ims enable requires an integer as a SLOT_ID.");
+ return -1;
+ }
+ break;
+ }
+ }
+ }
+ try {
+ mInterface.enableIms(slotId);
+ } catch (RemoteException e) {
+ return -1;
+ }
+ if (VDBG) {
+ Log.v(LOG_TAG, "ims enable -s " + slotId);
+ }
+ return 0;
+ }
+
+ private int handleDisableIms() {
+ int slotId = SubscriptionManager.getDefaultVoicePhoneId();
+ String opt;
+ while ((opt = getNextOption()) != null) {
+ switch (opt) {
+ case "-s": {
+ try {
+ slotId = Integer.parseInt(getNextArgRequired());
+ } catch (NumberFormatException e) {
+ getErrPrintWriter().println(
+ "ims disable requires an integer as a SLOT_ID.");
+ return -1;
+ }
+ break;
+ }
+ }
+ }
+ try {
+ mInterface.disableIms(slotId);
+ } catch (RemoteException e) {
+ return -1;
+ }
+ if (VDBG) {
+ Log.v(LOG_TAG, "ims disable -s " + slotId);
+ }
+ return 0;
+ }
+}