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

Commit a1a1aa3c authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Expose additional fields needed by PrintRecommendationService GTS test... 

Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev
parents 6dde42f0 b87c08da

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -32920,6 +32920,7 @@ package android.printservice.recommendation { 
    method public abstract void onConnected();

    method public abstract void onConnected();

    method public abstract void onDisconnected();

    method public abstract void onDisconnected();

    method public final void updateRecommendations(java.util.List<android.printservice.recommendation.RecommendationInfo>);

    method public final void updateRecommendations(java.util.List<android.printservice.recommendation.RecommendationInfo>);

    field public static final java.lang.String SERVICE_INTERFACE = "android.printservice.recommendation.RecommendationService";

  }

  }

















}







}

























core/java/android/printservice/recommendation/RecommendationService.java



+0
−3




























Original line number
Original line
Diff line number
Diff line








@@ -27,7 +27,6 @@ import android.os.Looper;









import android.os.Message;







import android.os.Message;











import android.os.RemoteException;







import android.os.RemoteException;











import android.util.Log;







import android.util.Log;











import com.android.internal.annotations.GuardedBy;


































import java.util.List;







import java.util.List;





























@@ -46,8 +45,6 @@ public abstract class RecommendationService extends Service {









    /**







    /**











     * The {@link Intent} action that must be declared as handled by a service in its manifest for







     * The {@link Intent} action that must be declared as handled by a service in its manifest for











     * the system to recognize it as a print service recommendation service.







     * the system to recognize it as a print service recommendation service.











     *














     * @hide














     */







     */











    public static final String SERVICE_INTERFACE =







    public static final String SERVICE_INTERFACE =











            "android.printservice.recommendation.RecommendationService";







            "android.printservice.recommendation.RecommendationService";









































packages/PrintRecommendationService/CleanSpec.mk
0 → 100644



+49
−0




























Original line number
Original line
Diff line number
Diff line














# Copyright (C) 2016 The Android Open Source Project














#














# Licensed under the Apache License, Version 2.0 (the "License");














# you may not use this file except in compliance with the License.














# You may obtain a copy of the License at














#














#      http://www.apache.org/licenses/LICENSE-2.0














#














# Unless required by applicable law or agreed to in writing, software














# distributed under the License is distributed on an "AS IS" BASIS,














# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.














# See the License for the specific language governing permissions and














# limitations under the License.














#





























# If you don't need to do a full clean build but would like to touch














# a file or delete some intermediate files, add a clean step to the end














# of the list.  These steps will only be run once, if they haven't been














# run before.














#














# E.g.:














#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)














#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)














#














# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with














# files that are missing or have been moved.














#














# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.














# Use $(OUT_DIR) to refer to the "out" directory.














#














# If you need to re-do something that's already mentioned, just copy














# the command and add it to the bottom of the list.  E.g., if a change














# that you made last week required touching a file and a change you














# made today requires touching the same file, just copy the old














# touch step and add it to the end of the list.














#














# ************************************************














# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST














# ************************************************





























# For example:














#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)














#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)














#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)














#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)





























# ************************************************














# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST














# ************************************************