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

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

Snap for 6263357 from 24b81758 to qt-qpr3-release 

Change-Id: I277395b27c839c4ebbe3197548d1a96fb99b07b3
parents 847dfb4b 24b81758

core/res/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,8 @@ 
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_readPhoneNumbers">Allows the app to access the phone numbers of the device.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_wakeLock" product="automotive">keep car screen turned on</string>

    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_wakeLock" product="tablet">prevent tablet from sleeping</string>

    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -1218,6 +1220,8 @@ 
    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_wakeLock" product="default">prevent phone from sleeping</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_wakeLock" product="automotive">Allows the app to keep the car screen turned on.</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_wakeLock" product="tablet">Allows the app to prevent the tablet from going to sleep.</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_wakeLock" product="tv">Allows the app to prevent the TV from going to sleep.</string>

keystore/java/android/security/KeyStore.java

+11 −0
Original line number Diff line number Diff line
@@ -1067,6 +1067,17 @@ public class KeyStore { 
        return onUserPasswordChanged(UserHandle.getUserId(Process.myUid()), newPassword);

    }



    /**

     * Notify keystore about the latest user locked state. This is to support keyguard-bound key.

     */

    public void onUserLockedStateChanged(int userHandle, boolean locked) {

        try {

            mBinder.onKeyguardVisibilityChanged(locked, userHandle);

        } catch (RemoteException e) {

            Log.w(TAG, "Failed to update user locked state " + userHandle, e);

        }

    }



    private class KeyAttestationCallbackResult {

        private KeystoreResponse keystoreResponse;

        private KeymasterCertificateChain certificateChain;

packages/SystemUI/src/com/android/systemui/ConfigurationChangedReceiver.java

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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 com.android.systemui;



import android.content.res.Configuration;



public interface ConfigurationChangedReceiver {

    void onConfigurationChanged(Configuration newConfiguration);

}

packages/SystemUI/src/com/android/systemui/Dependency.java

+0 −10
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ package com.android.systemui; 


import android.annotation.Nullable;

import android.app.INotificationManager;

import android.content.res.Configuration;

import android.hardware.SensorPrivacyManager;

import android.hardware.display.NightDisplayListener;

import android.os.Handler;
@@ -521,15 +520,6 @@ public class Dependency { 
                .forEach(o -> ((Dumpable) o).dump(fd, pw, args));

    }



    protected static void staticOnConfigurationChanged(Configuration newConfig) {

        sDependency.onConfigurationChanged(newConfig);

    }



    protected synchronized void onConfigurationChanged(Configuration newConfig) {

        mDependencies.values().stream().filter(obj -> obj instanceof ConfigurationChangedReceiver)

                .forEach(o -> ((ConfigurationChangedReceiver) o).onConfigurationChanged(newConfig));

    }



    protected final <T> T getDependency(Class<T> cls) {

        return getDependencyInner(cls);

    }

packages/SystemUI/src/com/android/systemui/SystemUIApplication.java

+5 −1
Original line number Diff line number Diff line
@@ -286,7 +286,11 @@ public class SystemUIApplication extends Application implements SysUiServiceProv 
    @Override

    public void onConfigurationChanged(Configuration newConfig) {

        if (mServicesStarted) {

            Dependency.staticOnConfigurationChanged(newConfig);

            SystemUIFactory

                    .getInstance()

                    .getRootComponent()

                    .getConfigurationController()

                    .onConfigurationChanged(newConfig);

            int len = mServices.length;

            for (int i = 0; i < len; i++) {

                if (mServices[i] != null) {