diff options
| author | Lucas Silva <lusilva@google.com> | 2022-01-10 20:07:10 +0000 |
|---|---|---|
| committer | Lucas Silva <lusilva@google.com> | 2022-01-18 17:04:02 +0000 |
| commit | b292ef1910884f73ea719334ebb2cad45809194e (patch) | |
| tree | 8bf75c388aade4d304511b27066c20a2263b6c19 /core/java | |
| parent | ab4a170645becbc643d2f37815f38444bd5c3d50 (diff) | |
Clean up CommunalManagerService
This system service is no longer needed, as there is no longer a shared
lockscreen.
Test: locally on device
Bug: 206054365
Ignore-AOSP-First: cleanup
Change-Id: Ib2db06c377cf632da77dc41c629debfe658bfc48
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 17 | ||||
| -rw-r--r-- | core/java/android/app/communal/CommunalManager.java | 62 | ||||
| -rw-r--r-- | core/java/android/app/communal/ICommunalManager.aidl | 27 | ||||
| -rw-r--r-- | core/java/android/app/communal/OWNERS | 4 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 11 |
5 files changed, 0 insertions, 121 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 85ddff9a9311..8bc29496c87a 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -26,8 +26,6 @@ import android.app.admin.DevicePolicyManager; import android.app.admin.IDevicePolicyManager; import android.app.appsearch.AppSearchManagerFrameworkInitializer; import android.app.blob.BlobStoreManagerFrameworkInitializer; -import android.app.communal.CommunalManager; -import android.app.communal.ICommunalManager; import android.app.contentsuggestions.ContentSuggestionsManager; import android.app.contentsuggestions.IContentSuggestionsManager; import android.app.job.JobSchedulerFrameworkInitializer; @@ -1519,21 +1517,6 @@ public final class SystemServiceRegistry { } }); - registerService(Context.COMMUNAL_SERVICE, CommunalManager.class, - new CachedServiceFetcher<CommunalManager>() { - @Override - public CommunalManager createService(ContextImpl ctx) { - if (!ctx.getPackageManager().hasSystemFeature( - PackageManager.FEATURE_COMMUNAL_MODE)) { - return null; - } - IBinder iBinder = - ServiceManager.getService(Context.COMMUNAL_SERVICE); - return iBinder != null ? new CommunalManager( - ICommunalManager.Stub.asInterface(iBinder)) : null; - } - }); - sInitializing = true; try { // Note: the following functions need to be @SystemApis, once they become mainline diff --git a/core/java/android/app/communal/CommunalManager.java b/core/java/android/app/communal/CommunalManager.java deleted file mode 100644 index c7368ade2dcc..000000000000 --- a/core/java/android/app/communal/CommunalManager.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.app.communal; - -import android.Manifest; -import android.annotation.RequiresFeature; -import android.annotation.RequiresPermission; -import android.annotation.SystemApi; -import android.annotation.SystemService; -import android.annotation.TestApi; -import android.content.Context; -import android.content.pm.PackageManager; -import android.os.RemoteException; - -/** - * System private class for talking with the - * {@link com.android.server.communal.CommunalManagerService} that handles communal mode state. - * - * @hide - */ -@SystemApi(client = SystemApi.Client.PRIVILEGED_APPS) -@SystemService(Context.COMMUNAL_SERVICE) -@RequiresFeature(PackageManager.FEATURE_COMMUNAL_MODE) -public final class CommunalManager { - private final ICommunalManager mService; - - /** @hide */ - public CommunalManager(ICommunalManager service) { - mService = service; - } - - /** - * Updates whether or not the communal view is currently showing over the lockscreen. - * - * @param isShowing Whether communal view is showing. - * - * @hide - */ - @TestApi - @RequiresPermission(Manifest.permission.WRITE_COMMUNAL_STATE) - public void setCommunalViewShowing(boolean isShowing) { - try { - mService.setCommunalViewShowing(isShowing); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } -} diff --git a/core/java/android/app/communal/ICommunalManager.aidl b/core/java/android/app/communal/ICommunalManager.aidl deleted file mode 100644 index df9d7cec05f7..000000000000 --- a/core/java/android/app/communal/ICommunalManager.aidl +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.app.communal; - -/** - * System private API for talking with the communal manager service that handles communal mode - * state. - * - * @hide - */ -interface ICommunalManager { - oneway void setCommunalViewShowing(boolean isShowing); -}
\ No newline at end of file diff --git a/core/java/android/app/communal/OWNERS b/core/java/android/app/communal/OWNERS deleted file mode 100644 index b02883da854a..000000000000 --- a/core/java/android/app/communal/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -brycelee@google.com -justinkoh@google.com -lusilva@google.com -xilei@google.com
\ No newline at end of file diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 2df6f9ae2bd6..f2453d68b134 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -5882,17 +5882,6 @@ public abstract class Context { /** * Use with {@link #getSystemService(String)} to retrieve a - * {@link android.app.communal.CommunalManager} for interacting with the global system state. - * - * @see #getSystemService(String) - * @see android.app.communal.CommunalManager - * @hide - */ - @SystemApi - public static final String COMMUNAL_SERVICE = "communal"; - - /** - * Use with {@link #getSystemService(String)} to retrieve a * {@link android.app.LocaleManager}. * * @see #getSystemService(String) |
