diff options
66 files changed, 535 insertions, 520 deletions
diff --git a/Android.mk b/Android.mk index 7c186b7ad2df..83cdd739ab6b 100644 --- a/Android.mk +++ b/Android.mk @@ -271,7 +271,7 @@ non_base_dirs := \ ../opt/net/voip/src/java/android/net/sip \ framework_base_android_test_mock_src_files := \ - $(call all-java-files-under, test-runner/src/android/test/mock) + $(call all-java-files-under, test-mock/src/android/test/mock) framework_base_android_test_runner_excluding_mock_src_files := \ $(filter-out $(framework_base_android_test_mock_src_files), $(call all-java-files-under, test-runner/src)) diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java index a8acb976a637..766ad8454e6f 100644 --- a/core/java/android/provider/CallLog.java +++ b/core/java/android/provider/CallLog.java @@ -224,6 +224,12 @@ public class CallLog { public static final int FEATURES_WIFI = 0x8; /** + * Indicates the call underwent Assisted Dialing. + * @hide + */ + public static final Integer FEATURES_ASSISTED_DIALING_USED = 0x10; + + /** * The phone number as the user entered it. * <P>Type: TEXT</P> */ diff --git a/legacy-test/Android.bp b/legacy-test/Android.bp new file mode 100644 index 000000000000..1173bc6e656b --- /dev/null +++ b/legacy-test/Android.bp @@ -0,0 +1,68 @@ +// +// 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. +// + +// Build the legacy-test library +// ============================= +// This contains the junit.framework and android.test classes that were in +// Android API level 25 excluding those from android.test.runner. +// Also contains the com.android.internal.util.Predicate[s] classes. +java_library { + name: "legacy-test", + + srcs: ["src/**/*.java"], + + no_framework_libs: true, + libs: [ + "framework", + ], + +} + +// Build the repackaged-legacy-test library +// ======================================== +// This contains repackaged versions of the classes from legacy-test. +java_library_static { + name: "repackaged-legacy-test", + + static_libs: ["legacy-test"], + + jarjar_rules: "jarjar-rules.txt", +} + +// Build the legacy-android-test library +// ===================================== +// This contains the android.test classes that were in Android API level 25, +// including those from android.test.runner. +// Also contains the com.android.internal.util.Predicate[s] classes. +java_library_static { + name: "legacy-android-test", + + srcs: [ + "src/android/**/*.java", + "src/com/**/*.java", + ], + + static_libs: [ + "android.test.runner", + "android.test.mock", + ], + + no_framework_libs: true, + libs: [ + "framework", + "junit", + ], +} diff --git a/legacy-test/Android.mk b/legacy-test/Android.mk index 0e6b31e6ebd9..793bbe859eda 100644 --- a/legacy-test/Android.mk +++ b/legacy-test/Android.mk @@ -16,35 +16,6 @@ LOCAL_PATH:= $(call my-dir) -# Build the legacy-test library -# ============================= -# This contains the junit.framework and android.test classes that were in -# Android API level 25 excluding those from android.test.runner. -# Also contains the com.android.internal.util.Predicate[s] classes. -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_MODULE := legacy-test -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart framework - -include $(BUILD_JAVA_LIBRARY) - -# Build the repackaged-legacy-test library -# ======================================== -# This contains repackaged versions of the classes from legacy-test. -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_MODULE := repackaged-legacy-test -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart framework -LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt - -include $(BUILD_STATIC_JAVA_LIBRARY) - # Generate the stub source files for legacy.test.stubs # ==================================================== include $(CLEAR_VARS) @@ -134,23 +105,6 @@ update-legacy-test-api: $(LEGACY_TEST_OUTPUT_API_FILE) | $(ACP) @echo Copying removed.txt $(hide) $(ACP) $(LEGACY_TEST_OUTPUT_REMOVED_API_FILE) $(LEGACY_TEST_REMOVED_API_FILE) -# Build the legacy-android-test library -# ===================================== -# This contains the android.test classes that were in Android API level 25, -# including those from android.test.runner. -# Also contains the com.android.internal.util.Predicate[s] classes. -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src/android) \ - $(call all-java-files-under, ../test-runner/src/android) \ - $(call all-java-files-under, src/com) -LOCAL_MODULE := legacy-android-test -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit - -include $(BUILD_STATIC_JAVA_LIBRARY) - ifeq ($(HOST_OS),linux) # Build the legacy-performance-test-hostdex library # ================================================= diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp index 16d77364942e..bd4708da562a 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -223,9 +223,9 @@ void EglManager::loadConfigs() { numConfigs = 1; if (!eglChooseConfig(mEglDisplay, attribs16F, &mEglConfigWideGamut, numConfigs, &numConfigs) || numConfigs != 1) { - LOG_ALWAYS_FATAL( - "Device claims wide gamut support, cannot find matching config, error = %s", + ALOGE("Device claims wide gamut support, cannot find matching config, error = %s", eglErrorString()); + EglExtensions.pixelFormatFloat = false; } } } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index 2873fb68ce5b..9caff100cb9d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -135,7 +135,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> if (newProfileState == BluetoothProfile.STATE_CONNECTED) { if (profile instanceof MapProfile) { profile.setPreferred(mDevice, true); - } else if (!mProfiles.contains(profile)) { + } + if (!mProfiles.contains(profile)) { mRemovedProfiles.remove(profile); mProfiles.add(profile); if (profile instanceof PanProfile && diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java index 9cda669379dd..991d9221c796 100755..100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java @@ -25,6 +25,7 @@ import android.bluetooth.BluetoothHidHost; import android.bluetooth.BluetoothMap; import android.bluetooth.BluetoothMapClient; import android.bluetooth.BluetoothPan; +import android.bluetooth.BluetoothPbap; import android.bluetooth.BluetoothPbapClient; import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothUuid; @@ -140,9 +141,11 @@ public class LocalBluetoothProfileManager { BluetoothMap.ACTION_CONNECTION_STATE_CHANGED); } - //Create PBAP server profile, but do not add it to list of profiles - // as we do not need to monitor the profile as part of profile list + //Create PBAP server profile + if(DEBUG) Log.d(TAG, "Adding local PBAP profile"); mPbapProfile = new PbapServerProfile(context); + addProfile(mPbapProfile, PbapServerProfile.NAME, + BluetoothPbap.ACTION_CONNECTION_STATE_CHANGED); if (DEBUG) Log.d(TAG, "LocalBluetoothProfileManager construction complete"); } @@ -495,6 +498,13 @@ public class LocalBluetoothProfileManager { mMapProfile.setPreferred(device, true); } + if ((mPbapProfile != null) && + (mPbapProfile.getConnectionStatus(device) == BluetoothProfile.STATE_CONNECTED)) { + profiles.add(mPbapProfile); + removedProfiles.remove(mPbapProfile); + mPbapProfile.setPreferred(device, true); + } + if (mMapClientProfile != null) { profiles.add(mMapClientProfile); removedProfiles.remove(mMapClientProfile); @@ -503,8 +513,6 @@ public class LocalBluetoothProfileManager { if (mUsePbapPce) { profiles.add(mPbapClientProfile); removedProfiles.remove(mPbapClientProfile); - profiles.remove(mPbapProfile); - removedProfiles.add(mPbapProfile); } if (DEBUG) { diff --git a/services/Android.bp b/services/Android.bp index 84c45fe7f6bd..5e75c371d171 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -1,3 +1,46 @@ +// merge all required services into one jar +// ============================================================ +java_library { + name: "services", + + dex_preopt: { + app_image: true, + profile: "art-profile", + }, + + srcs: [ + "java/**/*.java", + ], + + // The convention is to name each service module 'services.$(module_name)' + static_libs: [ + "services.core.priorityboosted", + "services.accessibility", + "services.appwidget", + "services.autofill", + "services.backup", + "services.companion", + "services.coverage", + "services.devicepolicy", + "services.midi", + "services.net", + "services.print", + "services.restrictions", + "services.usage", + "services.usb", + "services.voiceinteraction", + "android.hidl.base-V1.0-java", + ], + + libs: [ + "android.hidl.manager-V1.0-java", + ], + + // Uncomment to enable output of certain warnings (deprecated, unchecked) + //javacflags: ["-Xlint"], + +} + // native library // ============================================================= diff --git a/services/Android.mk b/services/Android.mk deleted file mode 100644 index 81d8181077b8..000000000000 --- a/services/Android.mk +++ /dev/null @@ -1,67 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -# merge all required services into one jar -# ============================================================ -include $(CLEAR_VARS) - -LOCAL_MODULE := services -LOCAL_DEX_PREOPT_APP_IMAGE := true -LOCAL_DEX_PREOPT_GENERATE_PROFILE := true -LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING := $(LOCAL_PATH)/art-profile - -LOCAL_SRC_FILES := $(call all-java-files-under,java) - -# EventLogTags files. -LOCAL_SRC_FILES += \ - core/java/com/android/server/EventLogTags.logtags - -# Uncomment to enable output of certain warnings (deprecated, unchecked) -# LOCAL_JAVACFLAGS := -Xlint - -# Services that will be built as part of services.jar -# These should map to directory names relative to this -# Android.mk. -services := \ - core \ - accessibility \ - appwidget \ - autofill \ - backup \ - companion \ - coverage\ - devicepolicy \ - midi \ - net \ - print \ - restrictions \ - usage \ - usb \ - voiceinteraction - -# The convention is to name each service module 'services.$(module_name)' -LOCAL_STATIC_JAVA_LIBRARIES := $(addprefix services.,$(services)) \ - android.hidl.base-V1.0-java \ - android.hardware.biometrics.fingerprint-V2.1-java - -LOCAL_JAVA_LIBRARIES := \ - android.hidl.manager-V1.0-java - -ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true) -LOCAL_EMMA_INSTRUMENT := true -endif - -include $(BUILD_JAVA_LIBRARY) - -# ============================================================= - -ifeq (,$(ONE_SHOT_MAKEFILE)) -# A full make is happening, so make everything. -include $(call all-makefiles-under,$(LOCAL_PATH)) -else -# If we ran an mm[m] command, we still want to build the individual -# services that we depend on. This differs from the above condition -# by only including service makefiles and not any tests or other -# modules. -include $(patsubst %,$(LOCAL_PATH)/%/Android.mk,$(services)) -endif - diff --git a/services/accessibility/Android.bp b/services/accessibility/Android.bp new file mode 100644 index 000000000000..f991d7b50fcb --- /dev/null +++ b/services/accessibility/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.accessibility", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/accessibility/Android.mk b/services/accessibility/Android.mk deleted file mode 100644 index ce89aa7697ae..000000000000 --- a/services/accessibility/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.accessibility - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/appwidget/Android.bp b/services/appwidget/Android.bp new file mode 100644 index 000000000000..aad2ad198bb7 --- /dev/null +++ b/services/appwidget/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.appwidget", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/appwidget/Android.mk b/services/appwidget/Android.mk deleted file mode 100644 index e9bab4a94a30..000000000000 --- a/services/appwidget/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.appwidget - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/autofill/Android.bp b/services/autofill/Android.bp new file mode 100644 index 000000000000..2768c1851314 --- /dev/null +++ b/services/autofill/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.autofill", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/autofill/Android.mk b/services/autofill/Android.mk deleted file mode 100644 index a1f19fd4c72d..000000000000 --- a/services/autofill/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.autofill - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/backup/Android.bp b/services/backup/Android.bp new file mode 100644 index 000000000000..ef03d83d4916 --- /dev/null +++ b/services/backup/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.backup", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/backup/Android.mk b/services/backup/Android.mk deleted file mode 100644 index 3e686d122668..000000000000 --- a/services/backup/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.backup - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/companion/Android.bp b/services/companion/Android.bp new file mode 100644 index 000000000000..d2dac357a227 --- /dev/null +++ b/services/companion/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.companion", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/companion/Android.mk b/services/companion/Android.mk deleted file mode 100644 index be48761cbae5..000000000000 --- a/services/companion/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -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) diff --git a/services/core/Android.bp b/services/core/Android.bp new file mode 100644 index 000000000000..8336b55bd51a --- /dev/null +++ b/services/core/Android.bp @@ -0,0 +1,50 @@ +java_library_static { + name: "services.core", + + aidl: { + include_dirs: [ + "frameworks/native/aidl/binder", + "system/netd/server/binder", + ], + }, + srcs: [ + "java/**/*.java", + ":netd_aidl", + ":netd_metrics_aidl", + ":installd_aidl", + "java/com/android/server/EventLogTags.logtags", + "java/com/android/server/am/EventLogTags.logtags", + ], + + libs: [ + "services.net", + "android.hardware.light-V2.0-java", + "android.hardware.power-V1.0-java", + "android.hardware.tv.cec-V1.0-java", + "android.hidl.manager-V1.0-java", + ], + + static_libs: [ + "time_zone_distro", + "time_zone_distro_installer", + "android.hardware.weaver-V1.0-java", + "android.hardware.biometrics.fingerprint-V2.1-java", + "android.hardware.oemlock-V1.0-java", + "android.hardware.tetheroffload.control-V1.0-java", + "android.hardware.vibrator-V1.0-java", + "android.hardware.configstore-V1.0-java", + ], +} + +java_genrule { + name: "services.core.priorityboosted", + srcs: [":services.core"], + tools: ["lockedregioncodeinjection"], + cmd: "$(location lockedregioncodeinjection) " + + " --targets \"Lcom/android/server/am/ActivityManagerService;,Lcom/android/server/wm/WindowHashMap;\" " + + " --pre \"com/android/server/am/ActivityManagerService.boostPriorityForLockedSection,com/android/server/wm/WindowManagerService.boostPriorityForLockedSection\" " + + " --post \"com/android/server/am/ActivityManagerService.resetPriorityAfterLockedSection,com/android/server/wm/WindowManagerService.resetPriorityAfterLockedSection\" " + + " -o $(out) " + + " -i $(in)", + out: ["services.core.priorityboosted.jar"], +} diff --git a/services/core/Android.mk b/services/core/Android.mk deleted file mode 100644 index 5ec537045237..000000000000 --- a/services/core/Android.mk +++ /dev/null @@ -1,64 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.core - -LOCAL_AIDL_INCLUDES := \ - frameworks/native/aidl/binder \ - system/netd/server/binder - - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) \ - java/com/android/server/EventLogTags.logtags \ - java/com/android/server/am/EventLogTags.logtags \ - ../../../../system/netd/server/binder/android/net/INetd.aidl \ - ../../../../system/netd/server/binder/android/net/metrics/INetdEventListener.aidl \ - ../../../native/cmds/installd/binder/android/os/IInstalld.aidl \ - -LOCAL_AIDL_INCLUDES += \ - system/netd/server/binder - -LOCAL_JAVA_LIBRARIES := \ - services.net \ - android.hardware.light-V2.0-java \ - android.hardware.power-V1.0-java \ - android.hardware.tv.cec-V1.0-java \ - android.hidl.manager-V1.0-java - -LOCAL_STATIC_JAVA_LIBRARIES := \ - time_zone_distro \ - time_zone_distro_installer \ - android.hidl.base-V1.0-java \ - android.hardware.weaver-V1.0-java \ - android.hardware.biometrics.fingerprint-V2.1-java \ - android.hardware.oemlock-V1.0-java \ - android.hardware.tetheroffload.control-V1.0-java \ - android.hardware.vibrator-V1.0-java \ - android.hardware.configstore-V1.0-java - -ifneq ($(INCREMENTAL_BUILDS),) - LOCAL_PROGUARD_ENABLED := disabled - LOCAL_JACK_ENABLED := incremental -endif - -LOCAL_JACK_FLAGS := \ - -D jack.transformations.boost-locked-region-priority=true \ - -D jack.transformations.boost-locked-region-priority.classname=com.android.server.am.ActivityManagerService,com.android.server.wm.WindowHashMap \ - -D jack.transformations.boost-locked-region-priority.request=com.android.server.am.ActivityManagerService\#boostPriorityForLockedSection,com.android.server.wm.WindowManagerService\#boostPriorityForLockedSection \ - -D jack.transformations.boost-locked-region-priority.reset=com.android.server.am.ActivityManagerService\#resetPriorityAfterLockedSection,com.android.server.wm.WindowManagerService\#resetPriorityAfterLockedSection - -LOCAL_JAR_PROCESSOR := lockedregioncodeinjection -# Use = instead of := to delay evaluation of ${in} and ${out} -LOCAL_JAR_PROCESSOR_ARGS = \ - --targets \ - "Lcom/android/server/am/ActivityManagerService;,Lcom/android/server/wm/WindowHashMap;" \ - --pre \ - "com/android/server/am/ActivityManagerService.boostPriorityForLockedSection,com/android/server/wm/WindowManagerService.boostPriorityForLockedSection" \ - --post \ - "com/android/server/am/ActivityManagerService.resetPriorityAfterLockedSection,com/android/server/wm/WindowManagerService.resetPriorityAfterLockedSection" \ - -o ${out} \ - -i ${in} - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/coverage/Android.bp b/services/coverage/Android.bp new file mode 100644 index 000000000000..16c9c1bfcdaa --- /dev/null +++ b/services/coverage/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.coverage", + srcs: ["java/**/*.java"], + libs: ["jacocoagent"], +} diff --git a/services/coverage/Android.mk b/services/coverage/Android.mk deleted file mode 100644 index da99994d6b4c..000000000000 --- a/services/coverage/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.coverage - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := jacocoagent - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/devicepolicy/Android.bp b/services/devicepolicy/Android.bp new file mode 100644 index 000000000000..05052047e0fb --- /dev/null +++ b/services/devicepolicy/Android.bp @@ -0,0 +1,9 @@ +java_library_static { + name: "services.devicepolicy", + srcs: ["java/**/*.java"], + + libs: [ + "conscrypt", + "services.core", + ], +} diff --git a/services/devicepolicy/Android.mk b/services/devicepolicy/Android.mk deleted file mode 100644 index 7020f174fefe..000000000000 --- a/services/devicepolicy/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.devicepolicy - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := conscrypt services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/midi/Android.bp b/services/midi/Android.bp new file mode 100644 index 000000000000..3745e89e8034 --- /dev/null +++ b/services/midi/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.midi", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/midi/Android.mk b/services/midi/Android.mk deleted file mode 100644 index faac01cd86f4..000000000000 --- a/services/midi/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.midi - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/net/Android.bp b/services/net/Android.bp new file mode 100644 index 000000000000..e0ae68f20483 --- /dev/null +++ b/services/net/Android.bp @@ -0,0 +1,4 @@ +java_library_static { + name: "services.net", + srcs: ["java/**/*.java"], +} diff --git a/services/net/Android.mk b/services/net/Android.mk deleted file mode 100644 index 408794e7d0b9..000000000000 --- a/services/net/Android.mk +++ /dev/null @@ -1,13 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.net - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_AIDL_INCLUDES += \ - system/netd/server/binder - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/print/Android.bp b/services/print/Android.bp new file mode 100644 index 000000000000..80a8c7560de6 --- /dev/null +++ b/services/print/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.print", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/print/Android.mk b/services/print/Android.mk deleted file mode 100644 index 00eb2e4f9f98..000000000000 --- a/services/print/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.print - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/restrictions/Android.bp b/services/restrictions/Android.bp new file mode 100644 index 000000000000..979e891ada5f --- /dev/null +++ b/services/restrictions/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.restrictions", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/restrictions/Android.mk b/services/restrictions/Android.mk deleted file mode 100644 index 57d1c465f825..000000000000 --- a/services/restrictions/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.restrictions - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/tests/Android.mk b/services/tests/Android.mk deleted file mode 100644 index 40369ee2ec5c..000000000000 --- a/services/tests/Android.mk +++ /dev/null @@ -1,3 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/services/usage/Android.bp b/services/usage/Android.bp new file mode 100644 index 000000000000..1064b6ed802f --- /dev/null +++ b/services/usage/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.usage", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/usage/Android.mk b/services/usage/Android.mk deleted file mode 100644 index f1cbe98586bb..000000000000 --- a/services/usage/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.usage - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/usb/Android.bp b/services/usb/Android.bp new file mode 100644 index 000000000000..0cd9ac306dfb --- /dev/null +++ b/services/usb/Android.bp @@ -0,0 +1,14 @@ +java_library_static { + name: "services.usb", + srcs: ["java/**/*.java"], + + libs: [ + "services.core", + "android.hidl.manager-V1.0-java", + ], + + static_libs: [ + "android.hardware.usb-V1.0-java", + "android.hardware.usb-V1.1-java", + ], +} diff --git a/services/usb/Android.mk b/services/usb/Android.mk deleted file mode 100644 index 55bfccfcef85..000000000000 --- a/services/usb/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.usb - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core \ -android.hidl.manager-V1.0-java - -LOCAL_STATIC_JAVA_LIBRARIES := android.hardware.usb-V1.0-java \ -android.hardware.usb-V1.1-java - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/voiceinteraction/Android.bp b/services/voiceinteraction/Android.bp new file mode 100644 index 000000000000..390406f97264 --- /dev/null +++ b/services/voiceinteraction/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.voiceinteraction", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/voiceinteraction/Android.mk b/services/voiceinteraction/Android.mk deleted file mode 100644 index c9e5dd02cbbe..000000000000 --- a/services/voiceinteraction/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.voiceinteraction - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index a07f2bbf3323..5cd2044f8318 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -416,8 +416,15 @@ public final class Call { */ public static final int PROPERTY_SELF_MANAGED = 0x00000100; + /** + * Indicates the call used Assisted Dialing. + * See also {@link Connection#PROPERTY_ASSISTED_DIALING_USED} + * @hide + */ + public static final int PROPERTY_ASSISTED_DIALING_USED = 0x00000200; + //****************************************************************************************** - // Next PROPERTY value: 0x00000200 + // Next PROPERTY value: 0x00000400 //****************************************************************************************** private final String mTelecomCallId; @@ -577,6 +584,9 @@ public final class Call { if(hasProperty(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) { builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY"); } + if(hasProperty(properties, PROPERTY_ASSISTED_DIALING_USED)) { + builder.append(" PROPERTY_ASSISTED_DIALING_USED"); + } builder.append("]"); return builder.toString(); } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index ffb5e93f457c..d71fde28480c 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -402,8 +402,14 @@ public abstract class Connection extends Conferenceable { @TestApi public static final int PROPERTY_IS_RTT = 1 << 8; + /** + * Set by the framework to indicate that a connection is using assisted dialing. + * @hide + */ + public static final int PROPERTY_ASSISTED_DIALING_USED = 1 << 9; + //********************************************************************************************** - // Next PROPERTY value: 1<<9 + // Next PROPERTY value: 1<<10 //********************************************************************************************** /** diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 92d458f13cd1..e1247502fe86 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -582,6 +582,14 @@ public class TelecomManager { "android.telecom.extra.CALL_BACK_INTENT"; /** + * The boolean indicated by this extra controls whether or not a call is eligible to undergo + * assisted dialing. This extra is stored under {@link #EXTRA_OUTGOING_CALL_EXTRAS}. + * @hide + */ + public static final String EXTRA_USE_ASSISTED_DIALING = + "android.telecom.extra.USE_ASSISTED_DIALING"; + + /** * The following 4 constants define how properties such as phone numbers and names are * displayed to the user. */ diff --git a/telephony/java/android/telephony/data/DataCallResponse.java b/telephony/java/android/telephony/data/DataCallResponse.java index 8cdad3f24ee5..da51c86151d2 100644 --- a/telephony/java/android/telephony/data/DataCallResponse.java +++ b/telephony/java/android/telephony/data/DataCallResponse.java @@ -116,7 +116,6 @@ public final class DataCallResponse implements Parcelable { */ public int getSuggestedRetryTime() { return mSuggestedRetryTime; } - /** * @return The unique id of the data connection. */ @@ -183,16 +182,57 @@ public final class DataCallResponse implements Parcelable { .append(" active=").append(mActive) .append(" type=").append(mType) .append(" ifname=").append(mIfname) - .append(" mtu=").append(mMtu) .append(" addresses=").append(mAddresses) .append(" dnses=").append(mDnses) .append(" gateways=").append(mGateways) .append(" pcscf=").append(mPcscfs) + .append(" mtu=").append(mMtu) .append("}"); return sb.toString(); } @Override + public boolean equals (Object o) { + if (this == o) return true; + + if (o == null || !(o instanceof DataCallResponse)) { + return false; + } + + DataCallResponse other = (DataCallResponse) o; + return this.mStatus == other.mStatus + && this.mSuggestedRetryTime == other.mSuggestedRetryTime + && this.mCid == other.mCid + && this.mActive == other.mActive + && this.mType.equals(other.mType) + && this.mIfname.equals(other.mIfname) + && mAddresses.size() == other.mAddresses.size() + && mAddresses.containsAll(other.mAddresses) + && mDnses.size() == other.mDnses.size() + && mDnses.containsAll(other.mDnses) + && mGateways.size() == other.mGateways.size() + && mGateways.containsAll(other.mGateways) + && mPcscfs.size() == other.mPcscfs.size() + && mPcscfs.containsAll(other.mPcscfs) + && mMtu == other.mMtu; + } + + @Override + public int hashCode() { + return mStatus * 31 + + mSuggestedRetryTime * 37 + + mCid * 41 + + mActive * 43 + + mType.hashCode() * 47 + + mIfname.hashCode() * 53 + + mAddresses.hashCode() * 59 + + mDnses.hashCode() * 61 + + mGateways.hashCode() * 67 + + mPcscfs.hashCode() * 71 + + mMtu * 73; + } + + @Override public int describeContents() { return 0; } diff --git a/telephony/java/android/telephony/data/InterfaceAddress.java b/telephony/java/android/telephony/data/InterfaceAddress.java index 947d0ff4693a..00d212a54c6f 100644 --- a/telephony/java/android/telephony/data/InterfaceAddress.java +++ b/telephony/java/android/telephony/data/InterfaceAddress.java @@ -78,6 +78,23 @@ public final class InterfaceAddress implements Parcelable { */ public int getNetworkPrefixLength() { return mPrefixLength; } + @Override + public boolean equals (Object o) { + if (this == o) return true; + + if (o == null || !(o instanceof InterfaceAddress)) { + return false; + } + + InterfaceAddress other = (InterfaceAddress) o; + return this.mInetAddress.equals(other.mInetAddress) + && this.mPrefixLength == other.mPrefixLength; + } + + @Override + public int hashCode() { + return mInetAddress.hashCode() * 31 + mPrefixLength * 37; + } @Override public int describeContents() { diff --git a/test-mock/Android.bp b/test-mock/Android.bp new file mode 100644 index 000000000000..8eddec48611b --- /dev/null +++ b/test-mock/Android.bp @@ -0,0 +1,39 @@ +// +// Copyright (C) 2008 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. +// + +// Build the android.test.mock library +// =================================== +java_library { + name: "android.test.mock", + + srcs: ["src/**/*.java"], + + no_framework_libs: true, + libs: [ + "framework", + "legacy-test", + ], +} + +// Build the repackaged.android.test.mock library +// ============================================== +java_library_static { + name: "repackaged.android.test.mock", + + static_libs: ["android.test.mock"], + + jarjar_rules: "jarjar-rules.txt", +} diff --git a/test-mock/Android.mk b/test-mock/Android.mk new file mode 100644 index 000000000000..d81ca013ec7a --- /dev/null +++ b/test-mock/Android.mk @@ -0,0 +1,101 @@ +# +# Copyright (C) 2008 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. +# + +LOCAL_PATH:= $(call my-dir) + +android_test_mock_source_files := $(call all-java-files-under, src/android/test/mock) + +# Generate the stub source files for android.test.mock.stubs +# ========================================================== +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(android_test_mock_source_files) + +LOCAL_JAVA_LIBRARIES := core-oj core-libart framework +LOCAL_MODULE_CLASS := JAVA_LIBRARIES +LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src/android/test/mock + +ANDROID_TEST_MOCK_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/api.txt +ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/removed.txt + +ANDROID_TEST_MOCK_API_FILE := $(LOCAL_PATH)/api/android-test-mock-current.txt +ANDROID_TEST_MOCK_REMOVED_API_FILE := $(LOCAL_PATH)/api/android-test-mock-removed.txt + +LOCAL_DROIDDOC_OPTIONS:= \ + -stubpackages android.test.mock \ + -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/src \ + -nodocs \ + -api $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) \ + -removedApi $(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE) \ + +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_MODULE := android-test-mock-api-stubs-gen + +include $(BUILD_DROIDDOC) + +# Remember the target that will trigger the code generation. +android_test_mock_gen_stamp := $(full_target) + +# Add some additional dependencies +$(ANDROID_TEST_MOCK_OUTPUT_API_FILE): $(full_target) +$(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE): $(full_target) + +# Build the android.test.mock.stubs library +# ========================================= +include $(CLEAR_VARS) + +LOCAL_MODULE := android.test.mock.stubs + +LOCAL_SOURCE_FILES_ALL_GENERATED := true + +# Make sure to run droiddoc first to generate the stub source files. +LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_gen_stamp) + +include $(BUILD_STATIC_JAVA_LIBRARY) + +# Archive a copy of the classes.jar in SDK build. +$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.mock.stubs.jar) + +# Check that the android.test.mock.stubs library has not changed +# ============================================================== + +# Check that the API we're building hasn't changed from the not-yet-released +# SDK version. +$(eval $(call check-api, \ + check-android-test-mock-api-current, \ + $(ANDROID_TEST_MOCK_API_FILE), \ + $(ANDROID_TEST_MOCK_OUTPUT_API_FILE), \ + $(ANDROID_TEST_MOCK_REMOVED_API_FILE), \ + $(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE), \ + -error 2 -error 3 -error 4 -error 5 -error 6 \ + -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \ + -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \ + -error 25 -error 26 -error 27, \ + cat $(LOCAL_PATH)/api/apicheck_msg_android_test_mock.txt, \ + check-android-test-mock-api, \ + $(call doc-timestamp-for,android-test-mock-api-stubs-gen) \ + )) + +.PHONY: check-android-test-mock-api +checkapi: check-android-test-mock-api + +.PHONY: update-android-test-mock-api +update-api: update-android-test-mock-api + +update-android-test-mock-api: $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) | $(ACP) + @echo Copying current.txt + $(hide) $(ACP) $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) $(ANDROID_TEST_MOCK_API_FILE) + @echo Copying removed.txt + $(hide) $(ACP) $(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_MOCK_REMOVED_API_FILE) diff --git a/test-runner/api/android-test-mock-current.txt b/test-mock/api/android-test-mock-current.txt index 73f794b8e431..73f794b8e431 100644 --- a/test-runner/api/android-test-mock-current.txt +++ b/test-mock/api/android-test-mock-current.txt diff --git a/test-runner/api/android-test-mock-removed.txt b/test-mock/api/android-test-mock-removed.txt index 5b358cfdbf59..5b358cfdbf59 100644 --- a/test-runner/api/android-test-mock-removed.txt +++ b/test-mock/api/android-test-mock-removed.txt diff --git a/test-runner/api/apicheck_msg_android_test_mock.txt b/test-mock/api/apicheck_msg_android_test_mock.txt index e388935bf798..e388935bf798 100644 --- a/test-runner/api/apicheck_msg_android_test_mock.txt +++ b/test-mock/api/apicheck_msg_android_test_mock.txt diff --git a/test-mock/jarjar-rules.txt b/test-mock/jarjar-rules.txt new file mode 120000 index 000000000000..b0e4beaf5a4c --- /dev/null +++ b/test-mock/jarjar-rules.txt @@ -0,0 +1 @@ +../legacy-test/jarjar-rules.txt
\ No newline at end of file diff --git a/test-runner/src/android/test/mock/MockApplication.java b/test-mock/src/android/test/mock/MockApplication.java index 3257ecf11066..3257ecf11066 100644 --- a/test-runner/src/android/test/mock/MockApplication.java +++ b/test-mock/src/android/test/mock/MockApplication.java diff --git a/test-runner/src/android/test/mock/MockContentProvider.java b/test-mock/src/android/test/mock/MockContentProvider.java index d5f3ce880b8f..d5f3ce880b8f 100644 --- a/test-runner/src/android/test/mock/MockContentProvider.java +++ b/test-mock/src/android/test/mock/MockContentProvider.java diff --git a/test-runner/src/android/test/mock/MockContentResolver.java b/test-mock/src/android/test/mock/MockContentResolver.java index a70152c8b732..a70152c8b732 100644 --- a/test-runner/src/android/test/mock/MockContentResolver.java +++ b/test-mock/src/android/test/mock/MockContentResolver.java diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-mock/src/android/test/mock/MockContext.java index 5e5ba462cfca..5e5ba462cfca 100644 --- a/test-runner/src/android/test/mock/MockContext.java +++ b/test-mock/src/android/test/mock/MockContext.java diff --git a/test-runner/src/android/test/mock/MockCursor.java b/test-mock/src/android/test/mock/MockCursor.java index 576f24ad6384..576f24ad6384 100644 --- a/test-runner/src/android/test/mock/MockCursor.java +++ b/test-mock/src/android/test/mock/MockCursor.java diff --git a/test-runner/src/android/test/mock/MockDialogInterface.java b/test-mock/src/android/test/mock/MockDialogInterface.java index d0a5a097918d..d0a5a097918d 100644 --- a/test-runner/src/android/test/mock/MockDialogInterface.java +++ b/test-mock/src/android/test/mock/MockDialogInterface.java diff --git a/test-runner/src/android/test/mock/MockIContentProvider.java b/test-mock/src/android/test/mock/MockIContentProvider.java index 112d7eef3dbe..112d7eef3dbe 100644 --- a/test-runner/src/android/test/mock/MockIContentProvider.java +++ b/test-mock/src/android/test/mock/MockIContentProvider.java diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-mock/src/android/test/mock/MockPackageManager.java index 7e08f51cd87d..7e08f51cd87d 100644 --- a/test-runner/src/android/test/mock/MockPackageManager.java +++ b/test-mock/src/android/test/mock/MockPackageManager.java diff --git a/test-runner/src/android/test/mock/MockResources.java b/test-mock/src/android/test/mock/MockResources.java index 880343e5e780..880343e5e780 100644 --- a/test-runner/src/android/test/mock/MockResources.java +++ b/test-mock/src/android/test/mock/MockResources.java diff --git a/test-runner/src/android/test/mock/package.html b/test-mock/src/android/test/mock/package.html index c0fcd1ea336a..c0fcd1ea336a 100644 --- a/test-runner/src/android/test/mock/package.html +++ b/test-mock/src/android/test/mock/package.html diff --git a/test-runner/Android.bp b/test-runner/Android.bp new file mode 100644 index 000000000000..104ae8236368 --- /dev/null +++ b/test-runner/Android.bp @@ -0,0 +1,40 @@ +// +// Copyright (C) 2008 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. +// + +// Build the android.test.runner library +// ===================================== +java_library { + name: "android.test.runner", + + srcs: ["src/**/*.java"], + + no_framework_libs: true, + libs: [ + "framework", + "legacy-test", + "android.test.mock", + ], +} + +// Build the repackaged.android.test.runner library +// ================================================ +java_library_static { + name: "repackaged.android.test.runner", + + static_libs: ["android.test.runner"], + + jarjar_rules: "jarjar-rules.txt", +} diff --git a/test-runner/Android.mk b/test-runner/Android.mk index 060a51895474..6cf2d5646ffb 100644 --- a/test-runner/Android.mk +++ b/test-runner/Android.mk @@ -16,48 +16,11 @@ LOCAL_PATH:= $(call my-dir) -android_test_mock_source_files := $(call all-java-files-under, src/android/test/mock) - -# Build the android.test.runner library -# ===================================== -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(filter-out $(android_test_mock_source_files), $(call all-java-files-under, src)) - -LOCAL_JAVA_LIBRARIES := \ - core-oj \ - core-libart \ - framework \ - legacy-test \ - android.test.mock \ - -LOCAL_MODULE:= android.test.runner - -include $(BUILD_JAVA_LIBRARY) - -# Build the repackaged.android.test.runner library -# ================================================ -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_JAVA_LIBRARIES := core-oj core-libart framework legacy-test - -LOCAL_JARJAR_RULES := $(LOCAL_PATH)/../legacy-test/jarjar-rules.txt - -LOCAL_MODULE:= repackaged.android.test.runner - -include $(BUILD_STATIC_JAVA_LIBRARY) - # Generate the stub source files for android.test.runner.stubs # ============================================================ include $(CLEAR_VARS) -# Exclude android.test.mock classes as stubs for them are created in the -# android.test.mock.stubs target -LOCAL_SRC_FILES := \ - $(filter-out $(android_test_mock_source_files), $(call all-java-files-under, src)) +LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := \ core-oj \ @@ -146,110 +109,3 @@ update-android-test-runner-api: $(ANDROID_TEST_RUNNER_OUTPUT_API_FILE) | $(ACP) $(hide) $(ACP) $(ANDROID_TEST_RUNNER_OUTPUT_API_FILE) $(ANDROID_TEST_RUNNER_API_FILE) @echo Copying removed.txt $(hide) $(ACP) $(ANDROID_TEST_RUNNER_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_RUNNER_REMOVED_API_FILE) - -# Build the android.test.mock library -# =================================== -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(android_test_mock_source_files) - -LOCAL_JAVA_LIBRARIES := core-oj core-libart framework - -LOCAL_MODULE:= android.test.mock - -include $(BUILD_JAVA_LIBRARY) - -# Generate the stub source files for android.test.mock.stubs -# ========================================================== -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(android_test_mock_source_files) - -LOCAL_JAVA_LIBRARIES := core-oj core-libart framework -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src/android/test/mock - -ANDROID_TEST_MOCK_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/api.txt -ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/removed.txt - -ANDROID_TEST_MOCK_API_FILE := $(LOCAL_PATH)/api/android-test-mock-current.txt -ANDROID_TEST_MOCK_REMOVED_API_FILE := $(LOCAL_PATH)/api/android-test-mock-removed.txt - -LOCAL_DROIDDOC_OPTIONS:= \ - -stubpackages android.test.mock \ - -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/src \ - -nodocs \ - -api $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) \ - -removedApi $(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE) \ - -LOCAL_UNINSTALLABLE_MODULE := true -LOCAL_MODULE := android-test-mock-api-stubs-gen - -include $(BUILD_DROIDDOC) - -# Remember the target that will trigger the code generation. -android_test_mock_gen_stamp := $(full_target) - -# Add some additional dependencies -$(ANDROID_TEST_MOCK_OUTPUT_API_FILE): $(full_target) -$(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE): $(full_target) - -# Build the android.test.mock.stubs library -# ========================================= -include $(CLEAR_VARS) - -LOCAL_MODULE := android.test.mock.stubs - -LOCAL_SOURCE_FILES_ALL_GENERATED := true - -# Make sure to run droiddoc first to generate the stub source files. -LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_gen_stamp) - -include $(BUILD_STATIC_JAVA_LIBRARY) - -# Archive a copy of the classes.jar in SDK build. -$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.mock.stubs.jar) - -# Check that the android.test.mock.stubs library has not changed -# ============================================================== - -# Check that the API we're building hasn't changed from the not-yet-released -# SDK version. -$(eval $(call check-api, \ - check-android-test-mock-api-current, \ - $(ANDROID_TEST_MOCK_API_FILE), \ - $(ANDROID_TEST_MOCK_OUTPUT_API_FILE), \ - $(ANDROID_TEST_MOCK_REMOVED_API_FILE), \ - $(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE), \ - -error 2 -error 3 -error 4 -error 5 -error 6 \ - -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \ - -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \ - -error 25 -error 26 -error 27, \ - cat $(LOCAL_PATH)/api/apicheck_msg_android_test_mock.txt, \ - check-android-test-mock-api, \ - $(call doc-timestamp-for,android-test-mock-api-stubs-gen) \ - )) - -.PHONY: check-android-test-mock-api -checkapi: check-android-test-mock-api - -.PHONY: update-android-test-mock-api -update-api: update-android-test-mock-api - -update-android-test-mock-api: $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) | $(ACP) - @echo Copying current.txt - $(hide) $(ACP) $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) $(ANDROID_TEST_MOCK_API_FILE) - @echo Copying removed.txt - $(hide) $(ACP) $(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_MOCK_REMOVED_API_FILE) - -# Build the android.test.mock.sdk library -# ======================================= -include $(CLEAR_VARS) - -LOCAL_MODULE := android.test.mock.sdk - -LOCAL_STATIC_JAVA_LIBRARIES := android.test.mock.stubs - -include $(BUILD_STATIC_JAVA_LIBRARY) - -# additionally, build unit tests in a separate .apk -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/test-runner/api/android-test-runner-removed.txt b/test-runner/api/android-test-runner-removed.txt index 696b45aa1455..e69de29bb2d1 100644 --- a/test-runner/api/android-test-runner-removed.txt +++ b/test-runner/api/android-test-runner-removed.txt @@ -1,9 +0,0 @@ -package android.test.mock { - - public class MockContext extends android.content.Context { - method public android.content.SharedPreferences getSharedPreferences(java.io.File, int); - method public java.io.File getSharedPreferencesPath(java.lang.String); - } - -} - diff --git a/test-runner/jarjar-rules.txt b/test-runner/jarjar-rules.txt new file mode 120000 index 000000000000..b0e4beaf5a4c --- /dev/null +++ b/test-runner/jarjar-rules.txt @@ -0,0 +1 @@ +../legacy-test/jarjar-rules.txt
\ No newline at end of file diff --git a/tools/locked_region_code_injection/Android.bp b/tools/locked_region_code_injection/Android.bp index 6dd6059dcc4f..5f81a2eeb130 100644 --- a/tools/locked_region_code_injection/Android.bp +++ b/tools/locked_region_code_injection/Android.bp @@ -1,4 +1,4 @@ -java_library_host { +java_binary_host { name: "lockedregioncodeinjection", manifest: "manifest.txt", srcs: ["src/**/*.java"], |