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

Commit 4559c7a8 authored by Joanne Chung's avatar Joanne Chung Committed by Android (Google) Code Review
Browse files

Merge "Change path for DefaultSelectionToolbarRenderService"

parents f6e00a2f 895098da

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

+4 −2
Original line number Diff line number Diff line
@@ -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";

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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">

services/selectiontoolbar/java/com/android/server/selectiontoolbar/SelectionToolbarServiceNameResolver.java

+3 −1
Original line number Diff line number Diff line
@@ -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) {