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

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

Snap for 6320329 from 7e0769b2 to qt-qpr3-release 

Change-Id: I21ca8ec7044c7fbb9535f331f59ceb54f05e6875
parents 0b7153ed 7e0769b2

core/java/android/view/ViewConfiguration.java

+2 −1
Original line number Diff line number Diff line
@@ -64,8 +64,9 @@ public class ViewConfiguration { 
    /**

     * Defines the default duration in milliseconds before a press turns into

     * a long press

     * @hide

     */

    private static final int DEFAULT_LONG_PRESS_TIMEOUT = 500;

    public static final int DEFAULT_LONG_PRESS_TIMEOUT = 400;



    /**

     * Defines the default duration in milliseconds between the first tap's up event and the second

packages/PackageInstaller/res/values-eu/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ 
    <string name="untrusted_external_source_warning" product="tablet" msgid="6539403649459942547">"Segurtasuna bermatzeko, ezin dira instalatu iturburu honetako aplikazio ezezagunak tableta honetan."</string>

    <string name="untrusted_external_source_warning" product="tv" msgid="1206648674551321364">"Segurtasuna bermatzeko, ezin dira instalatu iturburu honetako aplikazio ezezagunak telebista honetan."</string>

    <string name="untrusted_external_source_warning" product="default" msgid="7279739265754475165">"Segurtasuna bermatzeko, ezin dira instalatu iturburu honetako aplikazio ezezagunak telefono honetan."</string>

    <string name="anonymous_source_warning" product="default" msgid="2784902545920822500">"Telefonoak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Aplikazio hau instalatzen baduzu, onartu egingo duzu zu zarela hura erabiltzeagatik telefonoak jasan ditzakeen kalteen edo datu-galeren erantzulea."</string>

    <string name="anonymous_source_warning" product="tablet" msgid="3939101621438855516">"Tabletak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Aplikazio hau instalatzen baduzu, onartu egingo duzu zu zarela hura erabiltzeagatik tabletak jasan ditzakeen kalteen edo datu-galeren erantzulea."</string>

    <string name="anonymous_source_warning" product="tv" msgid="5599483539528168566">"Telebistak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Aplikazio hau instalatzen baduzu, onartu egingo duzu zu zarela hura erabiltzeagatik telebistak jasan ditzakeen kalteen edo datu-galeren erantzulea."</string>

    <string name="anonymous_source_warning" product="default" msgid="2784902545920822500">"Telefonoak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Aplikazio hau instalatzen baduzu, onartu egingo duzu zeu zarela hura erabiltzeagatik telefonoak jasan ditzakeen kalteen edo datu-galeren erantzulea."</string>

    <string name="anonymous_source_warning" product="tablet" msgid="3939101621438855516">"Tabletak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Aplikazio hau instalatzen baduzu, onartu egingo duzu zeu zarela hura erabiltzeagatik tabletak jasan ditzakeen kalteen edo datu-galeren erantzulea."</string>

    <string name="anonymous_source_warning" product="tv" msgid="5599483539528168566">"Telebistak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Aplikazio hau instalatzen baduzu, onartu egingo duzu zeu zarela hura erabiltzeagatik telebistak jasan ditzakeen kalteen edo datu-galeren erantzulea."</string>

    <string name="anonymous_source_continue" msgid="4375745439457209366">"Egin aurrera"</string>

    <string name="external_sources_settings" msgid="4046964413071713807">"Ezarpenak"</string>

    <string name="wear_app_channel" msgid="1960809674709107850">"Wear aplikazioak instalatzea/desinstalatzea"</string>

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+3 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,9 @@ public class SettingsProvider extends ContentProvider { 
            Slog.v(LOG_TAG, "getAllConfigFlags() for " + prefix);

        }



        DeviceConfig.enforceReadPermission(getContext(),

                prefix != null ? prefix.split("/")[0] : null);



        synchronized (mLock) {

            // Get the settings.

            SettingsState settingsState = mSettingsRegistry.getSettingsLocked(

services/core/java/com/android/server/TelephonyRegistry.java

+26 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.IBinder;

import android.os.Message;

import android.os.Process;

import android.os.RemoteException;

import android.os.UserHandle;

import android.telephony.CallAttributes;
@@ -469,7 +470,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        synchronized (mRecords) {

            // register

            IBinder b = callback.asBinder();

            Record r = add(b);

            Record r = add(b, Binder.getCallingPid(), false);



            if (r == null) {

                return;
@@ -522,7 +523,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        synchronized (mRecords) {

            // register

            IBinder b = callback.asBinder();

            Record r = add(b);

            Record r = add(b, Binder.getCallingPid(), false);



            if (r == null) {

                return;
@@ -643,7 +644,11 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            synchronized (mRecords) {

                // register

                IBinder b = callback.asBinder();

                Record r = add(b);

                boolean shouldEnforceListenerLimit =

                        Binder.getCallingUid() != Process.SYSTEM_UID

                        && Binder.getCallingUid() != Process.PHONE_UID

                        && Binder.getCallingUid() != Process.myUid();

                Record r = add(b, Binder.getCallingPid(), shouldEnforceListenerLimit);



                if (r == null) {

                    return;
@@ -893,18 +898,35 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        return record.canReadCallLog() ? mCallIncomingNumber[phoneId] : "";

    }



    private Record add(IBinder binder) {

    private Record add(IBinder binder, int callingPid, boolean enforceLimit) {

        Record r;



        synchronized (mRecords) {

            final int N = mRecords.size();

            // While iterating through the records, keep track of how many we have from this pid.

            int numRecordsForPid = 0;

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

                r = mRecords.get(i);

                if (binder == r.binder) {

                    // Already existed.

                    return r;

                }

                if (r.callerPid == callingPid) {

                    numRecordsForPid++;

                }

            }

            // If we've exceeded the limit for registrations, log a warning and quit.

            if (enforceLimit && numRecordsForPid >= PhoneStateListener.PER_PID_REGISTRATION_LIMIT) {

                String errorMsg = "Pid " + callingPid + " has exceeded the number of permissible"

                        + "registered listeners. Ignoring request to add.";

                loge(errorMsg);

                throw new IllegalStateException(errorMsg);

            } else if (enforceLimit

                    && numRecordsForPid >= PhoneStateListener.PER_PID_REGISTRATION_LIMIT / 2) {

                Rlog.w(TAG, "Pid " + callingPid + " has exceeded half the number of permissible"

                        + "registered listeners. Now at " + numRecordsForPid);

            }



            r = new Record();

            r.binder = binder;

            r.deathRecipient = new TelephonyRegistryDeathRecipient(binder);

services/core/java/com/android/server/input/InputManagerService.java

+39 −3
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import android.os.MessageQueue; 
import android.os.Process;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.DeviceConfig;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.text.TextUtils;
@@ -126,6 +127,9 @@ public class InputManagerService extends IInputManager.Stub 
    private static final String EXCLUDED_DEVICES_PATH = "etc/excluded-input-devices.xml";

    private static final String PORT_ASSOCIATIONS_PATH = "etc/input-port-associations.xml";



    // Feature flag name for the deep press feature

    private static final String DEEP_PRESS_ENABLED = "deep_press_enabled";



    private static final int MSG_DELIVER_INPUT_DEVICES_CHANGED = 1;

    private static final int MSG_SWITCH_KEYBOARD_LAYOUT = 2;

    private static final int MSG_RELOAD_KEYBOARD_LAYOUTS = 3;
@@ -241,6 +245,7 @@ public class InputManagerService extends IInputManager.Stub 
    private static native void nativeSetCustomPointerIcon(long ptr, PointerIcon icon);

    private static native void nativeSetPointerCapture(long ptr, boolean detached);

    private static native boolean nativeCanDispatchToDisplay(long ptr, int deviceId, int displayId);

    private static native void nativeSetMotionClassifierEnabled(long ptr, boolean enabled);



    // Input event injection constants defined in InputDispatcher.h.

    private static final int INPUT_EVENT_INJECTION_SUCCEEDED = 0;
@@ -346,6 +351,7 @@ public class InputManagerService extends IInputManager.Stub 
        registerPointerSpeedSettingObserver();

        registerShowTouchesSettingObserver();

        registerAccessibilityLargePointerSettingObserver();

        registerLongPressTimeoutObserver();



        mContext.registerReceiver(new BroadcastReceiver() {

            @Override
@@ -353,12 +359,14 @@ public class InputManagerService extends IInputManager.Stub 
                updatePointerSpeedFromSettings();

                updateShowTouchesFromSettings();

                updateAccessibilityLargePointerFromSettings();

                updateDeepPressStatusFromSettings("user switched");

            }

        }, new IntentFilter(Intent.ACTION_USER_SWITCHED), null, mHandler);



        updatePointerSpeedFromSettings();

        updateShowTouchesFromSettings();

        updateAccessibilityLargePointerFromSettings();

        updateDeepPressStatusFromSettings("just booted");

    }



    // TODO(BT) Pass in parameter for bluetooth system
@@ -1572,7 +1580,7 @@ public class InputManagerService extends IInputManager.Stub 
        setPointerSpeedUnchecked(speed);

    }



    public void updatePointerSpeedFromSettings() {

    private void updatePointerSpeedFromSettings() {

        int speed = getPointerSpeedSetting();

        setPointerSpeedUnchecked(speed);

    }
@@ -1604,7 +1612,7 @@ public class InputManagerService extends IInputManager.Stub 
        return speed;

    }



    public void updateShowTouchesFromSettings() {

    private void updateShowTouchesFromSettings() {

        int setting = getShowTouchesSetting(0);

        nativeSetShowTouches(mPtr, setting != 0);

    }
@@ -1620,7 +1628,7 @@ public class InputManagerService extends IInputManager.Stub 
                }, UserHandle.USER_ALL);

    }



    public void updateAccessibilityLargePointerFromSettings() {

    private void updateAccessibilityLargePointerFromSettings() {

        final int accessibilityConfig = Settings.Secure.getIntForUser(

                mContext.getContentResolver(), Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON,

                0, UserHandle.USER_CURRENT);
@@ -1639,6 +1647,34 @@ public class InputManagerService extends IInputManager.Stub 
                }, UserHandle.USER_ALL);

    }



    private void updateDeepPressStatusFromSettings(String reason) {

        // Not using ViewConfiguration.getLongPressTimeout here because it may return a stale value

        final int timeout = Settings.Secure.getIntForUser(mContext.getContentResolver(),

                Settings.Secure.LONG_PRESS_TIMEOUT, ViewConfiguration.DEFAULT_LONG_PRESS_TIMEOUT,

                UserHandle.USER_CURRENT);

        final boolean featureEnabledFlag =

                DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,

                        DEEP_PRESS_ENABLED, true /* default */);

        final boolean enabled =

                featureEnabledFlag && timeout <= ViewConfiguration.DEFAULT_LONG_PRESS_TIMEOUT;

        Log.i(TAG,

                (enabled ? "Enabling" : "Disabling") + " motion classifier because " + reason

                + ": feature " + (featureEnabledFlag ? "enabled" : "disabled")

                + ", long press timeout = " + timeout);

        nativeSetMotionClassifierEnabled(mPtr, enabled);

    }



    private void registerLongPressTimeoutObserver() {

        mContext.getContentResolver().registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.LONG_PRESS_TIMEOUT), true,

                new ContentObserver(mHandler) {

                    @Override

                    public void onChange(boolean selfChange) {

                        updateDeepPressStatusFromSettings("timeout changed");

                    }

                }, UserHandle.USER_ALL);

    }



    private int getShowTouchesSetting(int defaultValue) {

        int result = defaultValue;

        try {