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

Commit 79ca7086 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4713750 from 4c0d32b0 to pi-release 

Change-Id: I0efa01115cb1d85d7e6ecc3d9da4d64de279e9e7
parents 6811af97 4c0d32b0

cmds/atrace/atrace.cpp

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static const TracingCategory k_categories[] = { 
    { "video",      "Video",            ATRACE_TAG_VIDEO, { } },

    { "camera",     "Camera",           ATRACE_TAG_CAMERA, { } },

    { "hal",        "Hardware Modules", ATRACE_TAG_HAL, { } },

    { "app",        "Application",      ATRACE_TAG_APP, { } },

    { "res",        "Resource Loading", ATRACE_TAG_RESOURCES, { } },

    { "dalvik",     "Dalvik VM",        ATRACE_TAG_DALVIK, { } },

    { "rs",         "RenderScript",     ATRACE_TAG_RS, { } },

cmds/installd/tests/installd_utils_test.cpp

+36 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#define TEST_APP_PRIVATE_DIR "/data/app-private/"

#define TEST_APP_EPHEMERAL_DIR "/data/app-ephemeral/"

#define TEST_ASEC_DIR "/mnt/asec/"

#define TEST_EXPAND_DIR "/mnt/expand/"

#define TEST_EXPAND_DIR "/mnt/expand/00000000-0000-0000-0000-000000000000/"



#define TEST_SYSTEM_DIR1 "/system/app/"

#define TEST_SYSTEM_DIR2 "/vendor/app/"
@@ -116,6 +116,41 @@ TEST_F(UtilsTest, IsValidApkPath_Internal) { 
            << bad_path5 << " should be rejected as a invalid path";

}



TEST_F(UtilsTest, IsValidApkPath_TopDir) {

    EXPECT_EQ(0, validate_apk_path(TEST_DATA_DIR "app/com.example"));

    EXPECT_EQ(0, validate_apk_path(TEST_EXPAND_DIR "app/com.example"));

    EXPECT_EQ(-1, validate_apk_path(TEST_DATA_DIR "data/com.example"));

    EXPECT_EQ(-1, validate_apk_path(TEST_EXPAND_DIR "data/com.example"));

}



TEST_F(UtilsTest, IsValidApkPath_TopFile) {

    EXPECT_EQ(0, validate_apk_path(TEST_DATA_DIR "app/com.example/base.apk"));

    EXPECT_EQ(0, validate_apk_path(TEST_EXPAND_DIR "app/com.example/base.apk"));

    EXPECT_EQ(-1, validate_apk_path(TEST_DATA_DIR "data/com.example/base.apk"));

    EXPECT_EQ(-1, validate_apk_path(TEST_EXPAND_DIR "data/com.example/base.apk"));

}



TEST_F(UtilsTest, IsValidApkPath_OatDir) {

    EXPECT_EQ(0, validate_apk_path_subdirs(TEST_DATA_DIR "app/com.example/oat"));

    EXPECT_EQ(0, validate_apk_path_subdirs(TEST_EXPAND_DIR "app/com.example/oat"));

    EXPECT_EQ(-1, validate_apk_path_subdirs(TEST_DATA_DIR "data/com.example/oat"));

    EXPECT_EQ(-1, validate_apk_path_subdirs(TEST_EXPAND_DIR "data/com.example/oat"));

}



TEST_F(UtilsTest, IsValidApkPath_OatDirDir) {

    EXPECT_EQ(0, validate_apk_path_subdirs(TEST_DATA_DIR "app/com.example/oat/arm64"));

    EXPECT_EQ(0, validate_apk_path_subdirs(TEST_EXPAND_DIR "app/com.example/oat/arm64"));

    EXPECT_EQ(-1, validate_apk_path_subdirs(TEST_DATA_DIR "data/com.example/oat/arm64"));

    EXPECT_EQ(-1, validate_apk_path_subdirs(TEST_EXPAND_DIR "data/com.example/oat/arm64"));

}



TEST_F(UtilsTest, IsValidApkPath_OatDirDirFile) {

    EXPECT_EQ(0, validate_apk_path_subdirs(TEST_DATA_DIR "app/com.example/oat/arm64/base.odex"));

    EXPECT_EQ(0, validate_apk_path_subdirs(TEST_EXPAND_DIR "app/com.example/oat/arm64/base.odex"));

    EXPECT_EQ(-1, validate_apk_path_subdirs(TEST_DATA_DIR "data/com.example/oat/arm64/base.odex"));

    EXPECT_EQ(-1, validate_apk_path_subdirs(TEST_EXPAND_DIR "data/com.example/oat/arm64/base.odex"));

}



TEST_F(UtilsTest, IsValidApkPath_Private) {

    // Internal directories

    const char *private1 = TEST_APP_PRIVATE_DIR "example.apk";

cmds/installd/utils.cpp

+14 −10
Original line number Diff line number Diff line
@@ -855,21 +855,25 @@ bool validate_secondary_dex_path(const std::string& pkgname, const std::string& 
 * that path. Returns -1 when an invalid path is encountered and 0 when a valid path

 * is encountered.

 */

static int validate_apk_path_internal(const char *path, int maxSubdirs) {

    std::string path_ = path;

    if (validate_path(android_app_dir, path_, maxSubdirs) == 0) {

        return 0;

    } else if (validate_path(android_app_private_dir, path_, maxSubdirs) == 0) {

static int validate_apk_path_internal(const std::string& path, int maxSubdirs) {

    if (validate_path(android_app_dir, path, maxSubdirs) == 0) {

        return 0;

    } else if (validate_path(android_app_ephemeral_dir, path_, maxSubdirs) == 0) {

    } else if (validate_path(android_app_private_dir, path, maxSubdirs) == 0) {

        return 0;

    } else if (validate_path(android_asec_dir, path_, maxSubdirs) == 0) {

    } else if (validate_path(android_app_ephemeral_dir, path, maxSubdirs) == 0) {

        return 0;

    } else if (validate_path(android_mnt_expand_dir, path_, std::max(maxSubdirs, 2)) == 0) {

    } else if (validate_path(android_asec_dir, path, maxSubdirs) == 0) {

        return 0;

    } else {

        return -1;

    } else if (android::base::StartsWith(path, android_mnt_expand_dir)) {

        // Rewrite the path as if it were on internal storage, and test that

        size_t end = path.find('/', android_mnt_expand_dir.size() + 1);

        if (end != std::string::npos) {

            auto modified = path;

            modified.replace(0, end + 1, android_data_dir);

            return validate_apk_path_internal(modified, maxSubdirs);

        }

    }

    return -1;

}



int validate_apk_path(const char* path) {

data/etc/go_handheld_core_hardware.xml

0 → 100644
+85 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 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.

-->



<!-- These are the hardware components that all Android Go handheld devices

     must include. Devices with optional hardware must also include extra

     hardware files, per the comments below.

-->

<permissions>

    <!-- This is Android and fully CTS compatible.  Basically this is for CTS tests to use. -->

    <feature name="android.software.cts" />



    <feature name="android.hardware.audio.output" />

    <feature name="android.hardware.camera" />

    <feature name="android.hardware.location" />

    <feature name="android.hardware.location.network" />

    <feature name="android.hardware.sensor.compass" />

    <feature name="android.hardware.sensor.accelerometer" />

    <feature name="android.hardware.bluetooth" />

    <feature name="android.hardware.touchscreen" />

    <feature name="android.hardware.microphone" />

    <feature name="android.hardware.screen.portrait" />

    <feature name="android.hardware.screen.landscape" />



    <!-- basic system services -->

    <feature name="android.software.connectionservice" />

    <feature name="android.software.backup" />

    <feature name="android.software.home_screen" />

    <feature name="android.software.input_methods" />

    <feature name="android.software.print" />

    <feature name="android.software.companion_device_setup" />

    <feature name="android.software.autofill" />



    <!-- Feature to specify if the device supports adding device admins. -->

    <feature name="android.software.device_admin" />



    <!-- Devices with all optimizations required to support VR Mode and

         pass all CDD requirements for this feature may include

         android.hardware.vr.high_performance -->

    <!-- Devices that support VR headtracking features and pass all CDD

         requirements may include

         android.hardware.vr.headtracking -->



    <!-- devices with GPS must include android.hardware.location.gps.xml -->

    <!-- devices with an autofocus camera and/or flash must include either

         android.hardware.camera.autofocus.xml or

         android.hardware.camera.autofocus-flash.xml -->

    <!-- devices with a front facing camera must include

         android.hardware.camera.front.xml -->

    <!-- devices with WiFi must also include android.hardware.wifi.xml -->

    <!-- devices that support multitouch must include the most appropriate one

         of these files:



         If only partial (non-independent) pointers are supported:

         android.hardware.touchscreen.multitouch.xml



         If up to 4 independently tracked pointers are supported:

         include android.hardware.touchscreen.multitouch.distinct.xml



         If 5 or more independently tracked pointers are supported:

         include android.hardware.touchscreen.multitouch.jazzhand.xml



         ONLY ONE of the above should be included. -->

    <!-- devices with an ambient light sensor must also include

         android.hardware.sensor.light.xml -->

    <!-- devices with a proximity sensor must also include

         android.hardware.sensor.proximity.xml -->

    <!-- GSM phones must also include android.hardware.telephony.gsm.xml -->

    <!-- CDMA phones must also include android.hardware.telephony.cdma.xml -->

    <!-- Devices that have low-latency audio stacks suitable for apps like

         VoIP may include android.hardware.audio.low_latency.xml. ONLY apps

         that meet the requirements specified in the CDD may include this. -->

</permissions>

data/etc/handheld_core_hardware.xml

+3 −3
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
     limitations under the License.

-->



<!-- These are the hardware components that all handheld devices

     must include. Devices with optional hardware must also include extra

     hardware files, per the comments below.

<!-- These are the hardware components that all handheld devices except Android Go

     must include, for Android Go devices include go_handheld_core_hardware.xml.

     Devices with optional hardware must also include extra hardware files, per the comments below.



     Handheld devices include phones, mobile Internet devices (MIDs),

     Personal Media Players (PMPs), small tablets (7" or less), and similar