Merge "Remove unused files."
diff --git a/64bitonly/product/sdk_phone64_arm64.mk b/64bitonly/product/sdk_phone64_arm64.mk
index d665246..7301648 100644
--- a/64bitonly/product/sdk_phone64_arm64.mk
+++ b/64bitonly/product/sdk_phone64_arm64.mk
@@ -47,10 +47,6 @@
$(call inherit-product, device/generic/goldfish/64bitonly/product/emulator64_vendor.mk)
$(call inherit-product, device/generic/goldfish/emulator64_arm64/device.mk)
-# Define the host tools and libs that are parts of the SDK.
-$(call inherit-product-if-exists, sdk/build/product_sdk.mk)
-$(call inherit-product-if-exists, development/build/product_sdk.mk)
-
# Overrides
PRODUCT_BRAND := Android
PRODUCT_NAME := sdk_phone64_arm64
diff --git a/64bitonly/product/sdk_phone64_x86_64.mk b/64bitonly/product/sdk_phone64_x86_64.mk
index 2686954..fb048c2 100644
--- a/64bitonly/product/sdk_phone64_x86_64.mk
+++ b/64bitonly/product/sdk_phone64_x86_64.mk
@@ -45,10 +45,6 @@
$(call inherit-product, device/generic/goldfish/64bitonly/product/emulator64_vendor.mk)
$(call inherit-product, device/generic/goldfish/emulator64_x86_64/device.mk)
-# Define the host tools and libs that are parts of the SDK.
-$(call inherit-product-if-exists, sdk/build/product_sdk.mk)
-$(call inherit-product-if-exists, development/build/product_sdk.mk)
-
# Overrides
PRODUCT_BRAND := Android
PRODUCT_NAME := sdk_phone64_x86_64
diff --git a/audio/device_port_source.cpp b/audio/device_port_source.cpp
index 1fd88fe..58fe789 100644
--- a/audio/device_port_source.cpp
+++ b/audio/device_port_source.cpp
@@ -271,18 +271,18 @@
const unsigned nFrames = std::min(requestedFrames, availableFrames);
mGenerator(samples, nFrames);
- const size_t sizeBytes = nFrames * nChannels * sizeof(*samples);
+ const size_t nSamples = nFrames * nChannels;
if (nChannels > 1) {
adjust_channels(samples, 1, samples, nChannels,
- sizeof(*samples), sizeBytes);
+ sizeof(*samples), nFrames * sizeof(*samples));
}
mSentFrames += nFrames;
aops::multiplyByVolume(volume,
mWriteBuffer.data(),
- sizeBytes / sizeof(int16_t));
+ nSamples);
- writer(mWriteBuffer.data(), sizeBytes);
+ writer(mWriteBuffer.data(), nSamples * sizeof(*samples));
return 0;
}
diff --git a/data/etc/arm64/emulatorip b/data/etc/arm64/emulatorip
deleted file mode 100755
index 23d053e..0000000
--- a/data/etc/arm64/emulatorip
+++ /dev/null
Binary files differ
diff --git a/data/etc/x86/emulatorip b/data/etc/x86/emulatorip
deleted file mode 100755
index 72541a3..0000000
--- a/data/etc/x86/emulatorip
+++ /dev/null
Binary files differ
diff --git a/data/etc/x86_64/emulatorip b/data/etc/x86_64/emulatorip
deleted file mode 100755
index 0ba4abe..0000000
--- a/data/etc/x86_64/emulatorip
+++ /dev/null
Binary files differ
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 119ac53..9cbde14 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -63,4 +63,15 @@
<!-- This device is able to support the microphone and camera global toggles. -->
<bool name="config_supportsMicToggle">true</bool>
<bool name="config_supportsCamToggle">true</bool>
+ <!-- Restricting eth0 -->
+ <string-array translatable="false" name="config_ethernet_interfaces">
+ <item>eth0;11,12,14;;</item>
+ </string-array>
+ <!-- Specifies priority of automatic time sources. Suggestions from higher entries in the list
+ take precedence over lower ones.
+ See com.android.server.timedetector.TimeDetectorStrategy for available sources. -->
+ <string-array name="config_autoTimeSourcesPriority">
+ <item>telephony</item>
+ <item>network</item>
+ </string-array>
</resources>
diff --git a/sepolicy/common/file.te b/sepolicy/common/file.te
index 5311c2f..6df2ef4 100644
--- a/sepolicy/common/file.te
+++ b/sepolicy/common/file.te
@@ -1,6 +1,6 @@
type sysfs_iio_devices, fs_type, sysfs_type;
type sysfs_writable, fs_type, sysfs_type, mlstrustedobject;
-type sysfs_virtio_block, sysfs_type, fs_type, sysfs_block_type;
+type sysfs_virtio_block, sysfs_type, fs_type;
type varrun_file, file_type, data_file_type, mlstrustedobject;
type mediadrm_vendor_data_file, file_type, data_file_type;
type nsfs, fs_type;
