Merge "Revert "Deprecate Data Command in Android"" (609f6504) · Commits · e / os / android_frameworks_base

cmds/svc/src/com/android/commands/svc/DataCommand.java

+33 −11

Original line number	Original line	Diff line number	Diff line
	@@ -16,16 +16,12 @@

	package com.android.commands.svc;		package com.android.commands.svc;

	/**		import android.os.ServiceManager;
	* @deprecated Please use adb shell cmd phone data enabled/disable instead.		import android.os.RemoteException;
	*/		import android.content.Context;
	@Deprecated		import com.android.internal.telephony.ITelephony;
	public class DataCommand extends Svc.Command {

	private static final String DECPRECATED_MESSAGE =
	"adb shell svc data enable/disable is deprecated;"
	+ "please use adb shell cmd phone data enable/disable instead.";

			public class DataCommand extends Svc.Command {
	public DataCommand() {		public DataCommand() {
	super("data");		super("data");
	}		}
	@@ -37,10 +33,36 @@ public class DataCommand extends Svc.Command {
	public String longHelp() {		public String longHelp() {
	return shortHelp() + "\n"		return shortHelp() + "\n"
	+ "\n"		+ "\n"
	+ DECPRECATED_MESSAGE;		+ "usage: svc data [enable\|disable]\n"
			+ " Turn mobile data on or off.\n\n";
	}		}

	public void run(String[] args) {		public void run(String[] args) {
	System.err.println(DECPRECATED_MESSAGE);		boolean validCommand = false;
			if (args.length >= 2) {
			boolean flag = false;
			if ("enable".equals(args[1])) {
			flag = true;
			validCommand = true;
			} else if ("disable".equals(args[1])) {
			flag = false;
			validCommand = true;
			}
			if (validCommand) {
			ITelephony phoneMgr
			= ITelephony.Stub.asInterface(ServiceManager.getService(Context.TELEPHONY_SERVICE));
			try {
			if (flag) {
			phoneMgr.enableDataConnectivity();
			} else
			phoneMgr.disableDataConnectivity();
			}
			catch (RemoteException e) {
			System.err.println("Mobile data operation failed: " + e);
			}
			return;
			}
			}
			System.err.println(longHelp());
	}		}
	}		}