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

Commit 62166fc0 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7112378 from 65a3e173 to sc-release 

Change-Id: Iabe9817b6765c81cef6c0be0dfe37b85cc2af14f
parents 4e00b341 65a3e173

cmds/dumpstate/tests/dumpstate_smoke_test.cpp

+6 −2
Original line number Diff line number Diff line
@@ -310,8 +310,12 @@ TEST_F(ZippedBugReportContentsTest, ContainsSomeFileSystemFiles) { 
    // FS/proc/*/mountinfo size > 0

    FileExists("FS/proc/1/mountinfo", 0U, 100000U);



    // FS/data/misc/profiles/cur/0/*/primary.prof size > 0

    FileExists("FS/data/misc/profiles/cur/0/com.android.phone/primary.prof", 0U, 100000U);

    // FS/data/misc/profiles/cur/0/*/primary.prof should exist. Also, since dumpstate only adds

    // profiles to the zip in the non-user build, a build checking is necessary here.

    if (!PropertiesHelper::IsUserBuild()) {

        ZipEntry entry;

        GetEntry(handle, "FS/data/misc/profiles/cur/0/com.android.phone/primary.prof", &entry);

    }

}



/**

data/etc/car_core_hardware.xml

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
    <feature name="android.hardware.microphone" />

    <!-- Feature to specify if the device is a car -->

    <feature name="android.hardware.type.automotive" />

    <!-- Indicate support for the Android security model per the CDD. -->

    <feature name="android.hardware.security.model.compatible" />



    <!-- basic system services -->

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

data/etc/go_handheld_core_hardware.xml

+3 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

u<?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");
@@ -33,6 +33,8 @@ 
    <feature name="android.hardware.microphone" />

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

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

    <!-- Indicate support for the Android security model per the CDD. -->

    <feature name="android.hardware.security.model.compatible" />



    <!-- basic system services -->

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

data/etc/handheld_core_hardware.xml

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
    <feature name="android.hardware.microphone" />

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

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

    <!-- Indicate support for the Android security model per the CDD. -->

    <feature name="android.hardware.security.model.compatible" />



    <!-- basic system services -->

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

data/etc/pc_core_hardware.xml

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
    <feature name="android.hardware.screen.landscape" />

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

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

    <!-- Indicate support for the Android security model per the CDD. -->

    <feature name="android.hardware.security.model.compatible" />



    <!-- basic system services -->

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