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

Commit 99254102 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move CompanionDeviceManagerService to a place of its own" into oc-dev

parents 611fae13 0d3dd12f

services/Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ services := \ 
    appwidget \

    appwidget \

    autofill \

    autofill \

    backup \

    backup \

    companion \

    coverage\

    coverage\

    devicepolicy \

    devicepolicy \

    midi \

    midi \

services/companion/Android.mk

0 → 100644
+12 −0
Original line number Original line Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



LOCAL_MODULE := services.companion



LOCAL_SRC_FILES += \

      $(call all-java-files-under,java)



LOCAL_JAVA_LIBRARIES := services.core



include $(BUILD_STATIC_JAVA_LIBRARY)

services/print/java/com/android/server/print/CompanionDeviceManagerService.java→services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

 */









package com.android.server.print;

package com.android.server.companion;





import static com.android.internal.util.CollectionUtils.size;

import static com.android.internal.util.CollectionUtils.size;

import static com.android.internal.util.Preconditions.checkArgument;

import static com.android.internal.util.Preconditions.checkArgument;
@@ -81,7 +81,6 @@ import java.util.concurrent.ConcurrentHashMap; 
import java.util.concurrent.ConcurrentMap;

import java.util.concurrent.ConcurrentMap;

import java.util.function.Function;

import java.util.function.Function;





//TODO move to own package!

//TODO onStop schedule unbind in 5 seconds

//TODO onStop schedule unbind in 5 seconds

//TODO make sure APIs are only callable from currently focused app

//TODO make sure APIs are only callable from currently focused app

//TODO schedule stopScan on activity destroy(except if configuration change)

//TODO schedule stopScan on activity destroy(except if configuration change)

services/java/com/android/server/SystemServer.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -159,7 +159,7 @@ public final class SystemServer { 
    private static final String PRINT_MANAGER_SERVICE_CLASS =

    private static final String PRINT_MANAGER_SERVICE_CLASS =

            "com.android.server.print.PrintManagerService";

            "com.android.server.print.PrintManagerService";

    private static final String COMPANION_DEVICE_MANAGER_SERVICE_CLASS =

    private static final String COMPANION_DEVICE_MANAGER_SERVICE_CLASS =

            "com.android.server.print.CompanionDeviceManagerService";

            "com.android.server.companion.CompanionDeviceManagerService";

    private static final String USB_SERVICE_CLASS =

    private static final String USB_SERVICE_CLASS =

            "com.android.server.usb.UsbService$Lifecycle";

            "com.android.server.usb.UsbService$Lifecycle";

    private static final String MIDI_SERVICE_CLASS =

    private static final String MIDI_SERVICE_CLASS =