diff options
15 files changed, 47 insertions, 35 deletions
diff --git a/packages/PrintRecommendationService/Android.mk b/packages/PrintRecommendationService/Android.mk index 12203492aad3..d27a6efe58d6 100644 --- a/packages/PrintRecommendationService/Android.mk +++ b/packages/PrintRecommendationService/Android.mk @@ -17,11 +17,16 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional +LOCAL_USE_AAPT2 := true LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := PrintRecommendationService -LOCAL_PRIVATE_PLATFORM_APIS := true + +LOCAL_SDK_VERSION := system_current + +LOCAL_STATIC_JAVA_LIBRARIES := androidx.annotation_annotation +LOCAL_STATIC_ANDROID_LIBRARIES := androidx.core_core include $(BUILD_PACKAGE) diff --git a/packages/PrintRecommendationService/AndroidManifest.xml b/packages/PrintRecommendationService/AndroidManifest.xml index 750b9fb7e52f..8db1bf4c18e3 100644 --- a/packages/PrintRecommendationService/AndroidManifest.xml +++ b/packages/PrintRecommendationService/AndroidManifest.xml @@ -18,11 +18,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.printservice.recommendation" - android:versionCode="3" - android:versionName="1.2.0"> - - <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="25" /> + android:versionCode="4" + android:versionName="1.3.0"> <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> <uses-permission android:name="android.permission.INTERNET" /> diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/PrintServicePlugin.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/PrintServicePlugin.java index d723d2fd19f7..c3a2d0de0575 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/PrintServicePlugin.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/PrintServicePlugin.java @@ -16,9 +16,9 @@ package com.android.printservice.recommendation; -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import java.net.InetAddress; import java.util.List; diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RemotePrintServicePlugin.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RemotePrintServicePlugin.java index fd929a7c8233..ef93d4a24aa2 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RemotePrintServicePlugin.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RemotePrintServicePlugin.java @@ -16,11 +16,10 @@ package com.android.printservice.recommendation; -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.annotation.StringRes; - -import com.android.internal.util.Preconditions; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.util.Preconditions; import java.net.InetAddress; import java.util.Collections; diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/google/CloudPrintPlugin.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/google/CloudPrintPlugin.java index 05b0c862ebd5..93e6271319f6 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/google/CloudPrintPlugin.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/google/CloudPrintPlugin.java @@ -18,12 +18,13 @@ package com.android.printservice.recommendation.plugin.google; import static com.android.printservice.recommendation.util.MDNSUtils.ATTRIBUTE_TY; -import android.annotation.NonNull; -import android.annotation.StringRes; import android.content.Context; import android.util.ArrayMap; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; + import com.android.printservice.recommendation.PrintServicePlugin; import com.android.printservice.recommendation.R; import com.android.printservice.recommendation.util.MDNSFilteredDiscovery; diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/hp/ServiceRecommendationPlugin.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/hp/ServiceRecommendationPlugin.java index 4e3bf933a524..ac63cb577a45 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/hp/ServiceRecommendationPlugin.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/hp/ServiceRecommendationPlugin.java @@ -16,12 +16,13 @@ package com.android.printservice.recommendation.plugin.hp; -import android.annotation.NonNull; import android.content.Context; import android.net.nsd.NsdManager; import android.net.nsd.NsdServiceInfo; import android.text.TextUtils; +import androidx.annotation.NonNull; + import com.android.printservice.recommendation.PrintServicePlugin; import java.net.InetAddress; diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/mdnsFilter/MDNSFilterPlugin.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/mdnsFilter/MDNSFilterPlugin.java index d60a25f54a22..5f107d662b75 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/mdnsFilter/MDNSFilterPlugin.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/mdnsFilter/MDNSFilterPlugin.java @@ -18,8 +18,9 @@ package com.android.printservice.recommendation.plugin.mdnsFilter; import android.content.Context; import android.net.nsd.NsdServiceInfo; -import android.annotation.NonNull; -import android.annotation.StringRes; + +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; import com.android.printservice.recommendation.PrintServicePlugin; import com.android.printservice.recommendation.util.MDNSFilteredDiscovery; diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/mdnsFilter/VendorConfig.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/mdnsFilter/VendorConfig.java index 57d5c710f6bd..5d735a887264 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/mdnsFilter/VendorConfig.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/mdnsFilter/VendorConfig.java @@ -16,14 +16,16 @@ package com.android.printservice.recommendation.plugin.mdnsFilter; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.content.res.XmlResourceParser; import android.util.ArrayMap; -import com.android.internal.annotations.Immutable; -import com.android.internal.util.Preconditions; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.util.Preconditions; + import com.android.printservice.recommendation.R; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -37,7 +39,6 @@ import java.util.List; * Vendor configuration as read from {@link R.xml#vendorconfigs vendorconfigs.xml}. Configuration * can be read via {@link #getConfig(Context, String)}. */ -@Immutable public class VendorConfig { /** Lock for {@link #sConfigs} */ private static final Object sLock = new Object(); diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/samsung/PrinterFilterSamsung.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/samsung/PrinterFilterSamsung.java index 5b049efcf514..b9b90988c37b 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/samsung/PrinterFilterSamsung.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/samsung/PrinterFilterSamsung.java @@ -17,10 +17,11 @@ package com.android.printservice.recommendation.plugin.samsung; import android.net.nsd.NsdServiceInfo; -import android.annotation.NonNull; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; + import com.android.printservice.recommendation.util.MDNSFilteredDiscovery; import com.android.printservice.recommendation.util.MDNSUtils; diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/samsung/SamsungRecommendationPlugin.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/samsung/SamsungRecommendationPlugin.java index eeb51229e7de..ae1bdcedaabb 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/samsung/SamsungRecommendationPlugin.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/samsung/SamsungRecommendationPlugin.java @@ -18,7 +18,8 @@ package com.android.printservice.recommendation.plugin.samsung; import android.content.Context; import android.net.nsd.NsdServiceInfo; -import android.annotation.NonNull; + +import androidx.annotation.NonNull; import com.android.printservice.recommendation.PrintServicePlugin; import com.android.printservice.recommendation.R; diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/XeroxPrintServiceRecommendationPlugin.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/XeroxPrintServiceRecommendationPlugin.java index e0942b7e91a4..e6bca434cba5 100755 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/XeroxPrintServiceRecommendationPlugin.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/XeroxPrintServiceRecommendationPlugin.java @@ -15,10 +15,11 @@ */ package com.android.printservice.recommendation.plugin.xerox; -import android.annotation.NonNull; import android.content.Context; import android.net.nsd.NsdManager; +import androidx.annotation.NonNull; + import com.android.printservice.recommendation.PrintServicePlugin; import com.android.printservice.recommendation.R; diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/DiscoveryListenerMultiplexer.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/DiscoveryListenerMultiplexer.java index d82b87176299..f3f4e31bd48c 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/DiscoveryListenerMultiplexer.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/DiscoveryListenerMultiplexer.java @@ -16,12 +16,13 @@ package com.android.printservice.recommendation.util; -import android.annotation.NonNull; import android.net.nsd.NsdManager; import android.net.nsd.NsdServiceInfo; import android.util.ArrayMap; import android.util.Log; +import androidx.annotation.NonNull; + import java.util.ArrayList; /** diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/MDNSFilteredDiscovery.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/MDNSFilteredDiscovery.java index 87ab2d3fcf22..c08ca6ef591f 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/MDNSFilteredDiscovery.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/MDNSFilteredDiscovery.java @@ -15,15 +15,16 @@ */ package com.android.printservice.recommendation.util; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.net.nsd.NsdManager; import android.net.nsd.NsdServiceInfo; import android.util.Log; -import com.android.internal.annotations.GuardedBy; -import com.android.internal.util.Preconditions; +import androidx.annotation.GuardedBy; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.util.Preconditions; + import com.android.printservice.recommendation.PrintServicePlugin; import java.net.InetAddress; diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/MDNSUtils.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/MDNSUtils.java index a6df3c8f2c24..8348a2297af5 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/MDNSUtils.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/MDNSUtils.java @@ -17,9 +17,10 @@ package com.android.printservice.recommendation.util; -import android.annotation.NonNull; import android.net.nsd.NsdServiceInfo; +import androidx.annotation.NonNull; + import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.Set; diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/NsdResolveQueue.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/NsdResolveQueue.java index fad50f6a404b..41de650990f5 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/NsdResolveQueue.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/NsdResolveQueue.java @@ -16,10 +16,11 @@ package com.android.printservice.recommendation.util; -import android.annotation.NonNull; import android.net.nsd.NsdManager; import android.net.nsd.NsdServiceInfo; -import com.android.internal.annotations.GuardedBy; + +import androidx.annotation.GuardedBy; +import androidx.annotation.NonNull; import java.util.LinkedList; |