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

Unverified Commit 58a632b1 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r16' into staging/lineage-20.0_merge-android-13.0.0_r16

Android 13.0.0 Release 16 (TQ1A.221205.011)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCY45r9wAKCRDorT+BmrEO
# eEfsAJ4xXutfBIuSgZcMLhGeJUm5BKnXlgCdGQ2Z/pgiCeGkdGNkdkHR45PjrNc=
# =HCu+
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Dec  6 00:08:55 2022 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1474 signatures in the past
#      13 months.  Encrypted 4 messages in the past 11 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi (402) and others
# Via Automerger Merge Worker (5547) and others
* tag 'android-13.0.0_r16': (2462 commits)
  Revert "Enforce ComponentName belongs to caller app"
  Use setIdentifier instead of dynamic categories
  [Bouncer] Flag off bouncer interactor.
  Allow Android Auto to move to trusted.
  Revert change in qs padding in portrait
  Update Parcel readLazyValue to ignore negative object lengths
  Add safety checks on KEY_INTENT mismatch.
  Ignore malformed shortcuts
  Validate package name passed to setApplicationRestrictions. (Reland)
  Revert "[Bouncer] ensure bouncer not shown with doze state."
  Revert "Fix TrustAgent showing unclear string."
  Add trigger type job for logging process starts
  Add push messaging as a trigger for proc start
  Cleaning up duplicate proto for ProcessStartTime
  Logging second order reasons for process starts
  [Bouncer] ensure bouncer not shown with doze state.
  Fix locale bug for string conversions
  Revert "[Bouncer] reset bouncer visibility with doze state."
  Revert "Adding the missing display mode strings to persistentDataStore"
  DO NOT MERGE: Revert "Removing the initialising the mode with system pref mode."
  ...

 Conflicts:
	core/java/android/provider/Settings.java
	core/java/android/view/IWindowManager.aidl
	core/java/com/android/internal/widget/LocalImageResolver.java
	core/tests/coretests/src/com/android/internal/widget/LocalImageResolverTest.java
	libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java
	libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
	packages/SettingsProvider/Android.bp
	packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
	packages/SystemUI/Android.bp
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java
	packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java
	packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
	packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
	packages/SystemUI/src/com/android/keyguard/NumPadKey.java
	packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
	packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
	packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
	packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java
	packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java
	packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java
	packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
	packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
	packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
	packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java
	packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
	packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
	packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java
	packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java
	packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java
	packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java
	services/core/java/com/android/server/audio/AudioService.java
	services/core/java/com/android/server/connectivity/Vpn.java
	services/core/java/com/android/server/display/AutomaticBrightnessController.java
	services/core/java/com/android/server/notification/NotificationManagerService.java
	services/core/java/com/android/server/wm/DisplayRotation.java
	services/core/java/com/android/server/wm/RootWindowContainer.java
	telephony/java/android/telephony/AccessNetworkConstants.java

Change-Id: I0b479668ac28c69afaaa9f5bee1bca074a4ea080
parents f2e1fe0e 7556c202
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/c

hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclude.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}

ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/base/packages/SystemUI/ktfmt_includes.txt ${PREUPLOAD_FILES}

ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES}

owners_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "OWNERS$"
+40 −0
Original line number Diff line number Diff line
// Copyright (C) 2022 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.

package {
    // See: http://go/android-license-faq
    // A large-scale-change added 'default_applicable_licenses' to import
    // all of the 'license_kinds' from "frameworks_base_license"
    // to get the below license kinds:
    //   SPDX-license-identifier-Apache-2.0
    default_applicable_licenses: ["frameworks_base_license"],
}

