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

resolve merge conflicts of 3c002e45dd to oc-dev-plus-aosp

Browse Source 
am: d45000c1a9

Change-Id: I86966803e94f5e048d48898e7e43d15708c62254
This commit is contained in:
Philip P. Moltmann
2017-04-07 03:34:44 +00:00
committed by android-build-merger
parent c11cd4ea45 d45000c1a9
commit bd926258c2
16 changed files with 273 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
core/java/android/print/PrintManager.java
View File

@@ -18,6 +18,7 @@ package android.print;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.app.Activity;
import android.app.Application.ActivityLifecycleCallbacks;
import android.content.ComponentName;
@@ -43,8 +44,8 @@ import android.util.ArrayMap;
import android.util.Log;
import com.android.internal.os.SomeArgs;
import com.android.internal.util.Preconditions;
import libcore.io.IoUtils;
import java.lang.ref.WeakReference;
@@ -115,8 +116,6 @@ public final class PrintManager {
private static final boolean DEBUG = false;
private static final int MSG_NOTIFY_PRINT_JOB_STATE_CHANGED = 1;
private static final int MSG_NOTIFY_PRINT_SERVICES_CHANGED = 2;
private static final int MSG_NOTIFY_PRINT_SERVICE_RECOMMENDATIONS_CHANGED = 3;
/**
* Package name of print spooler.
@@ -131,6 +130,7 @@ public final class PrintManager {
* @see #getPrintServices
* @hide
*/
@SystemApi
public static final int ENABLED_SERVICES = 1 << 0;
/**
@@ -221,16 +221,26 @@ public final class PrintManager {
public void onPrintJobStateChanged(PrintJobId printJobId);
}
/** @hide */
/**
* Listen for changes to {@link #getPrintServices(int)}.
*
* @hide
*/
@SystemApi
public interface PrintServicesChangeListener {
/**
* Callback notifying that the print services changed.
*/
public void onPrintServicesChanged();
void onPrintServicesChanged();
}
/** @hide */
/**
* Listen for changes to {@link #getPrintServiceRecommendations()}.
*
* @hide
*/
@SystemApi
public interface PrintServiceRecommendationsChangeListener {
/**
@@ -268,22 +278,6 @@ public final class PrintManager {
}
args.recycle();
} break;
case MSG_NOTIFY_PRINT_SERVICES_CHANGED: {
PrintServicesChangeListenerWrapper wrapper =
(PrintServicesChangeListenerWrapper) message.obj;
PrintServicesChangeListener listener = wrapper.getListener();
if (listener != null) {
listener.onPrintServicesChanged();
}
} break;
case MSG_NOTIFY_PRINT_SERVICE_RECOMMENDATIONS_CHANGED: {
PrintServiceRecommendationsChangeListenerWrapper wrapper =
(PrintServiceRecommendationsChangeListenerWrapper) message.obj;
PrintServiceRecommendationsChangeListener listener = wrapper.getListener();
if (listener != null) {
listener.onPrintServiceRecommendationsChanged();
}
} break;
}
}
};
@@ -325,8 +319,7 @@ public final class PrintManager {
return;
}
if (mPrintJobStateChangeListeners == null) {
mPrintJobStateChangeListeners = new ArrayMap<PrintJobStateChangeListener,
PrintJobStateChangeListenerWrapper>();
mPrintJobStateChangeListeners = new ArrayMap<>();
}
PrintJobStateChangeListenerWrapper wrappedListener =
new PrintJobStateChangeListenerWrapper(listener, mHandler);
@@ -399,7 +392,7 @@ public final class PrintManager {
* @param printerId the id of the printer the icon should be loaded for
* @return the custom icon to be used for the printer or null if the icon is
* not yet available
* @see android.print.PrinterInfo.Builder#setHasCustomPrinterIcon()
* @see android.print.PrinterInfo.Builder#setHasCustomPrinterIcon(boolean)
* @hide
*/
public Icon getCustomPrinterIcon(PrinterId printerId) {
@@ -558,12 +551,21 @@ public final class PrintManager {
* Listen for changes to the installed and enabled print services.
*
* @param listener the listener to add
* @param handler the handler the listener is called back on
*
* @see android.print.PrintManager#getPrintServices
*
* @hide
*/
void addPrintServicesChangeListener(@NonNull PrintServicesChangeListener listener) {
@SystemApi
public void addPrintServicesChangeListener(@NonNull PrintServicesChangeListener listener,
@Nullable Handler handler) {
Preconditions.checkNotNull(listener);
if (handler == null) {
handler = mHandler;
}
if (mService == null) {
Log.w(LOG_TAG, "Feature android.software.print not available");
return;
@@ -572,7 +574,7 @@ public final class PrintManager {
mPrintServicesChangeListeners = new ArrayMap<>();
}
PrintServicesChangeListenerWrapper wrappedListener =
new PrintServicesChangeListenerWrapper(listener, mHandler);
new PrintServicesChangeListenerWrapper(listener, handler);
try {
mService.addPrintServicesChangeListener(wrappedListener, mUserId);
mPrintServicesChangeListeners.put(listener, wrappedListener);
@@ -587,8 +589,11 @@ public final class PrintManager {
* @param listener the listener to remove
*
* @see android.print.PrintManager#getPrintServices
*
* @hide
*/
void removePrintServicesChangeListener(@NonNull PrintServicesChangeListener listener) {
@SystemApi
public void removePrintServicesChangeListener(@NonNull PrintServicesChangeListener listener) {
Preconditions.checkNotNull(listener);
if (mService == null) {
@@ -623,11 +628,12 @@ public final class PrintManager {
*
* @return The print service list or an empty list.
*
* @see #addPrintServicesChangeListener(PrintServicesChangeListener)
* @see #addPrintServicesChangeListener(PrintServicesChangeListener, Handler)
* @see #removePrintServicesChangeListener(PrintServicesChangeListener)
*
* @hide
*/
@SystemApi
public @NonNull List<PrintServiceInfo> getPrintServices(int selectionFlags) {
Preconditions.checkFlagsArgument(selectionFlags, ALL_SERVICES);
@@ -646,13 +652,22 @@ public final class PrintManager {
* Listen for changes to the print service recommendations.
*
* @param listener the listener to add
* @param handler the handler the listener is called back on
*
* @see android.print.PrintManager#getPrintServiceRecommendations
*
* @hide
*/
void addPrintServiceRecommendationsChangeListener(
@NonNull PrintServiceRecommendationsChangeListener listener) {
@SystemApi
public void addPrintServiceRecommendationsChangeListener(
@NonNull PrintServiceRecommendationsChangeListener listener,
@Nullable Handler handler) {
Preconditions.checkNotNull(listener);
if (handler == null) {
handler = mHandler;
}
if (mService == null) {
Log.w(LOG_TAG, "Feature android.software.print not available");
return;
@@ -661,7 +676,7 @@ public final class PrintManager {
mPrintServiceRecommendationsChangeListeners = new ArrayMap<>();
}
PrintServiceRecommendationsChangeListenerWrapper wrappedListener =
new PrintServiceRecommendationsChangeListenerWrapper(listener, mHandler);
new PrintServiceRecommendationsChangeListenerWrapper(listener, handler);
try {
mService.addPrintServiceRecommendationsChangeListener(wrappedListener, mUserId);
mPrintServiceRecommendationsChangeListeners.put(listener, wrappedListener);
@@ -676,8 +691,11 @@ public final class PrintManager {
* @param listener the listener to remove
*
* @see android.print.PrintManager#getPrintServiceRecommendations
*
* @hide
*/
void removePrintServiceRecommendationsChangeListener(
@SystemApi
public void removePrintServiceRecommendationsChangeListener(
@NonNull PrintServiceRecommendationsChangeListener listener) {
Preconditions.checkNotNull(listener);
@@ -715,6 +733,7 @@ public final class PrintManager {
*
* @hide
*/
@SystemApi
public @NonNull List<RecommendationInfo> getPrintServiceRecommendations() {
try {
List<RecommendationInfo> recommendations =
@@ -1349,17 +1368,13 @@ public final class PrintManager {
Handler handler = mWeakHandler.get();
PrintServicesChangeListener listener = mWeakListener.get();
if (handler != null && listener != null) {
handler.obtainMessage(MSG_NOTIFY_PRINT_SERVICES_CHANGED, this).sendToTarget();
handler.post(listener::onPrintServicesChanged);
}
}
public void destroy() {
mWeakListener.clear();
}
public PrintServicesChangeListener getListener() {
return mWeakListener.get();
}
}
/**
@@ -1381,17 +1396,12 @@ public final class PrintManager {
Handler handler = mWeakHandler.get();
PrintServiceRecommendationsChangeListener listener = mWeakListener.get();
if (handler != null && listener != null) {
handler.obtainMessage(MSG_NOTIFY_PRINT_SERVICE_RECOMMENDATIONS_CHANGED,
this).sendToTarget();
handler.post(listener::onPrintServiceRecommendationsChanged);
}
}
public void destroy() {
mWeakListener.clear();
}
public PrintServiceRecommendationsChangeListener getListener() {
return mWeakListener.get();
}
}
}

3
core/java/android/print/PrintServiceRecommendationsLoader.java
View File

@@ -22,6 +22,7 @@ import android.content.Loader;
import android.os.Handler;
import android.os.Message;
import android.printservice.recommendation.RecommendationInfo;
import com.android.internal.util.Preconditions;
import java.util.List;
@@ -77,7 +78,7 @@ public class PrintServiceRecommendationsLoader extends Loader<List<Recommendatio
}
};
mPrintManager.addPrintServiceRecommendationsChangeListener(mListener);
mPrintManager.addPrintServiceRecommendationsChangeListener(mListener, null);
// Immediately deliver a result
deliverResult(mPrintManager.getPrintServiceRecommendations());

3
core/java/android/print/PrintServicesLoader.java
View File

@@ -22,6 +22,7 @@ import android.content.Loader;
import android.os.Handler;
import android.os.Message;
import android.printservice.PrintServiceInfo;
import com.android.internal.util.Preconditions;
import java.util.List;
@@ -82,7 +83,7 @@ public class PrintServicesLoader extends Loader<List<PrintServiceInfo>> {
}
};
mPrintManager.addPrintServicesChangeListener(mListener);
mPrintManager.addPrintServicesChangeListener(mListener, null);
// Immediately deliver a result
deliverResult(mPrintManager.getPrintServices(mSelectionFlags));

24
core/java/android/printservice/PrintServiceInfo.java
View File

@@ -17,6 +17,7 @@
package android.printservice;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -47,6 +48,7 @@ import java.io.IOException;
*
* @hide
*/
@SystemApi
public final class PrintServiceInfo implements Parcelable {
private static final String LOG_TAG = PrintServiceInfo.class.getSimpleName();
@@ -86,6 +88,8 @@ public final class PrintServiceInfo implements Parcelable {
* @param settingsActivityName Optional settings activity name.
* @param addPrintersActivityName Optional add printers activity name.
* @param advancedPrintOptionsActivityName Optional advanced print options activity.
*
* @hide
*/
public PrintServiceInfo(ResolveInfo resolveInfo, String settingsActivityName,
String addPrintersActivityName, String advancedPrintOptionsActivityName) {
@@ -110,11 +114,13 @@ public final class PrintServiceInfo implements Parcelable {
/**
* Creates a new instance.
*
* @param resolveInfo The service resolve info.
* @param context Context for accessing resources.
* @param resolveInfo The service resolve info.
* @return The created instance.
*
* @hide
*/
public static PrintServiceInfo create(ResolveInfo resolveInfo, Context context) {
public static PrintServiceInfo create(Context context, ResolveInfo resolveInfo) {
String settingsActivityName = null;
String addPrintersActivityName = null;
String advancedPrintOptionsActivityName = null;
@@ -177,6 +183,8 @@ public final class PrintServiceInfo implements Parcelable {
* </p>
*
* @return The id.
*
* @hide
*/
public String getId() {
return mId;
@@ -186,6 +194,8 @@ public final class PrintServiceInfo implements Parcelable {
* If the service was enabled when it was read from the system.
*
* @return The id.
*
* @hide
*/
public boolean isEnabled() {
return mIsEnabled;
@@ -195,6 +205,8 @@ public final class PrintServiceInfo implements Parcelable {
* Mark a service as enabled or not
*
* @param isEnabled If the service should be marked as enabled.
*
* @hide
*/
public void setIsEnabled(boolean isEnabled) {
mIsEnabled = isEnabled;
@@ -204,6 +216,8 @@ public final class PrintServiceInfo implements Parcelable {
* The service {@link ResolveInfo}.
*
* @return The info.
*
* @hide
*/
public ResolveInfo getResolveInfo() {
return mResolveInfo;
@@ -217,6 +231,8 @@ public final class PrintServiceInfo implements Parcelable {
* </p>
*
* @return The settings activity name.
*
* @hide
*/
public String getSettingsActivityName() {
return mSettingsActivityName;
@@ -230,6 +246,8 @@ public final class PrintServiceInfo implements Parcelable {
* </p>
*
* @return The add printers activity name.
*
* @hide
*/
public String getAddPrintersActivityName() {
return mAddPrintersActivityName;
@@ -243,6 +261,8 @@ public final class PrintServiceInfo implements Parcelable {
* </p>
*
* @return The advanced print options activity name.
*
* @hide
*/
public String getAdvancedOptionsActivityName() {
return mAdvancedPrintOptionsActivityName;

82
core/java/android/printservice/recommendation/RecommendationInfo.java
View File

@@ -22,8 +22,14 @@ import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
import android.printservice.PrintService;
import com.android.internal.util.Preconditions;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
/**
* A recommendation to install a {@link PrintService print service}.
*
@@ -37,8 +43,8 @@ public final class RecommendationInfo implements Parcelable {
/** Display name of the print service. */
private @NonNull final CharSequence mName;
/** Number of printers the print service would discover if installed. */
private @IntRange(from = 0) final int mNumDiscoveredPrinters;
/** Printers the print service would discover if installed. */
@NonNull private final List<InetAddress> mDiscoveredPrinters;
/** If the service detects printer from multiple vendors. */
private final boolean mRecommendsMultiVendorService;
@@ -48,18 +54,62 @@ public final class RecommendationInfo implements Parcelable {
*
* @param packageName Package name of the print service
* @param name Display name of the print service
* @param numDiscoveredPrinters Number of printers the print service would discover if
* installed
* @param discoveredPrinters The {@link InetAddress addresses} of the discovered
* printers. Cannot be null or empty.
* @param recommendsMultiVendorService If the service detects printer from multiple vendor
*/
public RecommendationInfo(@NonNull CharSequence packageName, @NonNull CharSequence name,
@IntRange(from = 0) int numDiscoveredPrinters, boolean recommendsMultiVendorService) {
@NonNull List<InetAddress> discoveredPrinters, boolean recommendsMultiVendorService) {
mPackageName = Preconditions.checkStringNotEmpty(packageName);
mName = Preconditions.checkStringNotEmpty(name);
mNumDiscoveredPrinters = Preconditions.checkArgumentNonnegative(numDiscoveredPrinters);
mDiscoveredPrinters = Preconditions.checkCollectionElementsNotNull(discoveredPrinters,
"discoveredPrinters");
mRecommendsMultiVendorService = recommendsMultiVendorService;
}
/**
* Create a new recommendation.
*
* @param packageName Package name of the print service
* @param name Display name of the print service
* @param numDiscoveredPrinters Number of printers the print service would discover if
* installed
* @param recommendsMultiVendorService If the service detects printer from multiple vendor
*
* @deprecated Use {@link RecommendationInfo(String, String, List<InetAddress>, boolean)}
* instead
*/
@Deprecated
public RecommendationInfo(@NonNull CharSequence packageName, @NonNull CharSequence name,
@IntRange(from = 0) int numDiscoveredPrinters, boolean recommendsMultiVendorService) {
throw new IllegalArgumentException("This constructor has been deprecated");
}
/**
* Read a list of blobs from the parcel and return it as a list of {@link InetAddress
* addresses}.
*
* @param parcel the parcel to read the blobs from
*
* @return The list of {@link InetAddress addresses} or null if no printers were found.
*
* @see #writeToParcel(Parcel, int)
*/
@NonNull private static ArrayList<InetAddress> readDiscoveredPrinters(@NonNull Parcel parcel) {
int numDiscoveredPrinters = parcel.readInt();
ArrayList<InetAddress> discoveredPrinters = new ArrayList<>(numDiscoveredPrinters);
for (int i = 0; i < numDiscoveredPrinters; i++) {
try {
discoveredPrinters.add(InetAddress.getByAddress(parcel.readBlob()));
} catch (UnknownHostException e) {
throw new IllegalArgumentException(e);
}
}
return discoveredPrinters;
}
/**
* Create a new recommendation from a parcel.
*
@@ -68,7 +118,7 @@ public final class RecommendationInfo implements Parcelable {
* @see #CREATOR
*/
private RecommendationInfo(@NonNull Parcel parcel) {
this(parcel.readCharSequence(), parcel.readCharSequence(), parcel.readInt(),
this(parcel.readCharSequence(), parcel.readCharSequence(), readDiscoveredPrinters(parcel),
parcel.readByte() != 0);
}
@@ -86,11 +136,18 @@ public final class RecommendationInfo implements Parcelable {
return mRecommendsMultiVendorService;
}
/**
* @return The {@link InetAddress address} of the printers the print service would detect.
*/
@NonNull public List<InetAddress> getDiscoveredPrinters() {
return mDiscoveredPrinters;
}
/**
* @return The number of printer the print service would detect.
*/
public int getNumDiscoveredPrinters() {
return mNumDiscoveredPrinters;
return mDiscoveredPrinters.size();
}
/**
@@ -109,7 +166,14 @@ public final class RecommendationInfo implements Parcelable {
public void writeToParcel(Parcel dest, int flags) {
dest.writeCharSequence(mPackageName);
dest.writeCharSequence(mName);
dest.writeInt(mNumDiscoveredPrinters);
int numDiscoveredPrinters = mDiscoveredPrinters.size();
dest.writeInt(numDiscoveredPrinters);
for (InetAddress printer : mDiscoveredPrinters) {
dest.writeBlob(printer.getAddress());
}
dest.writeByte((byte) (mRecommendsMultiVendorService ? 1 : 0));
}