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

Commit 224e5bf9 authored by Xianyuan Jia's avatar Xianyuan Jia Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enabled Content Capture in Service"" into rvc-dev am: 18ee16a6 

Change-Id: I7257f8f3c6023df10cd639784a21f216851d29b9
parents 3580449f 18ee16a6

core/java/android/app/Service.java

+2 −25
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.os.Build; 
import android.os.IBinder;

import android.os.RemoteException;

import android.util.Log;

import android.view.contentcapture.ContentCaptureManager;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -307,8 +306,7 @@ import java.lang.annotation.RetentionPolicy; 
 * {@sample development/samples/ApiDemos/src/com/example/android/apis/app/MessengerServiceActivities.java

 *      bind}

 */

public abstract class Service extends ContextWrapper implements ComponentCallbacks2,

        ContentCaptureManager.ContentCaptureClient {

public abstract class Service extends ContextWrapper implements ComponentCallbacks2 {

    private static final String TAG = "Service";



    /**
@@ -819,14 +817,6 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac 
        writer.println("nothing to dump");

    }



    @Override

    protected void attachBaseContext(Context newBase) {

        super.attachBaseContext(newBase);

        if (newBase != null) {

            newBase.setContentCaptureOptions(getContentCaptureOptions());

        }

    }



    // ------------------ Internal API ------------------

    

    /**
@@ -845,7 +835,6 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac 
        mActivityManager = (IActivityManager)activityManager;

        mStartCompatibility = getApplicationInfo().targetSdkVersion

                < Build.VERSION_CODES.ECLAIR;

        setContentCaptureOptions(application.getContentCaptureOptions());

    }



    /**
@@ -860,18 +849,6 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac 
        return mClassName;

    }



    /** @hide */

    @Override

    public final ContentCaptureManager.ContentCaptureClient getContentCaptureClient() {

        return this;

    }



    /** @hide */

    @Override

    public final ComponentName contentCaptureClientGetComponentName() {

        return new ComponentName(this, mClassName);

    }



    // set by the thread after the constructor and before onCreate(Bundle icicle) is called.

    @UnsupportedAppUsage

    private ActivityThread mThread = null;

services/tests/uiservicestests/src/com/android/server/notification/ScheduleConditionProviderTest.java

+1 −3
Original line number Diff line number Diff line
@@ -3,10 +3,8 @@ package com.android.server.notification; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;



import android.app.Application;

import android.content.Intent;

import android.net.Uri;

import android.service.notification.Condition;
@@ -47,7 +45,7 @@ public class ScheduleConditionProviderTest extends UiServiceTestCase { 
                null,               // ActivityThread not actually used in Service

                ScheduleConditionProvider.class.getName(),

                null,               // token not needed when not talking with the activity manager

                mock(Application.class),

                null,

                null                // mocked services don't talk with the activity manager

                );

        service.onCreate();