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

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

Merge cherrypicks of [13231586, 13231437, 13231588, 13230397, 13230399,... 

Merge cherrypicks of [13231586, 13231437, 13231588, 13230397, 13230399, 13231350, 13231351, 13231354, 13231356, 13231439, 13231441, 13231358, 13231443, 13231360, 13231030, 13231457, 13230243, 13231032, 13231725, 13230838, 13231034, 13230840, 13230842, 13231361, 13231363, 13231745, 13231458, 13231747, 13231749, 13231751, 13229580, 13229582, 13231589, 13231591, 13231764, 13230400, 13230402, 13231784, 13231786, 13231788, 13231790] into rvc-qpr1-release

Change-Id: I056de117857fd58e011c2dde847a3e4a336d169f
parents 513c3b5c 41484bba

core/java/com/android/internal/app/ResolverActivity.java

+0 −19
Original line number Diff line number Diff line
@@ -1210,25 +1210,6 @@ public class ResolverActivity extends Activity implements 
                        if (TextUtils.isEmpty(packageName)) {

                            pm.setDefaultBrowserPackageNameAsUser(ri.activityInfo.packageName, userId);

                        }

                    } else {

                        // Update Domain Verification status

                        ComponentName cn = intent.getComponent();

                        String packageName = cn.getPackageName();

                        String dataScheme = (data != null) ? data.getScheme() : null;



                        boolean isHttpOrHttps = (dataScheme != null) &&

                                (dataScheme.equals(IntentFilter.SCHEME_HTTP) ||

                                        dataScheme.equals(IntentFilter.SCHEME_HTTPS));



                        boolean isViewAction = (action != null) && action.equals(Intent.ACTION_VIEW);

                        boolean hasCategoryBrowsable = (categories != null) &&

                                categories.contains(Intent.CATEGORY_BROWSABLE);



                        if (isHttpOrHttps && isViewAction && hasCategoryBrowsable) {

                            pm.updateIntentVerificationStatusAsUser(packageName,

                                    PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS,

                                    userId);

                        }

                    }

                } else {

                    try {

packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java

+1 −9
Original line number Diff line number Diff line
@@ -89,15 +89,7 @@ public class SystemSettingsValidators { 
                        return value == null || value.length() < MAX_LENGTH;

                    }

                });

        VALIDATORS.put(

                System.FONT_SCALE,

                value -> {

                    try {

                        return Float.parseFloat(value) >= 0;

                    } catch (NumberFormatException | NullPointerException e) {

                        return false;

                    }

                });

        VALIDATORS.put(System.FONT_SCALE, new InclusiveFloatRangeValidator(0.85f, 1.3f));

        VALIDATORS.put(System.DIM_SCREEN, BOOLEAN_VALIDATOR);

        VALIDATORS.put(

                System.DISPLAY_COLOR_MODE,

services/core/java/com/android/server/am/ActivityManagerService.java

+59 −58
Original line number Diff line number Diff line
@@ -7142,13 +7142,12 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        "getContentProviderImpl: after checkContentProviderPermission");















                final long origId = Binder.clearCallingIdentity();

























                try {















                    checkTime(startTime, "getContentProviderImpl: incProviderCountLocked");



























                // In this case the provider instance already exists, so we can













                // return it right away.













                conn = incProviderCountLocked(r, cpr, token, callingUid, callingPackage, callingTag,













                        stable);













                    // Return the provider instance right away since it already exists.













                    conn = incProviderCountLocked(r, cpr, token, callingUid, callingPackage,













                            callingTag, stable);















                    if (conn != null && (conn.stableCount+conn.unstableCount) == 1) {















                        if (cpr.proc != null















                                && r != null && r.setAdj <= ProcessList.PERCEPTIBLE_LOW_APP_ADJ) {









@@ -7171,7 +7170,8 @@ public class ActivityManagerService extends IActivityManager.Stub













                    // it, we will check whether the process still exists.  Note that this doesn't















                    // completely get rid of races with LMK killing the process, but should make















                    // them much smaller.













                if (success && verifiedAdj != cpr.proc.setAdj && !isProcessAliveLocked(cpr.proc)) {













                    if (success && verifiedAdj != cpr.proc.setAdj













                            && !isProcessAliveLocked(cpr.proc)) {















                        success = false;















                    }















                    maybeUpdateProviderUsageStatsLocked(r, cpr.info.packageName, name);










@@ -7201,9 +7201,10 @@ public class ActivityManagerService extends IActivityManager.Stub













                    } else {















                        cpr.proc.verifiedAdj = cpr.proc.setAdj;















                    }

























                } finally {















                    Binder.restoreCallingIdentity(origId);















                }













            }





























            if (!providerRunning) {















                try {