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

Merge "Change path for DefaultSelectionToolbarRenderService"

Browse Source
This commit is contained in:
Joanne Chung
2022-01-25 12:07:12 +00:00
committed by Android (Google) Code Review
parent f6e00a2f16 895098daeb
commit 4559c7a8b6
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/selectiontoolbar/java/com/android/server/selectiontoolbar/DefaultSelectionToolbarRenderService.java → core/java/android/service/selectiontoolbar/DefaultSelectionToolbarRenderService.java
View File

@@ -14,15 +14,17 @@
* limitations under the License.
*/
package com.android.server.selectiontoolbar;
package android.service.selectiontoolbar;
import android.service.selectiontoolbar.SelectionToolbarRenderService;
import android.util.Log;
import android.view.selectiontoolbar.ShowInfo;
/**
* The default implementation of {@link SelectionToolbarRenderService}.
*
* @hide
*/
// TODO(b/214122495): fix class not found then move to system service folder
public final class DefaultSelectionToolbarRenderService extends SelectionToolbarRenderService {
private static final String TAG = "DefaultSelectionToolbarRenderService";

2
core/res/AndroidManifest.xml
View File

@@ -6703,7 +6703,7 @@
</service>
<!-- TODO: Move to ExtServices or relevant component. -->
<service android:name="com.android.server.selectiontoolbar.DefaultSelectionToolbarRenderService"
<service android:name="android.service.selectiontoolbar.DefaultSelectionToolbarRenderService"
android:permission="android.permission.BIND_SELECTION_TOOLBAR_RENDER_SERVICE"
android:process=":ui"
android:exported="false">

4
services/selectiontoolbar/java/com/android/server/selectiontoolbar/SelectionToolbarServiceNameResolver.java
View File

@@ -16,6 +16,8 @@
package com.android.server.selectiontoolbar;
import android.service.selectiontoolbar.DefaultSelectionToolbarRenderService;
import com.android.server.infra.ServiceNameResolver;
import java.io.PrintWriter;
@@ -24,7 +26,7 @@ final class SelectionToolbarServiceNameResolver implements ServiceNameResolver {
// TODO: move to SysUi or ExtServices
private static final String SELECTION_TOOLBAR_SERVICE_NAME =
"android/com.android.server.selectiontoolbar.DefaultSelectionToolbarRenderService";
"android/" + DefaultSelectionToolbarRenderService.class.getName();
@Override
public String getDefaultServiceName(int userId) {