Merge "NetworkSelectionStatus: Fix copy constructor"
diff --git a/Android.mk b/Android.mk
index e7037c9..3b99111 100644
--- a/Android.mk
+++ b/Android.mk
@@ -485,6 +485,12 @@
$(framework_res_source_path)/android/Manifest.java \
$(framework_res_source_path)/com/android/internal/R.java
+# Make sure that R.java and Manifest.java are built before we build
+# the source for this library.
+framework_res_R_stamp := \
+ $(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp
+LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp)
+
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj core-libart core-lambda-stubs conscrypt okhttp core-junit bouncycastle ext
LOCAL_STATIC_JAVA_LIBRARIES := framework-protos
@@ -496,15 +502,8 @@
LOCAL_RMTYPEDEFS := true
include $(BUILD_JAVA_LIBRARY)
+
framework_module := $(LOCAL_INSTALLED_MODULE)
-
-# Make sure that R.java and Manifest.java are built before we build
-# the source for this library.
-framework_res_R_stamp := \
- $(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp
-$(full_classes_compiled_jar): $(framework_res_R_stamp)
-$(built_dex_intermediate): $(framework_res_R_stamp)
-
$(framework_module): | $(dir $(framework_module))framework-res.apk
framework_built := $(call java-lib-deps,framework)
diff --git a/api/current.txt b/api/current.txt
index 7b76478..1effb41 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -50501,6 +50501,7 @@
method public boolean isPrimitive();
method public boolean isSynthetic();
method public T newInstance() throws java.lang.IllegalAccessException, java.lang.InstantiationException;
+ method public java.lang.String toGenericString();
}
public class ClassCastException extends java.lang.RuntimeException {
@@ -51998,6 +51999,7 @@
method public static boolean isTransient(int);
method public static boolean isVolatile(int);
method public static int methodModifiers();
+ method public static int parameterModifiers();
method public static java.lang.String toString(int);
field public static final int ABSTRACT = 1024; // 0x400
field public static final int FINAL = 16; // 0x10
diff --git a/api/system-current.txt b/api/system-current.txt
index 60425ce..6f9b679 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -53857,6 +53857,7 @@
method public boolean isPrimitive();
method public boolean isSynthetic();
method public T newInstance() throws java.lang.IllegalAccessException, java.lang.InstantiationException;
+ method public java.lang.String toGenericString();
}
public class ClassCastException extends java.lang.RuntimeException {
@@ -55354,6 +55355,7 @@
method public static boolean isTransient(int);
method public static boolean isVolatile(int);
method public static int methodModifiers();
+ method public static int parameterModifiers();
method public static java.lang.String toString(int);
field public static final int ABSTRACT = 1024; // 0x400
field public static final int FINAL = 16; // 0x10
diff --git a/api/test-current.txt b/api/test-current.txt
index ec3b55f..2d146f8 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -50581,6 +50581,7 @@
method public boolean isPrimitive();
method public boolean isSynthetic();
method public T newInstance() throws java.lang.IllegalAccessException, java.lang.InstantiationException;
+ method public java.lang.String toGenericString();
}
public class ClassCastException extends java.lang.RuntimeException {
@@ -52078,6 +52079,7 @@
method public static boolean isTransient(int);
method public static boolean isVolatile(int);
method public static int methodModifiers();
+ method public static int parameterModifiers();
method public static java.lang.String toString(int);
field public static final int ABSTRACT = 1024; // 0x400
field public static final int FINAL = 16; // 0x10
diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h
index 905833c..7fc8d6f 100644
--- a/libs/input/SpriteController.h
+++ b/libs/input/SpriteController.h
@@ -214,7 +214,7 @@
virtual ~SpriteImpl();
public:
- SpriteImpl(const sp<SpriteController> controller);
+ explicit SpriteImpl(const sp<SpriteController> controller);
virtual void setIcon(const SpriteIcon& icon);
virtual void setVisible(bool visible);
diff --git a/services/core/jni/com_android_server_input_InputApplicationHandle.h b/services/core/jni/com_android_server_input_InputApplicationHandle.h
index 62c8570..e6f25cc 100644
--- a/services/core/jni/com_android_server_input_InputApplicationHandle.h
+++ b/services/core/jni/com_android_server_input_InputApplicationHandle.h
@@ -26,7 +26,7 @@
class NativeInputApplicationHandle : public InputApplicationHandle {
public:
- NativeInputApplicationHandle(jweak objWeak);
+ explicit NativeInputApplicationHandle(jweak objWeak);
virtual ~NativeInputApplicationHandle();
jobject getInputApplicationHandleObjLocalRef(JNIEnv* env);