Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37f3ddb6 authored by Doug Zongker's avatar Doug Zongker Committed by Android (Google) Code Review
Browse files

Merge "relocate GoogleLoginService"

parents 051ab623 0a2fb217

tests/AndroidTests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := tests 


LOCAL_JAVA_LIBRARIES := framework-tests android.test.runner services



LOCAL_STATIC_JAVA_LIBRARIES := googlelogin-client

LOCAL_STATIC_JAVA_LIBRARIES := gsf-client



# Resource unit tests use a private locale

LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c 160dpi -c 32dpi -c 240dpi

tests/AndroidTests/src/com/android/unit_tests/GoogleLoginServiceTest.java

+5 −5
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ import android.test.AndroidTestCase; 
import android.test.suitebuilder.annotation.Suppress;

import android.util.Log;



import com.google.android.googleapps.GoogleLoginCredentialsResult;

import com.google.android.googleapps.IGoogleLoginService;

import com.google.android.googlelogin.GoogleLoginServiceConstants;

import com.google.android.gsf.GoogleLoginCredentialsResult;

import com.google.android.gsf.IGoogleLoginService;

import com.google.android.gsf.GoogleLoginServiceConstants;



import junit.framework.Assert;
@@ -60,8 +60,8 @@ public class GoogleLoginServiceTest extends AndroidTestCase { 
    protected void setUp() throws Exception {

        super.setUp();

        getContext().bindService((new Intent())

                                 .setClassName("com.google.android.googleapps",

                                               "com.google.android.googleapps.GoogleLoginService"),

                                 .setClassName("com.google.android.gsf",

                                               "com.google.android.gsf.loginservice.GoogleLoginService"),

                                 mConnection, Context.BIND_AUTO_CREATE);



        // wait for the service to cnnnect

tools/preload/Policy.java

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ public class Policy { 
        "com.android.phone",

        "com.google.android.apps.maps.FriendService",

        "com.google.android.apps.maps.LocationFriendService",

        "com.google.android.googleapps",

        "com.google.process.gapps",

        "android.tts"

    ));