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

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

Snap for 7122685 from 8d5cbd91 to sc-release 

Change-Id: I2a5a95f2467199d57d0d8a6c8b17600e72896e0c
parents 99695eee 8d5cbd91

cmds/dumpstate/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ cc_binary { 
    ],

    required: [

        "atrace",

        "dmabuf_dump",

        "ip",

        "iptables",

        "librank",

cmds/dumpstate/dumpstate.cpp

+2 −4
Original line number Diff line number Diff line
@@ -1846,10 +1846,8 @@ Dumpstate::RunStatus Dumpstate::DumpstateDefaultAfterCritical() { 
    RunCommand("IOTOP", {"iotop", "-n", "1", "-m", "100"});



    // Gather shared memory buffer info if the product implements it

    struct stat st;

    if (!stat("/product/bin/dmabuf_dump", &st)) {

        RunCommand("Dmabuf dump", {"/product/bin/dmabuf_dump"});

    }

    RunCommand("Dmabuf dump", {"dmabuf_dump"});

    RunCommand("Dmabuf per-buffer/per-exporter/per-device stats", {"dmabuf_dump", "-b"});



    DumpFile("PSI cpu", "/proc/pressure/cpu");

    DumpFile("PSI memory", "/proc/pressure/memory");

data/etc/android.hardware.keystore.limited_use_key.xml

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

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

-->



<!-- Feature for devices with KeyMint that can enforce limited use key

     in hardware with any max usage count (including count equals to 1). -->

<permissions>

    <feature name="android.hardware.keystore.limited_use_key" />

</permissions>
 
 No newline at end of file

data/etc/android.hardware.keystore.single_use_key.xml

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

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

-->



<!-- Feature for devices with KeyMint that only can enforce limited use key

     in hardware with max usage count equals to 1. -->

<permissions>

    <feature name="android.hardware.keystore.single_use_key" />

</permissions>
 
 No newline at end of file

data/etc/android.hardware.telephony.ims.singlereg.xml

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

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

-->



<!-- Feature for devices that have an IMS service that supports all IMS

     applications using a single IMS registration. -->

<permissions>

  <feature name="android.hardware.telephony.ims" />

  <feature name="android.hardware.telephony.ims.singlereg" />

</permissions>