android_test {
    name: "SurfaceFlingerPerfTests",
    srcs: ["src/**/*.java"],
    libs: ["android.test.runner.stubs"],
    static_libs: [
        "androidx.test.rules",
        "androidx.test.ext.junit",
        "androidx.annotation_annotation",
        "apct-perftests-utils",
        "collector-device-lib",
        "platform-test-annotations",
    ],
    test_suites: ["device-tests"],
    data: [":perfetto_artifacts"],
    platform_apis: true,
    certificate: "platform",
}
+37 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="android.perftests.surfaceflinger">

    <!-- permission needed to write perfetto trace and read/write simpleperf report -->
    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <application android:label="SurfaceFlingerPerfTests">
        <uses-library android:name="android.test.runner" />
        <activity android:name="android.surfaceflinger.SurfaceFlingerTestActivity"
                  android:exported="true">

            <intent-filter>
                <action android:name="com.android.perftests.core.PERFTEST" />
            </intent-filter>
        </activity>
    </application>

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                     android:targetPackage="android.perftests.surfaceflinger">
    </instrumentation>
</manifest>
+83 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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.
-->
<configuration description="Runs SurfaceFlingerPerfTests metric instrumentation.">
    <option name="test-suite-tag" value="apct" />
    <option name="test-suite-tag" value="apct-metric-instrumentation" />
    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
        <option name="cleanup-apks" value="true" />
        <option name="install-arg" value="-t" />
        <option name="test-file-name" value="SurfaceFlingerPerfTests.apk" />
    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
        <option name="force-skip-system-props" value="true" />
        <option name="run-command" value="input keyevent KEYCODE_WAKEUP" />
        <option name="run-command" value="cmd window dismiss-keyguard" />
        <option name="run-command" value="cmd package compile -m speed android.perftests.surfaceflinger" />
    </target_preparer>

    <!-- Needed for pushing the trace config file -->
    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
        <option name="push-file" key="trace_config_detailed.textproto" value="/data/misc/perfetto-traces/trace_config.textproto" />
    </target_preparer>

    <!-- Needed for storing the perfetto trace files in the sdcard/test_results-->
    <option name="isolated-storage" value="false" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
        <option name="package" value="android.perftests.surfaceflinger" />
        <option name="hidden-api-checks" value="false"/>

        <!-- Listener related args for collecting the traces and waiting for the device to stabilize. -->
        <option name="device-listeners" value="android.device.collectors.ProcLoadListener,android.device.collectors.PerfettoListener,android.device.collectors.SimpleperfListener" />

        <!-- Guarantee that user defined RunListeners will be running before any of the default listeners defined in this runner. -->
        <option name="instrumentation-arg" key="newRunListenerMode" value="true" />

        <option name="instrumentation-arg" key="profiling-iterations" value="525" />
        <!-- PerfettoListener related arguments -->
        <option name="instrumentation-arg" key="perfetto_config_text_proto" value="true" />
        <option name="instrumentation-arg" key="perfetto_config_file" value="trace_config.textproto" />

        <!-- SimpleperfListener related arguments -->
        <option name="instrumentation-arg" key="report" value="true" />
        <option name="instrumentation-arg" key="arguments" value="-g" />
        <option name="instrumentation-arg" key="events_to_record" value="instructions,cpu-cycles,raw-l3d-cache-refill,sched:sched_waking" />
        <option name="instrumentation-arg" key="processes_to_record" value="surfaceflinger" />
        <option name="instrumentation-arg" key="symbols_to_report" value="&quot;commit;android::SurfaceFlinger::commit(;composite;android::SurfaceFlinger::composite(&quot;" />

        <!-- should match profiling-iterations -->
        <option name="instrumentation-arg" key="test_iterations" value="525" />

        <!-- ProcLoadListener related arguments -->
        <!-- Wait for device last minute threshold to reach 3 with 2 minute timeout before starting the test run -->
        <option name="instrumentation-arg" key="procload-collector:per_run" value="true" />
        <option name="instrumentation-arg" key="proc-loadavg-threshold" value="3" />
        <option name="instrumentation-arg" key="proc-loadavg-timeout" value="120000" />
        <option name="instrumentation-arg" key="proc-loadavg-interval" value="10000" />

    </test>

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
        <option name="directory-keys" value="/data/local/tmp/SurfaceFlingerPerfTests" />
        <!-- Needed for pulling the collected trace config on to the host -->
        <option name="pull-pattern-keys" value="perfetto_file_path" />
        <option name="pull-pattern-keys" value="simpleperf_file_path" />
    </metrics_collector>

</configuration>
+1 −0
Original line number Diff line number Diff line
include /services/core/java/com/android/server/wm/OWNERS
Loading