Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ib6de0ebda68c6d182abad3ebd29417b3d86bb61c
This commit is contained in:
TreeHugger Robot
2020-04-17 20:43:00 +00:00
committed by Automerger Merge Worker
parent 02b8ebe1c7 5268da667a
commit 4a8ed86764
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/notification/ConditionProviders.java
View File

@@ -76,7 +76,8 @@ public class ConditionProviders extends ManagedServices {
public void addSystemProvider(SystemConditionProviderService service) { public void addSystemProvider(SystemConditionProviderService service) {
mSystemConditionProviders.add(service); mSystemConditionProviders.add(service);
service.attachBase(mContext); service.attachBase(mContext);
registerService(service.asInterface(), service.getComponent(), UserHandle.USER_SYSTEM); registerSystemService(
service.asInterface(), service.getComponent(), UserHandle.USER_SYSTEM);
} }
public Iterable<SystemConditionProviderService> getSystemProviders() { public Iterable<SystemConditionProviderService> getSystemProviders() {

11
services/core/java/com/android/server/notification/ManagedServices.java
View File

@@ -118,7 +118,7 @@ abstract public class ManagedServices {
protected final Context mContext; protected final Context mContext;
protected final Object mMutex; protected final Object mMutex;
private final UserProfiles mUserProfiles; private final UserProfiles mUserProfiles;
private final IPackageManager mPm; protected final IPackageManager mPm;
protected final UserManager mUm; protected final UserManager mUm;
private final Config mConfig; private final Config mConfig;
private final Handler mHandler = new Handler(Looper.getMainLooper()); private final Handler mHandler = new Handler(Looper.getMainLooper());
@@ -890,9 +890,10 @@ abstract public class ManagedServices {
unregisterServiceImpl(service, userid); unregisterServiceImpl(service, userid);
} }
public void registerService(IInterface service, ComponentName component, int userid) { public void registerSystemService(IInterface service, ComponentName component, int userid) {
checkNotNull(service); checkNotNull(service);
ManagedServiceInfo info = registerServiceImpl(service, component, userid); ManagedServiceInfo info = registerServiceImpl(
service, component, userid, Build.VERSION_CODES.CUR_DEVELOPMENT);
if (info != null) { if (info != null) {
onServiceAdded(info); onServiceAdded(info);
} }
@@ -1458,9 +1459,9 @@ abstract public class ManagedServices {
} }
private ManagedServiceInfo registerServiceImpl(final IInterface service, 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, ManagedServiceInfo info = newServiceInfo(service, component, userid,
true /*isSystem*/, null /*connection*/, Build.VERSION_CODES.LOLLIPOP); true /*isSystem*/, null /*connection*/, targetSdk);
return registerServiceImpl(info); return registerServiceImpl(info);
} }

4
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -222,7 +222,6 @@ import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.util.Slog; import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.SparseArrayMap;
import android.util.StatsEvent; import android.util.StatsEvent;
import android.util.Xml; import android.util.Xml;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
@@ -290,7 +289,6 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
@@ -3830,7 +3828,7 @@ public class NotificationManagerService extends SystemService {
public void registerListener(final INotificationListener listener, public void registerListener(final INotificationListener listener,
final ComponentName component, final int userid) { final ComponentName component, final int userid) {
enforceSystemOrSystemUI("INotificationManager.registerListener"); enforceSystemOrSystemUI("INotificationManager.registerListener");
mListeners.registerService(listener, component, userid); mListeners.registerSystemService(listener, component, userid);
} }
/** /**

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

@@ -972,7 +972,7 @@ public class ManagedServicesTest extends UiServiceTestCase {
when(service.asBinder()).thenReturn(mock(IBinder.class)); when(service.asBinder()).thenReturn(mock(IBinder.class));
ManagedServices services = new TestManagedServices(getContext(), mLock, mUserProfiles, ManagedServices services = new TestManagedServices(getContext(), mLock, mUserProfiles,
mIpm, APPROVAL_BY_PACKAGE); mIpm, APPROVAL_BY_PACKAGE);
services.registerService(service, null, 10); services.registerSystemService(service, null, 10);
ManagedServices.ManagedServiceInfo info = services.checkServiceTokenLocked(service); ManagedServices.ManagedServiceInfo info = services.checkServiceTokenLocked(service);
info.isSystem = true; info.isSystem = true;