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

Commit 5268da66 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "System NLSs have up-to-date targetSdks" into rvc-dev am: 171cf884 

Change-Id: I412dd816d1375190e6c6ae226f8881668670d1fe
parents cb3d76e4 171cf884

services/core/java/com/android/server/notification/ConditionProviders.java

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ public class ConditionProviders extends ManagedServices { 
    public void addSystemProvider(SystemConditionProviderService service) {

        mSystemConditionProviders.add(service);

        service.attachBase(mContext);

        registerService(service.asInterface(), service.getComponent(), UserHandle.USER_SYSTEM);

        registerSystemService(

                service.asInterface(), service.getComponent(), UserHandle.USER_SYSTEM);

    }



    public Iterable<SystemConditionProviderService> getSystemProviders() {

services/core/java/com/android/server/notification/ManagedServices.java

+6 −5
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ abstract public class ManagedServices { 
    protected final Context mContext;

    protected final Object mMutex;

    private final UserProfiles mUserProfiles;

    private final IPackageManager mPm;

    protected final IPackageManager mPm;

    protected final UserManager mUm;

    private final Config mConfig;

    private final Handler mHandler = new Handler(Looper.getMainLooper());
@@ -890,9 +890,10 @@ abstract public class ManagedServices { 
        unregisterServiceImpl(service, userid);

    }



    public void registerService(IInterface service, ComponentName component, int userid) {

    public void registerSystemService(IInterface service, ComponentName component, int userid) {

        checkNotNull(service);

        ManagedServiceInfo info = registerServiceImpl(service, component, userid);

        ManagedServiceInfo info = registerServiceImpl(

                service, component, userid, Build.VERSION_CODES.CUR_DEVELOPMENT);

        if (info != null) {

            onServiceAdded(info);

        }
@@ -1458,9 +1459,9 @@ abstract public class ManagedServices { 
    }



    private ManagedServiceInfo registerServiceImpl(final IInterface service,

            final ComponentName component, final int userid) {

            final ComponentName component, final int userid, int targetSdk) {

        ManagedServiceInfo info = newServiceInfo(service, component, userid,

                true /*isSystem*/, null /*connection*/, Build.VERSION_CODES.LOLLIPOP);

                true /*isSystem*/, null /*connection*/, targetSdk);

        return registerServiceImpl(info);

    }

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −3
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ import android.util.Log; 
import android.util.Pair;

import android.util.Slog;

import android.util.SparseArray;

import android.util.SparseArrayMap;

import android.util.StatsEvent;

import android.util.Xml;

import android.util.proto.ProtoOutputStream;
@@ -290,7 +289,6 @@ import java.io.InputStream; 
import java.io.OutputStream;

import java.io.PrintWriter;

import java.nio.charset.StandardCharsets;

import java.util.ArrayDeque;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Iterator;
@@ -3830,7 +3828,7 @@ public class NotificationManagerService extends SystemService { 
        public void registerListener(final INotificationListener listener,

                final ComponentName component, final int userid) {

            enforceSystemOrSystemUI("INotificationManager.registerListener");

            mListeners.registerService(listener, component, userid);

            mListeners.registerSystemService(listener, component, userid);

        }



        /**

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

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ public class ManagedServicesTest extends UiServiceTestCase { 
        when(service.asBinder()).thenReturn(mock(IBinder.class));

        ManagedServices services = new TestManagedServices(getContext(), mLock, mUserProfiles,

                mIpm, APPROVAL_BY_PACKAGE);

        services.registerService(service, null, 10);

        services.registerSystemService(service, null, 10);

        ManagedServices.ManagedServiceInfo info = services.checkServiceTokenLocked(service);

        info.isSystem = true;