Upstream: Pass Bundle to WebApkServiceImpl constructor

chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/WebApkServiceFactory.java

 // Copyright 2016 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.
 
 package org.chromium.webapk.shell_apk;
 
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.os.IBinder;
 import android.util.Log;
 
 import org.chromium.webapk.lib.common.WebApkUtils;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
 
 /**
  * Shell class for services provided by WebAPK to Chrome. Extracts code with implementation of
  * services from .dex file in Chrome APK.
  */
 public class WebApkServiceFactory extends Service {
     private static final String TAG = "cr_WebApkServiceFactory";
 
     /**
      * Name of the class with IBinder API implementation.
      */
     private static final String WEBAPK_SERVICE_IMPL_CLASS_NAME =
             "org.chromium.webapk.lib.runtime_library.WebApkServiceImpl";
 
+    private static final String KEY_SMALL_ICON_ID = "small_icon_id";
+
     /*
      * ClassLoader for loading {@link WEBAPK_SERVICE_IMPL_CLASS_NAME}. Static so that all
      * {@link WebApkServiceFactory} service instatiations use the same ClassLoader during the app's
      * lifetime.
      */
     private static ClassLoader sClassLoader;
 
     @Override
     public IBinder onBind(Intent intent) {
         ClassLoader webApkClassLoader = getClassLoaderInstance(this);
         if (webApkClassLoader == null) {
             Log.w(TAG, "Unable to create ClassLoader.");
             return null;
         }
 
         try {
             Class<?> webApkServiceImplClass =
                     webApkClassLoader.loadClass(WEBAPK_SERVICE_IMPL_CLASS_NAME);
             Constructor<?> webApkServiceImplConstructor =
-                    webApkServiceImplClass.getConstructor(Context.class, int.class);
-            return (IBinder) webApkServiceImplConstructor.newInstance(
-                    new Object[] {this, R.drawable.app_icon});
+                    webApkServiceImplClass.getConstructor(Context.class, Bundle.class);
+            Bundle bundle = new Bundle();
+            bundle.putInt(KEY_SMALL_ICON_ID, R.drawable.app_icon);
+            return (IBinder) webApkServiceImplConstructor.newInstance(new Object[] {this, bundle});
         } catch (Exception e) {
             Log.w(TAG, "Unable to create WebApkServiceImpl.");
             e.printStackTrace();
             return null;
         }
     }
 
     /**
      * Gets / creates ClassLaoder for loading {@link WEBAPK_SERVICE_IMPL_CLASS_NAME}.
      * @param context WebAPK's context.
@@ skipping 18 matching lines @@
             return null;
         }
 
         File localDexDir = context.getDir("dex", Context.MODE_PRIVATE);
         File remoteDexFile =
                 new File(remoteContext.getDir("dex", Context.MODE_PRIVATE), "web_apk.dex");
         return DexLoader.load(remoteContext, "web_apk.dex", WEBAPK_SERVICE_IMPL_CLASS_NAME,
                 remoteDexFile, localDexDir);
     }
 }