SkyDemo should use explicit intents

sky/tools/shelldb

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from skypy.skyserver import SkyServer
 import argparse
 import hashlib
 import json
 import logging
 import os
 import pipes
 import platform
 import re
 import signal
 import subprocess
 import sys
 import tempfile
 import time
 import urlparse
 
 SKY_TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
 SKY_ROOT = os.path.dirname(SKY_TOOLS_DIR)
 SRC_ROOT = os.path.dirname(SKY_ROOT)
 
 GDB_PORT = 8888
 SKY_SERVER_PORT = 9888
 OBSERVATORY_PORT = 8181
-DEFAULT_URL = "sky://domokit.github.io/home.dart"
+DEFAULT_URL = "https://domokit.github.io/home.dart"
 APK_NAME = 'SkyDemo.apk'
 ADB_PATH = os.path.join(SRC_ROOT,
     'third_party/android_tools/sdk/platform-tools/adb')
 ANDROID_PACKAGE = "org.domokit.sky.demo"
+ANDROID_COMPONENT = '%s/%s.SkyDemoActivity' % (ANDROID_PACKAGE, ANDROID_PACKAGE)
 SHA1_PATH = '/sdcard/%s/%s.sha1' % (ANDROID_PACKAGE, APK_NAME)
 
 PID_FILE_PATH = "/tmp/skydemo.pids"
 PID_FILE_KEYS = frozenset([
     'remote_sky_server_port',
     'sky_server_pid',
     'sky_server_port',
     'sky_server_root',
     'build_dir',
     'sky_shell_pid',
@@ skipping 53 matching lines @@
         return cls(known_keys, contents)
 
     def write_to(self, path):
         try:
             with open(path, 'w') as pid_file:
                 json.dump(self._dict, pid_file, indent=2, sort_keys=True)
         except:
             logging.warn('Failed to write pid file: %s' % path)
 
 
-def _convert_to_sky_url(url):
-    parts = urlparse.urlsplit(url)
-    parts = parts._replace(scheme='sky')
-    return parts.geturl()
-
-
 # A free function for possible future sharing with a 'load' command.
 def _url_from_args(args, pids):
     if urlparse.urlparse(args.url_or_path).scheme:
         return args.url_or_path
     # The load happens on the remote device, use the remote port.
     remote_sky_server_port = pids.get('remote_sky_server_port',
         pids['sky_server_port'])
-    url = SkyServer.url_for_path(remote_sky_server_port,
+    return SkyServer.url_for_path(remote_sky_server_port,
         pids['sky_server_root'], args.url_or_path)
-    return _convert_to_sky_url(url)
 
 
 def dev_packages_root(build_dir):
     return os.path.join(build_dir, 'gen', 'dart-pkg', 'packages')
 
 
 class SetBuildDir(object):
     def add_subparser(self, subparsers):
         start_parser = subparsers.add_parser('set_build_dir',
             help='force the build_dir to a particular value without starting Sky')
@@ skipping 95 matching lines @@
         subprocess.check_call([
             ADB_PATH, 'forward', port_string, port_string
         ])
 
         port_string = 'tcp:%s' % sky_server.port
         subprocess.check_call([
             ADB_PATH, 'reverse', port_string, port_string
         ])
         pids['remote_sky_server_port'] = sky_server.port
 
-
         subprocess.check_call([ADB_PATH, 'shell',
             'am', 'start',
             '-a', 'android.intent.action.VIEW',
-            '-d', _url_from_args(args, pids)])
+            '-d', _url_from_args(args, pids),
+            ANDROID_COMPONENT])
 
         if not args.gdb:
             return
 
         # TODO(eseidel): am start -W does not seem to work?
         pid_tries = 0
         while True:
             pid = self._find_remote_pid_for_package(ANDROID_PACKAGE)
             if pid or pid_tries > 3:
                 break
@@ skipping 246 matching lines @@
         args = parser.parse_args()
         pids = Pids.read_from(PID_FILE_PATH, PID_FILE_KEYS)
         exit_code = args.func(args, pids)
         # We could do this with an at-exit handler instead?
         pids.write_to(PID_FILE_PATH)
         sys.exit(exit_code)
 
 
 if __name__ == '__main__':
     SkyShellRunner().main()